diff --git a/app-accessibility/at-spi2-atk/ChangeLog b/app-accessibility/at-spi2-atk/ChangeLog
index 69eacd161bd6..ca1bc63f38d2 100644
--- a/app-accessibility/at-spi2-atk/ChangeLog
+++ b/app-accessibility/at-spi2-atk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/at-spi2-atk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.73 2015/06/09 09:52:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.74 2015/06/18 04:29:20 tetromino Exp $
+
+*at-spi2-atk-2.16.0-r1 (18 Jun 2015)
+
+  18 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +at-spi2-atk-2.16.0-r1.ebuild, +files/at-spi2-atk-2.16.0-atk_suite.h,
+  +files/at-spi2-atk-2.16.0-null-gobject.patch,
+  +files/at-spi2-atk-2.16.0-out-of-source.patch:
+  Fix test suite build (note: test suite itself still doesn't quite run), bug
+  #552346, thanks to Patrick Lauer. Reduce logspam at runtime.
 
 *at-spi2-atk-2.16.0 (09 Jun 2015)
 
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 9a01ab6bcff8..b5ee45f53051 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,19 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX at-spi2-atk-2.16.0-atk_suite.h 1297 SHA256 fea01c461bc64ab9a9d1b908990dbf90adb89129ec92554458b116eb30fe9b11 SHA512 3b99eebf112e49ea6f404ec3a0d30eb62be0c0de410c5af8dea6f60c5da2dd7cb42c34155ce9e3e61e206489017879fce6d6005e33fdb66670e079f33db524a6 WHIRLPOOL 0370eaeb04e065352f8199f0dd3e445bf069ded1b379e4440df9cbaaf60ddf207bdbf08d253b8c8eb08454c265616d180bccee9d02f9eb16e9a52347e7b988d3
+AUX at-spi2-atk-2.16.0-null-gobject.patch 861 SHA256 c3096185112a99f268713d1c068ffd8c5bfd917566a8fcbcf3427821f695f874 SHA512 325d5682898dab8697056ee753a7d4b6b28c9432e14ecd2e8d7bf18a2912a9c8b88ca8471a6c53b7bd400d5c2c949418746e7ecf556d200fba3ec02241348f93 WHIRLPOOL fbfd48d99007f69a8a34989fff084ad19600c48db5d4b31c56790d6b6fae5b916216e3a7d7ab5e86732229ef8b5b3259c93f2b1f7e72356672d84f6af80a300b
+AUX at-spi2-atk-2.16.0-out-of-source.patch 2306 SHA256 6a4ba81735f95cebba042627cd9847aa9d2509b6a9b566af78ec54873e49d9b9 SHA512 847dea8a6c25c88067a039c8c9ccbf87234548eb6e4736f82f4435d44e893446c008ad7ddd3900c39656f87463e842b52a92d74b34bd20a03396fc4793a4c4f7 WHIRLPOOL a5cc129dc916a6df716238862ec188bd1f0a61522e0715a001d42d6ec6784d471495ae1d1038d08297c82cf5b55d2ac60383b74a8e350003ca98af6b4e4c0093
 DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5
 DIST at-spi2-atk-2.14.1.tar.xz 280952 SHA256 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb SHA512 1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437 WHIRLPOOL 75d7e4569eed83df842e363c6203571b7bc26dbfdd71555ead0c1656eb61923817673ce18f8042c4a989a45af956ad9fd85aee5386c8aafb121bf71de99c04c6
 DIST at-spi2-atk-2.16.0.tar.xz 286668 SHA256 78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9 SHA512 fcd40693e5ef55c640a52158996dc8bc66f53ef211c343cd5401c4bcd1669110ea836e0550eb41caee9c9f3a4f9670095a7dd8252600af943ddcb374bf50f011 WHIRLPOOL 0865cb8bfd62449bf345938a382c2a7d8efd425154e7e674c8097702e6873d98b8d2be8ac841858ba7dce166c2be4e18be1b1daf4fed43f667430ac3eeccebe2
 EBUILD at-spi2-atk-2.12.1-r1.ebuild 1341 SHA256 ff8d4d5637ed0575c33d802d6b49426fe310e04127e648db0c65cc62aea25b4a SHA512 7e487cf43833c4bcda3ff61bd028f639b2696551e71d63733edf1737338fe072f8a861e3e54eda4ac5fefd8b4805ec88d11473a9ab9dbc41eeacabaa5ce683a1 WHIRLPOOL 7325cc21bf3a80db2f0bc1f897e311cbd7a2a27733f489b7d66c8c909ab493c6ab992e8886544dc0ccf1350a62cf92443fec6d1d23da8d6860d6b05dc9d15b45
 EBUILD at-spi2-atk-2.12.1.ebuild 950 SHA256 981b48c4ab2910c56e5f1134dbfd823a3e61b571b1f7e3a821c6d767acc807cb SHA512 75dcf63577c37332f18c3d15def5bc678f4983f6b2485056ce499549535f8dc5e55cf1004882148fe45ccb5aea6fd88c9389a080d84b83cbc526f4a909d0dde4 WHIRLPOOL f743f2677d2693b34e91b93ee695b132212b846b2862d378b3fd19b82e009f0fa1d0a4944f94a40dc95de60a5ece3e9b0fbb674af503396a58c56f9fdc263bf1
 EBUILD at-spi2-atk-2.14.1.ebuild 1342 SHA256 2c7cd8ecc35f48b3e80908f962c9daa5ac0ef841ef1b7af5ce462ac94cbdcfa4 SHA512 af41a49ac267354d6973f40a3f6e96650612bd4699920d2fe62dfc899e081a2157545ecfcb83ab834e8d9a67236dd01ca2bbd76ebfe26264daae905b653141f7 WHIRLPOOL 424eb0354d4ab27ea440f8f16214531874787d75323ec6ca2b3589f586e0c8d1abe154dd7ee1f26e38b161284d28f8614a0ed680ec6712025163871691aae438
+EBUILD at-spi2-atk-2.16.0-r1.ebuild 1873 SHA256 20909648462abfffc03fa28e940b8c811a21307e4dde62dbeaac348d5ad2d78f SHA512 364b9101a287af0bb5cb847a4d43950840335e06c5957f38c531bb06cee95801d023712dc8a4fc0298e612057be1c457191a74e7a4c4b6c806262cb3884197b5 WHIRLPOOL 997ca6c0e0910161c71e3d67439e6ad7c3a2ff00415fd2ce5d2665fbad972bfa66f7e2af1b14418e2b9cc87cd956fa61f44851767da3e578a5df7d3a49016305
 EBUILD at-spi2-atk-2.16.0.ebuild 1406 SHA256 e47d2f0913b3a69dc687ac400b545427eeb5dc3394fb0ef03524ebfcd940d4ef SHA512 ee85a255a96e677f30c76ef13be1be034a5f23ba83915673ea0e8a25553462f8705422dd6b5e5bc50340e9f98d5f79d7e552b603a977dd0cde1f77d581cf4e77 WHIRLPOOL 46662d53f5cdf0c3c0424b1894d4fe596b666296e3abcc166de1e64f37c1d8a06668fdda51669dca2d6200a4a4e7dbb7f9b005e7fe8442a2b02c7093253fd76a
-MISC ChangeLog 10038 SHA256 169429378475e27a9ad2a76607ddcfc5d606e75735adeb4f66c33bdf8ccb496c SHA512 43114b6cf275c486d8576aa95ceb11311042c0c5a73184ebe6d2d1a25be0ab16ce48652e6b4d275d909e997eb58917149046fd16b4af47fee2d9a0a1112cdc88 WHIRLPOOL 96f72b98f2f1c40d7c0e7e76b61263044a10ad2f8834a50991d21a134c416742afcfcfd6724baf025ffd55f85b96956644c03494069c606679f76017189d85d8
+MISC ChangeLog 10452 SHA256 1826c8ce9b20ce3678eafd6e5da0aa89371f256a902473432e82b0001687c80b SHA512 e2dd6c928fa3157189f364c3f931455405075d72e8ef451ccae35667416ea69933210c215a71ef8cbb70e6cfdcc4270f80fe01251ad73cbed2924cf5824d0bc2 WHIRLPOOL fc9bbf9b2f2c5df736627e54cb4e2e74cf59899a24d524cbb614b304cad1fb41d2ba4c209c05fb0109a22356617149049d9e9505e26373c24ed29bf4f1b53d5d
 MISC metadata.xml 174 SHA256 c0255e6a66375ac0e7f11c3712c6b47b7746432df4cf518e10c230674a6bc4f0 SHA512 b704bc8a6cbe98854b84a2ddedb7a2bc00309e3290e568dffed0bafc0acfcc81d6edb73dfacb95c56eef85982c2131f108e96abf55018ce45eda886f47bba1fb WHIRLPOOL 0e5a13b34c4e1ecf2888082f0c45255a63411981fbecbf4b8766de0f77993c2e6293f2ecb441adf901b20a48a56195a434cbb56c585d7e33693da12733ccb693
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV2t3AACgkQ1fmVwcYIWAb2ZgCdHH+Qy80myLk7I96tMuBN3jkN
-RokAoJ+SoR2lDmpM+poxbWupcWWs6HiG
-=DC24
+iQJ8BAEBCABmBQJVgkkhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwIAP/RcxaLAGwpbI2liAClHCwpfJ
+6kAUOY5pXliVVELr2N1kQtv/xOpDZtOPodGu8tcnCEZyRVZvLNf3R1glBN74psLI
+SZJqyUSzur7gLcv3WfzXaqdCYGMlmYDkv08TT9UryghluV2fmk+LYJ0UPcNYrJuT
+QyxEYJbH36iF1sHzd3hFLp8Og3FAiSzOVKInjrUDNpWh+PIRCPVI0489fs0Y652s
+xJWXfvd73j2cUFW8s6YysMGBVpNzEf1ud4jrfFgJd+OMVihnnKsgeXJWkeRreavp
+JaEDhmfZpLRcbifNHk/FGRGcZ4ibe4ejkAjQ51zjIQPIfyjupvYRTA87aYNg1xgy
+2Ni35MlQq3xZprxUscmly4ZiBzcpRZ457BSfLeDMyc0HjtW67V009B9IMLunyyJh
+ihy1t/ZJHnpfA41xcBCxHqbiJA2NxI41cQUkDALWDzmTBNMi+T/cAKNJBK3i86Ey
+fHYhuZbQ+r05HcCyfhl8BMTk9T2Omp7AWxz1xTLCihfAYdHjL6NoAZxdnHIJOhL3
+os2mKmiV/PhLdzOZjCNyQ8e7asMM6rlftiYGCvAS1SXVAX4EqOkQKFk5C2xQDmWU
+2TfV26JsOUs8Zr/JNmIx/eXHTtWxZASol6PZ5bHyVgjUiSikWLWz4qPIStYwvRxp
+BZnUhKYK0Eyn/ppzWtE0
+=4E9P
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..b87fc74b2d31
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild,v 1.1 2015/06/18 04:29:20 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.15.5[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( >=dev-libs/libxml2-2.9.1 )
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751137
+	epatch "${FILESDIR}"/${PN}-2.16.0-out-of-source.patch
+	# Fixed in upstream git
+	epatch "${FILESDIR}"/${P}-null-gobject.patch
+	# Upstream forgot to put this in tarball :/
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751138
+	cp -n "${FILESDIR}"/${PN}-2.16.0-atk_suite.h tests/atk_suite.h || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p $(use_with test tests)
+}
+
+multilib_src_test() {
+	# droute test requires session bus; ignore it
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h
new file mode 100644
index 000000000000..17aefcdd03d7
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-atk_suite.h
@@ -0,0 +1,36 @@
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; https://wiki.gnome.org/Accessibility)
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _ATK_SUITE_H
+#define _ATK_SUITE_H
+
+#include <atspi/atspi.h>
+
+#define ATK_TEST_PATH_ACCESSIBLE (const char *)"/Accessible"
+#define ATK_TEST_PATH_ACTION (const char *)"/Action"
+#define ATK_TEST_PATH_COMP (const char *)"/Component"
+
+void atk_test_accessible (void);
+void atk_test_action (void);
+void atk_test_component (void);
+
+#endif /* _ATK_SUITE_H */
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch
new file mode 100644
index 000000000000..a8f02a0eae1f
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-null-gobject.patch
@@ -0,0 +1,26 @@
+From 72220192a31df6b297312d82f059e9824e8a4dc3 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <christian@hergert.me>
+Date: Fri, 15 May 2015 13:07:18 -0700
+Subject: [PATCH] atk-adapter: be careful with potential NULL GObjects
+
+I've been seeing warnings in my Gtk application for a while due to this.
+---
+ atk-adaptor/accessible-stateset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/atk-adaptor/accessible-stateset.c b/atk-adaptor/accessible-stateset.c
+index f82910b..82820de 100644
+--- a/atk-adaptor/accessible-stateset.c
++++ b/atk-adaptor/accessible-stateset.c
+@@ -185,7 +185,7 @@ spi_atk_state_to_dbus_array (AtkObject * object, dbus_uint32_t * array)
+ {
+   AtkStateSet *set = atk_object_ref_state_set (object);
+   spi_atk_state_set_to_dbus_array (set, array);
+-  g_object_unref (set);
++  g_clear_object (&set);
+ }
+ 
+ void
+-- 
+2.4.3
+
diff --git a/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch
new file mode 100644
index 000000000000..df9f006350d4
--- /dev/null
+++ b/app-accessibility/at-spi2-atk/files/at-spi2-atk-2.16.0-out-of-source.patch
@@ -0,0 +1,55 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6d388c9..b05b9bd 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -9,15 +9,15 @@ atk_test_CFLAGS = $(DBUS_CFLAGS) \
+                   $(ATSPI_CFLAGS) \
+                   -I$(top_builddir)\
+                   -I$(top_srcdir)/tests/dummyatk/ \
+-                  -I$(top_srcdir)/tests/dummyatk/.libs \
+-                  -I$(top_srcdir)/tests/dummyatk/.deps \
++                  -I$(top_builddir)/tests/dummyatk/.libs \
++                  -I$(top_builddir)/tests/dummyatk/.deps \
+                   -I$(top_srcdir)
+ 
+-atk_test_LDFLAGS  = libxmlloader.la \
+-                    libtestutils.la \
+-                    $(GLIB_LIBS) \
+-                    $(ATSPI_LIBS) \
+-                    $(top_srcdir)/tests/dummyatk/libdummyatk.la
++atk_test_LDADD = libxmlloader.la \
++                 libtestutils.la \
++                 $(GLIB_LIBS) \
++                 $(ATSPI_LIBS) \
++                 $(top_builddir)/tests/dummyatk/libdummyatk.la
+ 
+ atk_test_CPPFLAGS = -DTESTS_BUILD_DIR=\"$(top_builddir)/tests\" \
+                     -DTESTS_SRC_DIR=\"$(top_srcdir)/tests\" \
+@@ -34,12 +34,12 @@ app_test_CFLAGS = -I$(top_builddir) \
+                    -I$(top_srcdir)/tests/dummyatk \
+                    -I$(top_srcdir)/atk-adaptor
+ 
+-app_test_LDFLAGS = libxmlloader.la \
+-                   libtestutils.la \
+-                   $(GLIB_LIBS) \
+-                   $(ATK_LIBS) \
+-                   $(top_srcdir)/tests/dummyatk/libdummyatk.la \
+-                   $(top_srcdir)/atk-adaptor/libatk-bridge-2.0.la
++app_test_LDADD = libxmlloader.la \
++                 libtestutils.la \
++                 $(GLIB_LIBS) \
++                 $(ATK_LIBS) \
++                 $(top_builddir)/tests/dummyatk/libdummyatk.la \
++                 $(top_builddir)/atk-adaptor/libatk-bridge-2.0.la
+ 
+ app_test_SOURCES = test-application.c
+ 
+@@ -52,7 +52,7 @@ libxmlloader_la_CFLAGS = $(GLIB_CFLAGS) \
+ libxmlloader_la_LIBADD = $(GLIB_LIBS) \
+                          $(XML_LIBS) \
+                          $(GOBJ_LIBS) \
+-                         $(top_srcdir)/tests/dummyatk/libdummyatk.la \
++                         $(top_builddir)/tests/dummyatk/libdummyatk.la \
+                          $(ATK_LIBS)
+ 
+ libxmlloader_la_SOURCES = atk-object-xml-loader.c\
diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 16c5cbc41749..5a93d158fccc 100644
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.207 2015/06/11 14:22:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.208 2015/06/17 18:45:58 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> logrotate-3.8.9-r1.ebuild:
+  amd64 stable wrt bug #550032
 
   11 Jun 2015; Agostino Sarubbo <ago@gentoo.org> logrotate-3.8.9-r1.ebuild:
   Stable for ppc, wrt bug #550032
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 1aeb96ce57de..be4ebc47fcd3 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -22,24 +22,16 @@ DIST logrotate-3.8.8.tar.gz 72014 SHA256 46a1510ef4a1f4359edd5f361112cfd1523942e
 DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
 EBUILD logrotate-3.8.7.ebuild 1849 SHA256 116d9d98db5e808f4a15a85f80843bb322534f2b09aad38e700b49e9a205dc95 SHA512 ee3d564aee262200c1ed35f8cec1d7817d6f8e1baaf7c4f68744f16bdd36b1183950958b203383987aac2ecb2ccf914c40c7c15f9242d0f6169b8c3520f0a90f WHIRLPOOL 7588c0fb1b9bfed3460b2af1363325180945fd7a56ef1086ca956068854b69ef443b7a9c890f4925d7f30b77ed72cef2f417d7507faf7ecaef3e1f48ad21e799
 EBUILD logrotate-3.8.8.ebuild 1869 SHA256 4b3bef44e807701b031911599add90da2930405273e9dd47376fb43308e7ba95 SHA512 daf99a58996f293df91a2c691101fcdc7c64ed687e47bf98f43654bf4622854ef7669b87e15be8866850dbdb5b92b06124f17ffa3bdad1b3ae5ae80e8ba712c0 WHIRLPOOL ac534b3b0636b057684681097dc0ec2c4b3828677be4d5451ab8915db719e9b4231931c8a6834c267c8f4ebe2a43b83ab0718ee081b2bc0846a2d9c096c1571d
-EBUILD logrotate-3.8.9-r1.ebuild 1919 SHA256 b0a268d9aa3d38277dd4cbd7b539aa5903e7094c05c90fbda5eb591b542b3152 SHA512 5e4773935aa3f746bb3b6791c326ea0fbac6e728dd79a0d2904423c32f8b50f22feeef7cb720da08c9171bbd7a4a1dd7d9e10f07b03947984d7c568226116194 WHIRLPOOL daeb409d3db02106b011935156cff2c0bae2f750bbc8fcb017801ff3acbf59aaaa0983e9fcb46c03e735e83751608ec6806a5c27998974c0ce5006e6268a8e70
+EBUILD logrotate-3.8.9-r1.ebuild 1922 SHA256 70c73b90ea464c46b0f2da74fdb78ffa0b66a6bc12b05df561eb1285642891de SHA512 10a89e5076e2450870c35da3ff104bda531aa11244bbc16eff133cc7f2d1f53bc23c100fa66cd763719c1934d18a98feb92ca85f50db92cea055fc3d4712f3ec WHIRLPOOL f18aa48460b8019a375983ef518c4c1fcaa192728711372fe43ec8ffb8829958a5abe8d332f54220eee221a9e5ac7d511004837896655e662eb9fc773c935b5f
 EBUILD logrotate-3.8.9.ebuild 1919 SHA256 07cf01b012249257941425844e310fdddc4d565f278ddafc107555bb3da1a14d SHA512 5c7409f0922e7c27848c28355c99e2c7af5ef6a11661f90214234ced58fae4ef7235558d381619ce0da99c98a26f8496db08ff33164dad8319a66ae318dba32c WHIRLPOOL cd6e99ab3dfad6c00a87d355dfc4c2c31d38316584d02375cae12948d423b273e35c60eb53bce40099d716071cbd7a16cebb55446450d29916533cde3ee6882b
-MISC ChangeLog 30277 SHA256 90dc72abc272a38af9a88fa708611b192a0eefc8af18140f99b9b16650a1bf52 SHA512 1c5bd86efba27796c29e0aeb83627422ad0b3774a4c90a61e683877e2b121cb86d8780d1488fadd1fccb9c3afaa7ded1cea044ea03fb1dc9ad64e5ce751bb16d WHIRLPOOL 908d579bc895801d36a9fb3e0af6d34972df6feee68636b94a9d3f1f1c1feca80c7dcee1623944708a3cb1a8adca261edc96f6184be33db5f98aa19223b4663f
+MISC ChangeLog 30390 SHA256 a4d195cd44ed40ac8b20b07e30455278a6c21e887d67892f44067675b5d0df29 SHA512 319532b9e3d06f5d482e5cd88d06592f07b7255f700ae8b41d8616fe07474af7519ce5e329a899808b4045926652e0ca564ac82d04bc24c42b020436e5be21b5 WHIRLPOOL f63e0feb580513ac040479f73af86abbf400c10770021f6fa9784448e63b868eebb98824f3954805fefcdfbfce5e960324e4a603ba3146610f458711bae87fc7
 MISC metadata.xml 1021 SHA256 38ee9077db5b0f3223b2ea558b0c86fcb6c76fe2f1892c26d10d3b88c7e7b64f SHA512 dad453f4151ca9454c4374c6b4521e861b6adaa7352f147b0809e80ac2b6cafc51db04eca428754b48bde9caa2f54ed84d0b383c496c45684c0510be0a4ef575 WHIRLPOOL c260e541af2a735ec5bce0bf38eb060f002daa3ab4b41bd9c1dc3187c3ab669bed34a1bf5f4fe0713f80588bed6c703968302baf67022faf7fd80bfe07dda113
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVeZm2AAoJELp701BxlEWfvTwP/0DY0A+jSi92XaI3pouE+wzG
-sjamBIP6kJ4Ub97vrYiCH7I75frtWLOYpoYQhpwGm3iAtsW/S5irV8E9J2RfZebs
-xL1/Uktc3mW8ZbVxa5AnxYPZthHYw9sq2sAH+87XcsaebYttbYR75p3NU7y4NwtB
-phlAfUYxZ0rvBwGanxW3tbI22q7aQi7jTfPvet9D8WOc7Exo4qoA6bu7LBql9ydR
-20taa7qxMcxJPkibfQzudxh0JsVmDTlssk4E0AS8f4/LvyXFtKe0JnnAvcA0Zx0H
-de/+KA5roQpiL0rHaDetEHUr3vG2wcydfb1q+CaHp7BuCHadW8ajfkf18SBlJ5oS
-EOgwo0qOVLmaUYTlNOuJ4hf7K5dnQ8cHIILYeSCllKWiwAq+tzoYZnkPVVjKFeVy
-LLudFhj03/nzTDipBilpFnfTesq6n5jnTp7Cgt99dnt3oG7487TMhOCGx90jwEgj
-fhSpnCq1t0dUafhOiasBfZ2l8kzKlfvV5crFxYtBt34Ob34e7cbEW791Nokwvn10
-aAUzc065TMhNZZKdJyhhhw+BmzZuIQvwo6/m7FvuslD5RQSSQPoaytWX/skGYF0D
-WMRDHu679Lhw/BUZFFIiJmaLvq23rVzKXw+KfGEStLFCZv2ONPOV51ASQ4da8dJq
-Jf6elekmV3Fh5dNZVm/6
-=0ZFa
+iJwEAQEIAAYFAlWBv+8ACgkQG9wOWsQutdb7RQQA0s0fZArjp27oDK7PWrcPuC+8
+dVD1HMkVBplHaHWQPJMnAQzg3PBXI3GrzwHAlMlaK7BotI1a7kICTZqEk8+Fg7yi
+92uhrSiKXN4LQvCgVHe0F3lNm48X2OR7WwRT/LONhkn0J7ejxvTSWy5nbpusY1vv
+YvRcDdlokHzNBt2xwnM=
+=TQ/l
 -----END PGP SIGNATURE-----
diff --git a/app-admin/logrotate/logrotate-3.8.9-r1.ebuild b/app-admin/logrotate/logrotate-3.8.9-r1.ebuild
index 59c4359ed943..83b74d711d37 100644
--- a/app-admin/logrotate/logrotate-3.8.9-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.8.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9-r1.ebuild,v 1.8 2015/06/11 14:22:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.9-r1.ebuild,v 1.9 2015/06/17 18:45:58 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index b0e5b6c2fde2..8d62c73befc5 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.170 2015/06/16 08:48:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.173 2015/06/18 04:50:55 jer Exp $
+
+  18 Jun 2015; Jeroen Roovers <jer@gentoo.org> p7zip-9.20.1-r5.ebuild:
+  Stable for HPPA (bug #536012).
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r5.ebuild:
+  Stable for sparc, wrt bug #536012
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r5.ebuild:
+  Stable for x86, wrt bug #536012
 
   16 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> p7zip-9.20.1-r5.ebuild:
   amd64 stable wrt bug #536012
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index c73f05d704b3..fc2dc5553b21 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -11,16 +11,14 @@ AUX p7zip-9.38.1-osversion.patch 838 SHA256 135de03123263910ed99d1afa07ee4a39e47
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
 EBUILD p7zip-9.20.1-r4.ebuild 4260 SHA256 8de34f46051d81c9b92f6479c3e77e1f366af48eec839908056c837bb11d569d SHA512 c19950e5a629d3f3f0b9083a00330ee93ef40e7dd2e69602c544938e96eaa0242df4f02813c5ca0b0ca8d1b69d2fed308150a79a1b8bc55b4f35c2933e77310a WHIRLPOOL 184124262c40eea989041d0076ba814f87f457b8407c1294c3596b983b33b2c91d29e0adbf3af5df42ee73f94aa4a9c491ed88f0ac3b95f3e8034c9097c7faf9
-EBUILD p7zip-9.20.1-r5.ebuild 4318 SHA256 cd5f6d2f7b57e12b89fddaa75f2c59b6fc1adee8feabe402b10168d2060ecd39 SHA512 4544001b0c9a89fe402c800e09e2fc00d43b48ba3e8467ed8d9ccc98a902cc29e83416563a0dd77d170666317ce9d4e050bc4d65caa8286d78df753e115782f7 WHIRLPOOL 510b9a637aa18038cf9632bdb73e16b621079b53691a77a29f7151e56672623cd2158e4c958f7c621c48d7311cee6830196bba6947f80ce247d85956fc178d42
+EBUILD p7zip-9.20.1-r5.ebuild 4312 SHA256 6fb28b4f0f0ab31f757e6d910a29b3670a926dc98a156623abfa10d843f5ca48 SHA512 3da134feedf7a7455e9b693c04b921a9c703cb4aa913ab35498e7fddc400a5f5291e749fa7565148a511b9ea4488b0ff2adddfaeb309404259ccd7f87e6dcd5a WHIRLPOOL 3df5fda4ac7a1e7cef9b884aef0f0b20d6dcc6350f3a0412e81346ace2c0c84d63ddbabf1bd1ad58dc269cf0fa1f98391b8c4a861ac19343601b56c07268800b
 EBUILD p7zip-9.38.1-r1.ebuild 4320 SHA256 e434505eec4776080c5a1a6fef1876750158e6c2763dae767cc0f1bdefd3f049 SHA512 0e3c12a59c08df1de264abadf281592c1fb3617391f31ae6a9154fe90dbc5723bb1a7bec89a8873a3044a7688edcb2917299fdc44e87c752018c066d009c1d81 WHIRLPOOL 43056a742c6dfa93988223334ff8b4462e9c82a809a2675230d010bc35225e55c1e41a6b240ac500bfc07b3dee253edfbb762f7b420f19535f58a62c2c25ed50
-MISC ChangeLog 22532 SHA256 3b2f171f75be4662eb2f31ecff3e3481c52f70f5cb1770e24a7174fe4b7f1876 SHA512 0d35d1cf468b0542a10b1454b00d21a0e5995dfaf8c2a9171f8b5cfb777a8336a6bc20aaf8cc2c7ac7aab74068c19fda74ebbe7e9f98a5bfb5f3ff1a38abecf5 WHIRLPOOL e95758aabbe9ae11a4f079cad64d32a659b3e7edf2f7d2fc9517bbab88f9389a1984d263a32ea131b2d149c180287e90af73853d64b0b93aad925dab022b457d
+MISC ChangeLog 22851 SHA256 b948e5f97d3d0d66f3b7fda3a65fe325e455a7a8dddcb968a5087805e49097b2 SHA512 3fe0f7a919e07b0bbf32e7513f12718397aaf9ca31d6c8e8b71f58db09bed107349d8bca05e386bf9db601b946cb1c735b5c9f1c536a02e82ca8ee041f6a865c WHIRLPOOL f12e90b1c31ea699e563f7f6587e8e9659f008d81ad92b4058f9ea2a2410c4ae0999088c3946ec13c99fe63172bd770a199db78059b0a68ce85edf163edb2372
 MISC metadata.xml 411 SHA256 d4848799ff75dcb348928517060b9a97f5f9b557225d84bddd11612faf490c1d SHA512 88c14e42985fc90bb93a9253cad3179217046d9a99b5b4489ca1fcfa8a977a9859628cfc45c9dbd1c3c358261af7544039da001f66fa87c6e284a548572a8afb WHIRLPOOL f18e7509f2585fab1159773490e690f968cf19f29e4537d30a5a964bb3a3b135945f9fd3ee20821a52326861eda8096d43929ad986b7b96a479c7c65d1b38677
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlV/4mYACgkQG9wOWsQutdYiHgP+MvLInGeH3I/eJUkiI8eV06/+
-5WvCHdeOEYTi8EuSWy7tiGP1hw90mIPRwBwa6Q3+OdNJ5rKIhuSFw4VzfYQey7r4
-2RYfudDqGXJZ8tCBV5JrHMJuHjY6xAHZiCLCh93NfdJiOwM7I2lUHgZfQ0zjbzvA
-DNAiGL7lLnMTMA7qB3M=
-=TF2g
+iEYEAREIAAYFAlWCTjAACgkQVWmRsqeSphN/ewCfYzrDSpd/hJPY1GvnWrRGhP/r
+2OkAn3L/3Xe4lE1NLGLcYiFxSIJkSOTP
+=yviW
 -----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
index ab89ac9d9f0e..2fd717f4737c 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.8 2015/06/16 08:48:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.11 2015/06/18 04:50:55 jer Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc kde rar +pch static wxwidgets"
 
 REQUIRED_USE="kde? ( wxwidgets )"
diff --git a/app-eselect/eselect-opengl/ChangeLog b/app-eselect/eselect-opengl/ChangeLog
index fe6b81187f98..13a87c3ecc88 100644
--- a/app-eselect/eselect-opengl/ChangeLog
+++ b/app-eselect/eselect-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-eselect/eselect-opengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.2 2015/06/17 12:28:01 chithanh Exp $
+
+  17 Jun 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -eselect-opengl-1.3.1-r2.ebuild, eselect-opengl-1.2.7.ebuild,
+  eselect-opengl-1.3.1-r4.ebuild:
+  Update x11-base/xorg-server blockers.
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> +eselect-opengl-1.2.7.ebuild,
   +eselect-opengl-1.3.1-r2.ebuild, +eselect-opengl-1.3.1-r4.ebuild,
diff --git a/app-eselect/eselect-opengl/Manifest b/app-eselect/eselect-opengl/Manifest
index 0df305bd0347..ec8d50d97866 100644
--- a/app-eselect/eselect-opengl/Manifest
+++ b/app-eselect/eselect-opengl/Manifest
@@ -5,22 +5,26 @@ DIST eselect-opengl-1.2.7.tar.xz 8292 SHA256 1f0d3e293c25cf9359421a7a0595278f5fc
 DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712cedc5608720f40e0 SHA512 55fbee9cacde8a059ab1c25fbd5652d2879ac57423d2be7a1e947c5f4e82c2e1ff957441a39545958859435b88e69783e4f116dc3364f03378519df7476f121d WHIRLPOOL 493c86294f7bcade1e8ca427eea0f01cbd7a8e4f21a2f678f896af7fac06f8b6d04ceb8e93f2aacfaae6457a0368aa0c911dea90b31076cf77ae72fb492b3676
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533
-EBUILD eselect-opengl-1.2.7.ebuild 1769 SHA256 fbf8c51784d9daa0433dac1936036f5135cb569ee9e1e3b01adb64c4ceaa25c3 SHA512 d109fd1aba4014284f90808a8a35ea82fb24f7132001bb7ce758bfa87ad9c21e40ee78252634bf7746013090266ef485adfdf6e38f1644c5e59612a25bd23760 WHIRLPOOL 539841222751698a51f767f757ddb43375047eaa0a45618e5064485c88d14f19ea51294118a4e9ef82ec301bd6aa3b3410e782f7daed22b61737105b9f9b08a3
-EBUILD eselect-opengl-1.3.1-r2.ebuild 2657 SHA256 3b4057951bb7ae9d3d2269720e4a83f4c51d53ad482969b00c7cb1210eeb6e76 SHA512 9f6b3402d9869848c277c2265b42ad860bad7dc00e7b5a9b61d15b3fe6f67db20e9ca921b8275f82f3f43f3f68ae68971389a9475673a940cfe0478e738b76d2 WHIRLPOOL d5c2c50116894777d23e70986c7448858b5ef883373c0ac6d7acc1f053176743071dc2d457449c4f8ffa17dcd3f202bdcbe23e636ea31c97cd4071a39ba03214
-EBUILD eselect-opengl-1.3.1-r4.ebuild 2237 SHA256 b13a0f5640b91a2d3517225b7f42fb15ef266046a701a0e8c22002eb4e6ea072 SHA512 9986588a9cd0c5e19805353d46132224842e1bcac43b9f529dfa2ff02273ed95db51fd3de8d6dfed32b41db5270e3d26a5903cf72a372d1c267ec6143616efef WHIRLPOOL ee1c21ed5c58d9b2c32660f3626ffcdaaca5c45be743dabdf27ec20ec6e2c94e79495ed1ef00aea9b47ae7b42b17607cb2e3cff8cb6ad3bc9992213f91a3b212
-MISC ChangeLog 21537 SHA256 58feb4c16d8cde3bd0889961a4e2a99e09a803abee4493fe55510b17a3f02714 SHA512 747fd046e173de80ce7603cf618d87fc063335e5af5e4911f5b46d47f3c8cdcb5720acaaa2205ae270914f8905b7b084c4a0458db0fc72a057e685599c38d04d WHIRLPOOL a17293ba606816ae57387f841eae7c2e52855db7fc13afa668edb60a495b95f24f73fc9189f4a1f9c9589163d874f9a83b51304dac9f0ef5b7750440730efe95
+EBUILD eselect-opengl-1.2.7.ebuild 1811 SHA256 d972fd8e40304a868019b6456546d8cc856c708b3f736d5717056cd5b31b8e9a SHA512 0f2ba2bc2d2c2bf5dfd1adec64c1bafe72534438e91a25230e744580056ccfd1421604c9426b1b5886d092856016a17a5249659e6ee7cb7d6142d379accc5980 WHIRLPOOL d4156cadbc51095b1b581bd31487d569f4c2d9a680ded82abe687f40d899992d23e559abdb6a4ff9d4c2c794827107f02263aca5aee02a821b49336894e4ff7c
+EBUILD eselect-opengl-1.3.1-r4.ebuild 2278 SHA256 2ad0affccceb678714156d0707eeb659bd3b87e64b56ab7e3d0f61945565259c SHA512 d0ab9ff2553da182bfcb53d17514306d4d73132cd42c4716f1fe53e4b0d56d71cb6967ed14e53f9627b615f5029fb8260478769cfd4916120e211560f0328d74 WHIRLPOOL 3c82b20857bb88add87a5fb280409789e335544f102e94a6429c023930d9f77b3565a5a261638d2cbd03e9efd1c0fc7d9ad7db35244d69fe3a6c884d8412f3c9
+MISC ChangeLog 21750 SHA256 4c7c999375d327534fdd7f027070e3d9c6665bbbabad4ee39307f9912844f61d SHA512 b13febb4189a8d073cc39a13919ff46e862cfc3f9938bf9d8a161370eebb2a33a616686ba3f13f358c9d2cef8817ce20ed84e28090604142608f7d99670aac9b WHIRLPOOL b80c94a820f096186b7cbb221707d88ef04f64a5400327b6193fbfbda053483d15d2e15fc69e9c2331d1f0475d5dccb7a39e40d271fcf699f8cba5dccbcc6fe9
 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGtD4AAoJEJQzkH1pP7W4QUoMAKrR+PtnqKuPmkv/kMIVBVvU
-ffBBDS5mjcxfl/eUSlufwJTptNmXbLosn1LEo+K/NhJHcTz7s9028nvb5k1lqSTf
-ghEYdHKvYvjOQotRyQSgB8acs+NtHdvRWv0OvvPftoiAB9KSRE5twBujrG+sK5MS
-D1xadicwralKYa7f1N+7nW78Xw06Ruyg52ZMIGZpLa84ivN5qyLDBlI3qH5o/zgh
-m1Kk1LpWaGyshps0UFPmV6BxX4TLqqH6QHqGQH0QT+CztMSGc02OqmU4eZz9vVmr
-b7p3GWBtbR9hUhD+amaQVvqOwb3qpVUJd83wLCf5yuQorYTHNeC7T+w81+eVf5PD
-IiIRrTg8gyZWivgd2uiFS2LbBFREKz7+vUqeP/OWIZn45pt8OVmQ/QGh+QgPhJ0X
-ka4NYcpx3RGkcEd8+iK6EyTdpuvvDvc2vtLCKRRedvIuv78NwQXH6yPqmX1rUi3x
-OJcJnSnTlR3z9NZeZx20v2/HMFj7gR54LNNwf9g/PA==
-=Q/V0
+iQJ8BAEBCABmBQJVgWfcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR8hAQAJJtNBigjaZrUyx6fKdEuwwz
+/miNiM61j+ClZyuIcynZY/yFyQpYLNt7TTAZ0wBgfgxmgG6nXgksGFF9NM7CF3x3
+a1bIdipyFoRs3imgunfxqxT19y5BrSTnuWsC/eKcJquGt8eBP81gFL1Wse1ZB7ei
+Mtlcu+MqihpRlP0puoW4wEeBvC9Xml8pWdM1yZfiblfwDi6dVHo6ZmPp/zYd4IG/
+4c4/Q1uxL6EP/J0RU125snFcUhCiXk2i8bnrXOADwkXZkhGs2hrSTTV5YIZveJZh
+pgGz+VGdQRcn/PFZhTKsokNbIj8dwmuSTo802aW7ySlR7B51HdEJJtJPVcGV1wSI
+z1HShVR03wtxClrDqW+I5cPMmYTD6d757wSpYXuej5MiwsErisEcMKXOLu1ULS2f
+aPKEQfHsBr+wBRNy+4YikB6fjkRpa7p3OVeBo0SaH2d5hziH2quVqBLCUOCzDtfo
+PGSgVLzKBUU9+t6AUP/9KKxL52oKQgC1tYl/432Vg6mnpzuY5quJl4hyMYXrlUV7
+AUwbhX/lXB2BMsW7UmQVZSxHyfVauSozokASlwho0n7D1Jd8++HULMm30BAGAogg
+c5vylSF0GpLc7p3oBrtlF5USjbSsDEjwvM5Mu1f+PPV2pyGB3GPSM9sI9Fi+txs5
+UIlfLRy3LMQPLSa9mPgB
+=qcUP
 -----END PGP SIGNATURE-----
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
index 4d4b96ea191b..624a4c670f9b 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $
 
 EAPI=4
 
@@ -33,7 +33,8 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !=media-libs/mesa-10.3.5-r1
 		 !>=media-libs/mesa-10.3.7-r2
 		 !>=x11-proto/glproto-1.4.17-r1
-		 !=x11-base/xorg-server-1.16.2-r1"
+		 !=x11-base/xorg-server-1.16.4-r1
+		 !>=x11-base/xorg-server-1.16.4-r4"
 
 pkg_postinst() {
 	local impl="$(eselect opengl show)"
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
deleted file mode 100644
index 5f760eafb86b..000000000000
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://www.opengl.org/registry/api/glext.h
-# http://www.opengl.org/registry/api/glxext.h
-GLEXT="85"
-GLXEXT="34"
-
-MIRROR="http://dev.gentoo.org/~mattst88/distfiles"
-SRC_URI="http://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
-#	${MIRROR}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4
-		 !<media-libs/mesa-10.3.4-r1
-		 !=media-libs/mesa-10.3.5
-		 !=media-libs/mesa-10.3.7-r1
-		 !<x11-proto/glproto-1.4.17-r1
-		 !<x11-base/xorg-server-1.16.2-r1
-		 !<x11-drivers/ati-drivers-14.9-r2
-		 !=x11-drivers/ati-drivers-14.12
-		 !<=app-emulation/emul-linux-x86-opengl-20140508"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local f
-	for f in "${EROOT%/}"/etc/X11/xorg.conf{,.d/*}; do
-		if [[ ${f} != *20opengl.conf ]]; then
-			if grep -q -r -s "Section.*Files" "${f}"
-			then
-				ewarn "Your ${f} file seems to contain Section 'Files'. This is known to break"
-				ewarn 'eselect-opengl-1.3*. If you need a custom Files setup, please downgrade'
-				ewarn 'to <eselect-opengl-1.3. We are sorry for the issues, we are working'
-				ewarn 'on a more permanent solution.'
-			fi
-		fi
-	done
-}
-
-pkg_preinst() {
-	# we may be moving the config file, so get it early
-	OLD_IMPL=$(eselect opengl show)
-}
-
-pkg_postinst() {
-	if path_exists "${EROOT}"/usr/lib*/opengl; then
-		# delete broken symlinks
-		find "${EROOT}"/usr/lib*/opengl -xtype l -delete
-		# delete empty leftover directories (they confuse eselect)
-		find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} +
-	fi
-
-	if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
-		eselect opengl set "${OLD_IMPL}"
-	fi
-	if [[ -f ${EROOT}/etc/env.d/03opengl ]]; then
-		# remove the old file, moved now
-		rm -vf "${EROOT}"/etc/env.d/03opengl
-	fi
-}
-
-src_prepare() {
-	# don't die on Darwin users
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/libGL\.so/libGL.dylib/' opengl.eselect || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/eselect/modules"
-	newins opengl.eselect-${PV} opengl.eselect
-#	doman opengl.eselect.5
-}
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index d9f7696ce9bc..5d569c032aa1 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !=media-libs/mesa-10.3.7-r1
 		 !<x11-proto/glproto-1.4.17-r1
 		 !<x11-base/xorg-server-1.16.4-r1
+		 !=x11-base/xorg-server-1.16.4-r3
 		 !~x11-base/xorg-server-1.17.0
 		 !=x11-base/xorg-server-1.17.1
 		 !<x11-drivers/ati-drivers-14.9-r2
diff --git a/app-eselect/eselect-wxwidgets/ChangeLog b/app-eselect/eselect-wxwidgets/ChangeLog
index 107e75482d6a..21212c75c645 100644
--- a/app-eselect/eselect-wxwidgets/ChangeLog
+++ b/app-eselect/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-eselect/eselect-wxwidgets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/ChangeLog,v 1.2 2015/06/07 09:28:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/ChangeLog,v 1.3 2015/06/17 19:30:51 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org>
+  eselect-wxwidgets-20140423.ebuild:
+  amd64 stable wrt bug #532968
 
   07 Jun 2015; Markus Meier <maekke@gentoo.org>
   eselect-wxwidgets-20140423.ebuild:
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index ac51096d2bab..e1c6e2e6a959 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -12,13 +12,15 @@ DIST wxwidgets.eselect-1.4.bz2 2375 SHA256 630d2a79e3c1a124a124a81db1213e1c036a5
 DIST wxwidgets.eselect-20131230.bz2 2228 SHA256 7c3c87931b6887cf1e6c486b17fb71fefcdf6fcf8089fe09d7f70ae17e3e0722 SHA512 0406cfbc5c39d2e65b22d0e8d70ea08ea9e348342d7bc1725dd8655fdedd883fd29e14263ad95737523d6285e081ef4558c4dec00c4a9ea9b9ef01ce537978e5 WHIRLPOOL 60a0ea44ddf1faab42a63f3717aa9d1234713eb40897025b7de8ad7f64f3a77c3399f084eb3a67e236b42963d7d793f0026ea17c10ffd3328fa109218a3deebe
 EBUILD eselect-wxwidgets-1.4.ebuild 1563 SHA256 49f147201eb1fb639a1544de787615fac59eef6aa7468341452e71144c1fe588 SHA512 96211fecfb58d36d1c8e6be125e0ad53e386a2a3ef7ca5231c6a7d5fe9acd75097ee628ef75653f02dfebb20eafb45f60189aa06f80164f543e3c8692c9c6578 WHIRLPOOL d2b5bac5cb804f153882ca6e0a5a8f068a3ba6010db6f4c7f7b2d3777bff1ad9bb88e6388117037c123b5257eb71c0e1ec14fa3c5e973c4161f931b4331f82c2
 EBUILD eselect-wxwidgets-20131230.ebuild 1329 SHA256 70645a6b5a761b02b62177ff7d0cc89b696e89921b8eb524755ee47bc91e4858 SHA512 19e9e41b576dfe509978b211cf9e7a26ffee695e3c683d02dd53c4b9a32e454309ba8af1929d6764d45818f1a3ac4fd5daa4c038e5fc8dbc03a3f81df801c73f WHIRLPOOL 8cea356024ad5fdd05326f29104d30155a25b481670fa5d48457de458de1bffd489e98d79f4853a5b423d41bf243f784b3dc3613a1ed339183adb59a1a79cb20
-EBUILD eselect-wxwidgets-20140423.ebuild 1557 SHA256 08959efd93a9c1f4cf49d7fa0175dcdebf25493fcb978dbe7c067c0f1dd61483 SHA512 d12caa6e3da16013b3e4f66f52c9ee68ed666097453a33f78e7640c4a5c002079870540fd8fd5d0b655c22e29f49ab68e50e01899ed7e72c0f5d8e6d9bf7f79a WHIRLPOOL fd634114aad82ebd131664e961079874910450752cbd991644235cef38fcafe7bf7ea16498ce60c6e375cc7f0cfb8856d8ebe531cd4afca97f32ebe137e5096e
-MISC ChangeLog 11066 SHA256 9f1b0736c32e9005edb57dd3c1208697e7918b003934d559a80bb2a21410bd28 SHA512 76115c61e7744ce376a898f13c6f53447e24b2a50b0485f8c8df5defaf153e94259ef5662bdb1f515667b08f39350f0cdca517ea641708ca5508ff5283cfba54 WHIRLPOOL 367ca71142cebcaa4082991e5cb97804e73aaad3d153c4be4be8d635857c038c405a49ba5e683bc4f31fdf9342d5e2ba34ab2096ae494abe60f9355673ecb292
+EBUILD eselect-wxwidgets-20140423.ebuild 1557 SHA256 1e2059f64fab97cf65766cd5d8ec46b83af0464cd75cc6d25e2f9bb1ffedfe9f SHA512 ff0b6640b9678af620f0231f29d6d6a41105aeddebd136bb27be054e9eb55d82562950c225b91b0e6b96bfe7e2be13ce0cb47fd080ac5f2890b17b09fc78bf81 WHIRLPOOL ba036ce9cba6fc7a3964eae374238767364bde30ef56b6142ca8f681aedc4b6144b15d6d7ce30340dbbf3dec68c0b2f852236d6dea034b3af1031dd3f93af0a3
+MISC ChangeLog 11186 SHA256 9bb7d5c0f3935a730f896e0defd9c7da16cd2b38d5bc51c4957fa868567e9ac7 SHA512 15a20781c0c0e8ceaf105bc116b4c7c90cac749c6dd377588840e9c1a052aa9a2335a53e866692ea26346250a57745052c910d3470392cf2a135362936d6a288 WHIRLPOOL 766149657f102d2abfe9abfc8765bec915768be81c590f081a0cdb14fc3999a5d8122f3068df21dae899b93a047f35c45e17b82b2e7ed1a5bfa429f37f5b6cc7
 MISC metadata.xml 163 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535 SHA512 3a0182534e9df7c61f18fd206b4ad6d9d9db4b9f339c5c8f13269abecc28acb674cfd4f3fadc5e8e0b4d9b52c938e29e86a3913724dc970b9ade6c2f0bbfc5b4 WHIRLPOOL c227f45d0239e047ef85bdb971666b887377a2db37727091a2e8a154d5ac7803df699db392b033ac389b9d827073e8a45f10889892688b1f080995c2c9ead032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0DtUACgkQkKaRLQcq0GK5qgCfXYs38fYcwkFFF9t5iZkncDJ2
-aAAAoKyx082yjgS0ZFrSH6Cb16YSYXT9
-=46pD
+iJwEAQEIAAYFAlWBymkACgkQG9wOWsQutdZf8wQAxWy3loNEAw8/XoAYYL0K/OLD
+OhbJWTbL4FIBjMTEM3hP04b6V1S0WfD1HkQRxfY56vGtYM9FW1ow8t6BH4NdOFkW
+yQPwGPcVhVlhny9V41jInijkhu6vaMWmrbLqzkrq3Lf+Fpj1wokzaw6wdhWnrkS2
+9U0NhA/RJdFNHY8xRLc=
+=dN4s
 -----END PGP SIGNATURE-----
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index 3856108e664b..4342c5bcdc42 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild,v 1.2 2015/06/07 09:28:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild,v 1.3 2015/06/17 19:30:51 zlogene Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~ottxor/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/app-misc/dateutils/ChangeLog b/app-misc/dateutils/ChangeLog
index 6ca1d97087c5..5015f6422178 100644
--- a/app-misc/dateutils/ChangeLog
+++ b/app-misc/dateutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/dateutils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/dateutils/ChangeLog,v 1.24 2015/03/08 16:51:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dateutils/ChangeLog,v 1.25 2015/06/18 04:47:20 radhermit Exp $
+
+*dateutils-0.3.3 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +dateutils-0.3.3.ebuild:
+  Version bump.
 
   08 Mar 2015; Tim Harder <radhermit@gentoo.org> -dateutils-0.2.3.ebuild,
   -dateutils-0.2.4.ebuild, -dateutils-0.2.5.ebuild, -dateutils-0.2.6.ebuild:
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index 1d9a9ea95592..0df4b65ce509 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 DIST dateutils-0.2.7.tar.xz 490456 SHA256 f7d0c502d79dec4a604ebc30e7c44988d7095bd303137d1fa652720350337042 SHA512 6e066b91da706abfd16f34d5a07a9f586b83720f7bde392c1dfd8666741b2a5245101545f36e2319ac6dce5b089bc1f90517916981c830d8993fcacc2927efdb WHIRLPOOL 8702375706a3c5514ec753fe166766860e01871296e482c3a4ea0b24b5295c03da8eeb0f14fce06e6e7b5ea678d982c2154ace3ca9def9869951d268133d1ed6
 DIST dateutils-0.3.1.tar.xz 586848 SHA256 b34f9d0bcb831e91c7ad3e3d17e56a8efbed11db302a2ee22437fd85dce11b19 SHA512 cbf691b0ef8c815159d262796bb5e7292547794610efb99772a51c8bd20e8f23e36be28c6c8a0ffa04445bf7b13bc8fe58bc44a1ba356e1b224b631d561422d9 WHIRLPOOL d2971d06c71166b7f81c83ad517d395482c8603b879e181cd6926b14b5877b02b20b9b972e88757d411a04d8f19035a7651e259fafe8cde387915b89bbc9762e
 DIST dateutils-0.3.2.tar.xz 586156 SHA256 551620b01c08d5feffb68fde6bb669fe09275dd316a79aeca0efcbe3ec774a3e SHA512 0b04e48ad5438425784250eac5d9dbf851b00548d8970d98f3ffa599003a845b22db4ef01693686f01f13c528f2ab86ab46ec0049cd4e05afd6b53c54eaede33 WHIRLPOOL deb08d0e89b0a3784af1b4e9d23759ea3c5484e9775842ae90a36ac89d2711acc976cc857ecf2543137aca5d24b37b5674dee3d2a0dd2f5067a740bf58da2754
+DIST dateutils-0.3.3.tar.xz 593700 SHA256 3eb0b1dbf4519c86bc890a12c78cc85eae2cc10c20ff894a90ed55140efeee7a SHA512 7041b415edd457b378db36f06782038c3b7b4663cb12dcd5c6555401169e953721a6c24b54fe6db67ba514ecd17fd6007bd503ba364012edcad99a0199f3a78c WHIRLPOOL f84cee24ade044f9fa8b284cc484711e86a3dcd91df840759817f28c516267a7008b4262c750d41ecbf27e87c476c641bd836b541288ba222b93d58ef1a1ae8e
 EBUILD dateutils-0.2.7.ebuild 735 SHA256 c6d1f60710938d1dd722453d10605449cfcb68ef6b97c2966c222a664a883dee SHA512 06b44c51cb62bb9f3b35a0a009f23df2d2c517a46396ba9d22f928e9bed658cd07e1ee3e3a6f8f2abc6f56cf941462ebdf41f2518c58dfbe7d1ef33d579829c3 WHIRLPOOL 0783e8d3d8c3e2e00d8ed4c8b60c5f624fef45b99b9ab9e9aec3064ea2f16edc0cfba2f09788f276b69875e227801920493044e9c7424d02fd5cf8a770cd12e3
 EBUILD dateutils-0.3.1.ebuild 735 SHA256 b5651e3dcdf746502112691a525bee5520aed36fa7f580045d05eadcdc4ab6b9 SHA512 1e1cdc25e31cd1b74fff35144e95de7bc4f4a947b693d0645e52d88c59c8bfb33808bde650c07704f51f274df373210f24ba0605aca2c3b71cd9dc5bfeafff90 WHIRLPOOL 28b77ee317a366f0d0c4202337aa2546d279fedc8c7af8f772d53f2cdc90dd80e46a8307c3929f1b548800e2c6d81eefe33e6712a09af2f7ec12c8663e502c6d
 EBUILD dateutils-0.3.2.ebuild 735 SHA256 52775b538f2bd7217da13d81e2a521ccfe8a11fac709c9b0b97432e058e48776 SHA512 30100da5d994c356db411dc8a640ea1b3a90b18ee264a3b6c94391cf5bfe9b83841e23c17fea218f0edeb43f1a5df8f0419ddca68c3f1041a4f1c5d46fcfd5e5 WHIRLPOOL 46bad0a3b4b275c54d7b6bdf5b0d155ae8cf3d64321cf2d78db55770b792a4527683c652e6e3ccd6234c821569418bc4e297eab77c7cc88d534c5feaaa3a7f30
-MISC ChangeLog 3365 SHA256 28f5b419fdac6649483150f8cc7706e81b0ee3868d916beb8a1b0e203ffde59d SHA512 c615b1bdf6e9e5f54130276758e269ac4d97d7ee616d43425e24f08a3ca7e0c7f6ffc37896423795b63cfad8f2f3e3fb73bd14ea3da5b62345ea106aa6665f32 WHIRLPOOL e652db3b5807d8b09e5a2993c7a622c61cb6e7005e8c9fb95f23fa88e96cf53e44c3c13e4b0326187b1ad2de217546df3c4d59bcaa1f11fe2d64bcdf1bbf8636
+EBUILD dateutils-0.3.3.ebuild 735 SHA256 ddd8e340e0dce114a5edee25b9c0c3dd8a1e87c78397d390d995ca1846935942 SHA512 2e3e714887b83352641f0d44784bfbfafeaf910ac99cdf9b190573e455a4d3f99bf3c19cecc8ca9244133b6cc229f00042602f60d89eab6c730d62454ee5d7e5 WHIRLPOOL ac6b458b99ee9744d2c42b852c4b8af73db5df43fda6426717d41d34ddaae90df3a22d2dfbf26b61e877e09aa2f425540c3e70c554298763f7b0cb5e6664b2e8
+MISC ChangeLog 3488 SHA256 7e33c6c4b6f912855a878f94529de381c881b1833edaefd54ac5b789a65394be SHA512 9e6d06629619fb2337d077bf51b628cce1445aabc20b2c618911c2eae1126cdbfc2cfcd9a538a367592d3f0e01fe6e751c685f3323beedb6d118fbf42a088028 WHIRLPOOL 7fd6d64b3263671b7e84b074677dc3582b32e500f11eb7d582781178002aaaed774ca8ed4f6221d97c7fb10ae0874f90b93003894963975cf34b3b18e968cd04
 MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU/H4aAAoJEEqz6FtPBkyjs2UH/AvkZn+RTh0DUezOlXE+IR3v
-pH4wGxBsRS+TGtTLC+dpSd5TnPeCO7mBN3VjTlDgKdkMg6ZqO3eE5/qW8TD0h6to
-6n2lq9He3XyLrCltT2kk0+NZ8ZWgeH6Uk96f/Xm2Wf+A1ZHJ3cwODCbDEv2PbUgE
-DiKz6X6ku8xwn56Ya4OYuag18hjeliO0GoYIpM9nk5/C8ZSywEj1+TYqSqqcYlX/
-0xfZ3jEJJFoJ8HDTm67HRbjGbzrTtir4yAwFwHDSsUaSL2h0WOWtRZ8pKhp4Awf9
-H8aYFu6XL3aJb4E2I5EDfhV6UKON1y7nIziv0hLzQDNSgxifJv8WMXYxnd3cuvI=
-=7RGl
+iQEcBAEBCAAGBQJVgk1ZAAoJEEqz6FtPBkyjA7EH/i/YAb2mfwvHm3NsUI09rISR
+LLU7SYEW1M3GcoXp3L8qU+E0dnUjQkk6bRZ50/Eok5clHosVgw4cZTLxRlo8ZQUl
+dvrOybnLSPqUqRpDCNq0hFIhqF49CzbWiFZqjPKa6cPgCmGH08W/6mg25fD2uKRS
++VhKy8emtFpokbzSzXKbn+Bf2CbKpFaiSPObfOn6jlpnc44qksozaxqFg+LsIfVQ
+N+1jSzK36913m7dFeBakAFBFzfonbTWEIIWnN9PgS4Hx4bY74YMKPEBQTgTOpbrA
+if9nliX4ULyI5uiGN4Sh4goI76khXYimGFTyu5bhMj9ToQR0gWkSqW9edL0k1tk=
+=7ZBY
 -----END PGP SIGNATURE-----
diff --git a/app-misc/dateutils/dateutils-0.3.3.ebuild b/app-misc/dateutils/dateutils-0.3.3.ebuild
new file mode 100644
index 000000000000..8cf262295c4a
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dateutils/dateutils-0.3.3.ebuild,v 1.1 2015/06/18 04:47:20 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="http://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-infiniband/dapl"
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	# parallel tests failure
+	emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-office/wps-office/ChangeLog b/app-office/wps-office/ChangeLog
index 65fd6d8f1527..e0e34f99d039 100644
--- a/app-office/wps-office/ChangeLog
+++ b/app-office/wps-office/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/wps-office
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/ChangeLog,v 1.2 2015/05/26 20:39:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/ChangeLog,v 1.3 2015/06/17 18:58:20 pacho Exp $
+
+*wps-office-9.1.0.4961_alpha18_p1 (17 Jun 2015)
+
+  17 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +wps-office-9.1.0.4961_alpha18_p1.ebuild:
+  Version bump, drop corefonts USE flag as it's only used to pull in that
+  package.
 
 *wps-office-9.1.0.4953_alpha18-r1 (26 May 2015)
 
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 40def66e9cbe..c3edb23f2b20 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -3,14 +3,17 @@ Hash: SHA256
 
 DIST wps-office_9.1.0.4953~a18_amd64.deb 67389656 SHA256 e98793e25261bbd92b465eca53300d36e837adb7abb1a74d5241081f7069669f SHA512 8e2d2aba488f359cc841b7513dfd50cb6abc95a4f4abffe7f8d21d0ec3ad0ac97ac35b602fd60688232847a0ba3942e47571cc6ef63d48b52a1a0f4d0dc68c08 WHIRLPOOL 70dc5382cad1de5f490085af35cac58d9edefbd2acfda37ef6bf1739ea3b047d704871a83a3562d73e425f9de86011cc0ca27a582c1133a7ce8f735c606cbc61
 DIST wps-office_9.1.0.4953~a18_i386.deb 74618126 SHA256 f471094a61c0153ef3f63081430151ebbc7cb7a7b6c191e32867f98567473851 SHA512 9e41e6805527ceb6d8099b5c0bac0d6554ee856844c422529c837a8b713acacf056b8e8c2ff311197730cef4179677be0c0246df94022c7431caa054f440af10 WHIRLPOOL 957d21b3d2fe378cc55a3f8c684c23d5c8247bfb91217ddce80e08812518da32cbdee2edfee850c213bb4b0eff2b6b82d6ace77d4b22304349ee6daf88b74ac1
+DIST wps-office_9.1.0.4961~a18p1_amd64.deb 67419632 SHA256 a37c28648d571571351582e0863d252fc7378da87683c335ee93937a09924a6f SHA512 c828f9cc3383a33db533ada811dd8ca2d80599b8c49d9f1a4fd6080386245aae7a5bc71b2e628cacb2bf9c07b2619417afebf990c6332abb4e23ade2ef0f471f WHIRLPOOL c46cf46a6bd8249c5f6643fbc61c03a374e264a3577e66c32e459b95ae7fe4ef663488657a2c4ba4ef79a32dddbe0ae63515f7efcd898dada698528d74778386
+DIST wps-office_9.1.0.4961~a18p1_i386.deb 74647622 SHA256 e5e6f2813d3e778c68c3bc810ebe95ee862700c7ebf823f10a70dffbea1cd81c SHA512 7d90812e4a5a23f7d55f30c24831f8c17825048da14de6689cd8df9c4ce0cfb62982a05da78cbdc314e174b0e965c04852b104dd4d44bd1b76af45fdeba604d8 WHIRLPOOL 83fe9921bb71e2541790bff44728cd3ae5d557819ee25f103f5b3cb4c4e8d4801d2f402029371b8a58d6bdb5459efe8f5f64777b763070ab79d9690915c2b87d
 EBUILD wps-office-9.1.0.4953_alpha18-r1.ebuild 3042 SHA256 a45c42a0f7947ab9e32e902222c26cff45e230550d424bae44d3b1af47ad5294 SHA512 e5a9005c6a235b8e4358c4a702b7faf53508e3fb4ab6d60cf268236a17be8c4af618265d11405f7acb2032640fae712109d5eea877fc35f1ef9e3c0b4af1b78b WHIRLPOOL 1f3b7c22fb666143661c89e2584c618314ed866db59f372b123b25c2d9dd85f7c10347699b552ed350373262821874376cea99e1f8621436e97f567c9f318a86
 EBUILD wps-office-9.1.0.4953_alpha18.ebuild 2572 SHA256 5a0f5562397bfa6eafd696808040cd6620a6e27ed0ab0e1443be2b6c7e39d462 SHA512 a3088006ebdee8349b77c604905133cd6642e5c4077c4397948a58529a7560c58b304e70d57868c3b2363e4dd09c7b55b48c68b5ffc183a99f5e8edafa7ef460 WHIRLPOOL 5a17778dbf63eb013770a604f3cb8b043a8aab4dffb552533915db5613e5f911429a751336e27f79f97614102674127a256c53ad8529aa73bd980aac47b1c8c3
-MISC ChangeLog 632 SHA256 0d472096963e7065b7262c1ddd0d2c1b1dbf67cd999303bbbb5476a8ec634724 SHA512 d0299fcb1c03a646ab7ef756857e49ab74a1ec983858a164a65039ba1412c0f574aecaafe1cfd99af0fc1b902701d5cf9f610939278349a8aececafcd53d0eed WHIRLPOOL 192391cb5480c56a063bd3e4afc81bb5cd52962cd5b4d478dd6fc2f13131ab54541193bcad8826411fea394ac2093300f9f93560886da5bd291b3f9d68594945
+EBUILD wps-office-9.1.0.4961_alpha18_p1.ebuild 2994 SHA256 39968cc04e18403b1fb4d8ba42d9acd8aa48bab19364a4a70280b773229bc01f SHA512 9fded4a34ab62a3be85caac10a9479d3f08e630377fe5aa55bff5ed4e5b1b755217c383d284f657f5bdd4ae099ffca97c2cfc753d6fcb2960a0e5795d9cace2f WHIRLPOOL 83cab89ffc41e37d460e370d53b8b0ce9d0e1d53104c94811c30bcd557dcf42a455e8b47cd031ffeaf0c31c5224fb42858d74fa76928063266b0abc38cf72302
+MISC ChangeLog 857 SHA256 5b1950712f891946274580895146ea02167443b270b9254b155ea424ad2cf386 SHA512 10930defac05f9c80d7754a182db56051020aa4f5dd54885f211eeab310fa618d663ed224b68d9764f8cd485c56d32310e32fe1008073981022d01ef78d1626f WHIRLPOOL 9b5483e80ac07a9c90c2a2cfa1dfd218959926cb238dc6986d6e896f1ecc871b8ca39022b60a100d7a2e5fc49d396ca67a0b07bd4216426ea73f449c08dedf30
 MISC metadata.xml 377 SHA256 446175a2300682ce59b3a4991efd32e8ba804bf1fcf175f0bb2c292a907d1a0d SHA512 c7febfe6b48909f64b8d550dd4971ecd57ebf046b90cfa4650161271f145debbb8f6e8b31515c7fc4319028819c1415beba3ff7ee12e3c9a82c7a867c1265628 WHIRLPOOL b307a4f2ca4b31b96e8fbb116e16c6b12adfaf2098dea3932a4c9fe4201e1ef0030ad952b63420931a3f15d913edfe2ace72090d301b2caf84f4c4e294aae1aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVk2ggACgkQCaWpQKGI+9R+sQCffCS66Ibtt2pbZrKq0BYy1fMu
-FKcAmwQrLqJTpZ73YS3x2FKOpbMOlSKc
-=yTIo
+iEYEAREIAAYFAlWBw00ACgkQCaWpQKGI+9SRLACcDtndlXdbYE/Ew/nVaSrj+jBH
+G9EAmwWUvM/tD1ZY6yAsMq44ZUjv7N8g
+=Vp/J
 -----END PGP SIGNATURE-----
diff --git a/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild b/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
new file mode 100644
index 000000000000..224b7897f128
--- /dev/null
+++ b/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild,v 1.1 2015/06/17 18:58:20 pacho Exp $
+
+EAPI=5
+inherit fdo-mime font gnome2-utils unpacker versionator
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_V="$(get_version_component_range 5)"
+
+if [ -z "$(get_version_component_range 6)" ]; then
+	MY_SP=""
+else
+	MY_SP="$(get_version_component_range 6)"
+fi
+
+case ${PV} in
+	*_alpha*)
+		MY_BRANCH=${MY_V/alpha/a}
+		;;
+	*_beta*)
+		MY_BRANCH=${MY_V/beta/b}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="http://linux.wps.cn/"
+
+KEYWORDS="~amd64 ~x86"
+
+SRC_URI="
+	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
+	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
+"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+LICENSE="WPS-EULA"
+IUSE="+sharedfonts"
+
+UNBUNDLED_LIBS="
+	dev-qt/qtwebkit:4
+	media-libs/tiff:3
+"
+#	dev-qt/qtcore:4
+#	dev-qt/qtdbus:4
+#	media-libs/phonon
+
+NATIVE_DEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi
+	dev-libs/libxml2:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	media-libs/libpng:1.2
+	virtual/opengl
+	media-libs/tiff:3
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	media-libs/libmng
+	net-print/cups
+"
+RDEPEND="
+	${UNBUNDLED_LIBS}
+	${NATIVE_DEPEND}
+	net-nds/openldap
+	dev-db/sqlite:3
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# Remove bundled libs and rely on system versions if possible
+	# Commented lines are about the libs that cannot be unbundled yet.
+	cd "${S}"/opt/kingsoft/wps-office/office6/
+#	rm -f libQtCore.so* || die
+#	rm -f libQtDBus.so* || die
+#	rm -f libQtNetwork.so || die
+	rm -f libQtWebKit.so* || die
+#	rm -f libphonon.so*
+	rm -f libtiff.so.4* || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/wps
+	doexe "${S}"/usr/bin/wpp
+	doexe "${S}"/usr/bin/et
+
+	if ! use sharedfonts; then
+		insinto /opt/kingsoft/wps-office/office6/fonts
+		doins -r "${S}"/usr/share/fonts/wps-office/*
+		rm -rf "${S}"/usr/share/fonts || die
+	fi
+
+	insinto /usr
+	doins -r "${S}"/usr/share
+
+	insinto /
+	doins -r "${S}"/opt
+	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use sharedfonts && font_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/html-xml-utils/ChangeLog b/app-text/html-xml-utils/ChangeLog
index 09cb5d2e5c75..bd1222be9bf3 100644
--- a/app-text/html-xml-utils/ChangeLog
+++ b/app-text/html-xml-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/html-xml-utils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.50 2015/05/14 07:38:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/ChangeLog,v 1.51 2015/06/17 08:48:20 monsieurp Exp $
+
+*html-xml-utils-6.9 (17 Jun 2015)
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +html-xml-utils-6.9.ebuild, metadata.xml:
+  Version bump. Take over maintainership. Fix bug 552354.
 
   14 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -html-xml-utils-6.0.ebuild:
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index c62b12ff8a11..54099a103bb0 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST html-xml-utils-6.8.tar.gz 310688 SHA256 f09b7de5e427ea930ed9ceaf0ee7e6a816cf51113149a040fa84a1664ddfa189 SHA512 f4e942636064727da08b32989353e7d260d981363346f7654d65aa561aa01a1e70c478fbc9257bc5d027d34dc62d896c29dc7bff8d50c67b382387d540395546 WHIRLPOOL e31796f24fcf173da2e29d9e0f2f45be54de468fc8a93b56380a7e0ad25d9e61b78cf9b643b77e62820ec6bfc4dfa78c14f13204df0c3210c69bde411a95e645
+DIST html-xml-utils-6.9.tar.gz 311449 SHA256 9cf401dc84ca01752adf1f2d9862c4f227bb089504ed9d03d7fd40603e87fab2 SHA512 590a04e91130d7daecc4c1935808d872f3d49967be345060039bae5986b70be3be40104bc215524017a08c5492671a1fd96b63028f26f84faa400a9fbd283778 WHIRLPOOL b89b0bf5225256af2a0464429f2aa7eb1171ea982afc02ae0377e7cbd0633ee33cd39069bb0cd9056c712c20e7568b3716e448b1b8e47a9eb92193076734c353
 EBUILD html-xml-utils-6.8.ebuild 636 SHA256 5473547126033e5869d469e5c4032aba31358d233b02dd85d2819a51b19b9366 SHA512 1b7d6bbd128a7e2d6dc27aa939f2f2875c20a4248f5b69f5e82de06d268142caa676eb9dfdcdac41371fd8d91201973ace9a17a10fc209098426772c8228c43f WHIRLPOOL 2b4f4dbadb1e5d740928c6c7a9dd1e21e7a8f34f3a31465689419f7e9820015d7592d8608c5c291e76598189b78941f250de41b3bceb1c43edc6029bab335fb4
-MISC ChangeLog 7576 SHA256 05c37e902a47e58058140838f00e3d74b2cd7bd8fa3b4b6680b40f9980e0230e SHA512 aba623fc5d7566a3c57890fa8787a31348782219a977365b4061fe6eeca5dc9e0ed5c32b943a41ea7d8a97f1ed7d313f9f11d7df8b24c9c93340b6288a2624ed WHIRLPOOL 77c36ed1046db4894f251f4ce7f85061086bb883be90d48034a52b11bd92ec0b5ba959c7107515cb2d17ab28578e87a10e6cc1ef897313e1d6093c63d1c32cfc
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+EBUILD html-xml-utils-6.9.ebuild 645 SHA256 8d447f7a9f1cffc12169d24d9a471aa73ba11ae1ae0087e044b72361273d9a7f SHA512 697eb917fa562f5fc55c4dfb32b76ab09a9a4f5e0f5158c3dc42ca48481dfe8915dc50edb624fe9509e66ca6378ad54584446bd5b32b58ac55f5d038bae9f1e6 WHIRLPOOL 32721e47bda899ac700dc9ece9aa185478a9c6b5bdb2aca6b7b20f5df06a9f2d3b900fc09c53a85d2daca3d171ccbcd3bf5bda153f653cedf718d2a79f2c045c
+MISC ChangeLog 7768 SHA256 8dabacae0f327d94ac8db165bf67a7ac53096ecad39fd5e9d1eed30828dcd37c SHA512 f93490f9ad442c71e7cdde74e90557f23822b4b4e97d6dbf1ca5a97c8fbc0f2f17935fe7a0985c93b2c556d3d07ee7fdebf480068b8e16c630d334610a6301cd WHIRLPOOL eef546a4b7b9416b21edd65d41980877047b442c8a904a7e2a17f517733f30865b4563b89e0bd38acd4add6c2e57209fd602702f63ce18c314df60ab8af85e07
+MISC metadata.xml 206 SHA256 357db273d373fcfe4442cc12d710b7b035fff73d328e454712b76ce7611f334b SHA512 0e66bd386eb93e89cbde5ba0030d729bc1f6918f8277987157f5d27f5c7cc9452706eb2860e62f97c5342e0694ff899b148f67ec48a3e385962f995685a1b7f8 WHIRLPOOL daa783eec5b63f43483d5f07775e282a584691604fd7d22c463f77e17df1acacc97b88bf4bbdb59aaf284f849e871d8d698f3e930cff566f0eea89653cd128c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVgULSAAoJEJGRpfGTSRu4qt0H/2omnvZPPBTnCjL2IOL4lGTg
+GvDTJ0BPjpq3fGo2ccJhLrwCmjSfr7YZM7pQ0OcA3gKBmK4DgbWd5gQ3gmh53+qk
+cyG3rSJ8xwyaj0GZ4bBqi4DLQk9PpIOkE+28btAXP9ViTex/GuT9FulCKeiMtjVj
+2SRtbPoDeIBtv4Nkhozhs54z0QNY3r5x6qu5tkc8QEskjp7Y1p/0qLzDIlJEBD+M
+dIiSprPlbnPwQyUBqeYvQSTsKzYL6W9hSByWIZC9ks3nPZzddpEjCRu1cB4RzLR/
+Q9sTbkU9CRb5Cmo2ccjdIX+NsdgSxLhPv9ICkTLh5QEcEWHeSDr/NG2VLsoODLM=
+=buka
+-----END PGP SIGNATURE-----
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
new file mode 100644
index 000000000000..3845e5dd7610
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.9.ebuild,v 1.1 2015/06/17 08:48:20 monsieurp Exp $
+
+EAPI=5
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
diff --git a/app-text/html-xml-utils/metadata.xml b/app-text/html-xml-utils/metadata.xml
index 4538a68724a6..8653502db3ff 100644
--- a/app-text/html-xml-utils/metadata.xml
+++ b/app-text/html-xml-utils/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/restview/ChangeLog b/app-text/restview/ChangeLog
index f736fe9a504d..f75966dce269 100644
--- a/app-text/restview/ChangeLog
+++ b/app-text/restview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/restview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/restview/ChangeLog,v 1.6 2015/06/03 11:33:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/restview/ChangeLog,v 1.7 2015/06/18 04:35:11 radhermit Exp $
+
+*restview-2.4.0 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +restview-2.4.0.ebuild:
+  Version bump.
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 4df73995c854..d76adcdda941 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,32 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST restview-2.1.1.tar.gz 24948 SHA256 1bf9e845078d05e7cda31bba6fed24a74ffe46f4f466b7b28c39650801724c1f SHA512 c74158d415940c3240b248ec83b1d9c79fa7e279b05a118f04fd5caf6273ef6ba4944a62cf8832e6e214b256962fc559abf42f28a636f4e3140dad9d88fe0cf0 WHIRLPOOL 5986fe67814806eff6c566cb8ba5cd426de984a74740ec50a16790f67029e0d28a33087ec0de1f016461bce725cfbe9921bf8bedef7ffc4603fb9dfcf567c765
 DIST restview-2.2.0.tar.gz 28910 SHA256 1dbb06eaccf6ad4703e1483f3faac583f176b1df34c2f4da488e369c8dcad404 SHA512 c2141232a1ddfa999cd583592dad099176049802c28412a79e9733ed3d372b8ff744d2d4bc3bf1da0f7569dbe8af762913afa8af9fc7b4b4ed0683f2739cef9d WHIRLPOOL 6015dfa7bfa89511647fe8a4725841f962530ca6c986cfea0e69aa68148256307debf60a42187ec5d4e91831c3eaa42f20d830e639cd9ba9cc77f09033d51bc3
 DIST restview-2.2.1.tar.gz 29162 SHA256 da182e03b19850abd1b66bc55addded892acf69602d5fc8eb162de4592e9181c SHA512 d34ad1c62ec15ebd84bf89c6086075e0bda30101f0b6148457c3bdfa8f1928e688e2d557158fe744fcc04d01bdd0ebf9afcabfab821b59f6ebfe9d9d35d2f221 WHIRLPOOL a0d72419e95a3ce0613951a2751478e090674d0e9acb4e3bba161e9d750460c4592a8e3ec8aad64ae701928619f03d32073325b1620b867b8d61c023414e527c
 DIST restview-2.3.0.tar.gz 27315 SHA256 3127fb13b78bdc7e06f85831bd2d64db593dd2154068d45fccac14b064573b54 SHA512 527bafdf6f6ad2e35485ebdee8228723b245615e73af952d4bd5b27beec58fbcddab76b0c855ad1808e53d838e918cc239bc519b0639d1a06c7e0d2249936f9f WHIRLPOOL 34f02a48204a9007e529b8999f1f53ffa63a875cda35dcbd8de9293c29db0cd232e5332bc4372792138c0024ba59735db4062f2dadcafd9ba9b125ebcc5db5d1
+DIST restview-2.4.0.tar.gz 27644 SHA256 52eed1a9ce2bc31d6b4269c8c4ba8c5c1cf7c989b465e9a62bfa6357fc0da965 SHA512 e386b7debb07426733e109d9a77be03443c1621ce727ef982dad572a795dce512b0b89051712009aecefd91e258c304ef936bf2e8dbd15bdb35bdca03913ac07 WHIRLPOOL 51e8f01035096feb31dbc403184276d9427320f26c540779cf635381a6a9a29a4296de8b0745c85fd426752e857bab6ea024eaa6ad6e20faad1d13daa6ee0b74
 EBUILD restview-2.1.1.ebuild 754 SHA256 24268933433aa83fb5fbb1bdeaa8e2acd1481f222a0f6d1a66de5e41adf3d46e SHA512 fc40c64db40d0a7d35b3f6e64e1da656eb78e9856cb180cc9fab5073f0f7d218a79468c69e7121710f08c8720ff20d65bb047dad94254713232c4b14d9b2adbb WHIRLPOOL 4ec37ff0a9aef943ad2c6a7e452487b71eb865b6941142dfe3f561811980bf776f9f2bfb6b13b193f1e56284a4a7be31acae18db1c244deef0aa87619fcfc839
 EBUILD restview-2.2.0.ebuild 754 SHA256 00bf17da73c21c3e035b1c290d462ce3335d350647738795c70e785b73773fdc SHA512 eb9a842d1ab545347bb5f409cf2d4dd4c4e64fc7cdc943627fc4cb7d8d187dfd9537c24be6484e25b302e0cf47ccba254d1b32bd355699a46fc6a24f83dc766b WHIRLPOOL d66ba3dd524cd753300744d5d2cc003dcf59160111e24d93cd3b6fc825bf75dd5c895049ceb4b4a62b2fc6e42d56375d705b9e63733ea5cf61fe9d91caa462fd
 EBUILD restview-2.2.1.ebuild 754 SHA256 b5773d372a77a2526c984a7ffc472aa5b23830cafb5b9590630f04d766395be8 SHA512 bc9b4466eecf5ef25e0378199e669dd590ec22f73564f58fa0275db7014d648e627762fb59d311609f7d88700a107609f56ea262cb29c47da0dbbe8dbc9be9f8 WHIRLPOOL 8fcd561831d7b05dd5860af861c9a11f2495f8078d660233b87185a97a66eae886b0c8ae9a6948c052cbec9766428ade63fa68ded54e792d321e9c4a1a7e9aa9
 EBUILD restview-2.3.0.ebuild 829 SHA256 fec5e1568186b8282cebdfb279bda13ef7058d03f4b67ab10993ea31c8de7822 SHA512 e41d0a5f96a87d4dd2c33f05c485c53a6f93d7b1ba95acd42b0642440ba62e58171c0d384c493758d8c955b588a5ab520af190a659fd98b41f37cfe221feaccc WHIRLPOOL cce6844786586272493fd4d281cd45a1e721d0e4ec8cff6cbd5463c5198436d7c9f3bed5d842175c9922f14c1d6918ef606a5cf47875b7535e4272fa70d358dd
-MISC ChangeLog 903 SHA256 e57fcbf75ca926536abc0067745cff03f0cd338f77268ee8b3d54630b738f3a8 SHA512 473e1ab935c81ffd206dc33814096a8e28e21ec4d1e8e100f935ced773061f3fc0c97a478655b90009a5332543fa26e68066a07e530142f12a80acdb8da6648d WHIRLPOOL a7c4c356dccd1040d9a6dcf6d1fa4d4df5e72887912aa2b064b911570aeea8481093cc9c3f5cce34ab36213223a9cd6fe386e1cbd2ffe50e2b6a9d0f4ed7f9bb
+EBUILD restview-2.4.0.ebuild 829 SHA256 ac6055b0d826af343e7aa90c69ac141f6e20770c4278c7fa807dceaf8c1a5f91 SHA512 7675d768a11e9fff1bf11ea027df9348d092eb226aa7cb6cbdd4129c967de9cbbcb1ab13e40b9eacf93d9f4848badbd04d31cc8050540b3230205cc6312ff9db WHIRLPOOL 639898b84b669c33593ff9cbc99cdf617c213706cd706b8c9620817379057ebaac2a2a71a97b383d07e8bbe4222751ebccfff274d70070dc6368f5c9b35d5292
+MISC ChangeLog 1029 SHA256 86371fa677b7ed8c93f071131b35f4ebc46d31d11591e4d20a25ebe3a776ceaf SHA512 8e53543fb48c0aa0e253f6c4c86c912b035ac5a69b0f36ebc402015556c3309c504ac6f112fd991fbd4e4f5fcb39ad3e57d1449d22a4ddea2562619369f59310 WHIRLPOOL 0a1e7df4d0fd6c0d507866cf72723c329a1fb1730b2c108d6eaeb8d84902f7ee33b100fe385a44c47d326979fb3cab4a06c404867006e6980c1da328bf9dc9dc
 MISC metadata.xml 313 SHA256 2d26f4e938af3ed9bb0e345babe0d6ed09aa6b5ff950ce90f3ef8f8ac97bc8d2 SHA512 de324d77be716fd3cd68ce8600ed7a4e6fba33e7bfdbb56fdacd2cd09d54092b99a5e8a3334130eca15e33e5035f8762769a37cb5a105823f2bb26a182298e82 WHIRLPOOL 05a5268d24cb0f717ed0365c6acea90273c1ff5c375c86842350711cc8294e926cf4cd60b2ac697e59b456d7dbd47b0d5e56cb910c3e2e17ff3adb9a085433ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVbuYNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKM0P/087x0vQfilgyDHZvnXt+WE9
-Zc+hzlOGVqsAjSn7iPUEs899kP7+0uea9/Pi+cRnbIVBJVVBzRF59DKQZYRJfUz4
-YkNDjTLA3CgaJSZKPddSkofC+Y2vxx29jcyoz6kQEpBLuuXhpvPDlLCvn/w1reWK
-pWy3d91HYyPq8JBQptPVM3+UmMwCCU9YrovW6QHD8dT+RS8J+IfYV1u9msBoPhAi
-Vzt9kJCLfe3azu6m64XM+wtxQZn92Oi/YgqHOjpOIQA+3TQ/QUg//ujhwVAkD5zE
-gnH5aiPvgzDhp4WsDWuS1sVW+0b3Z9wvR1fT2JbhZaz3mfO5Y68ib65GIChwkxLp
-qPR1zN5H84f3o+MnuBamZCKmI++9eu8KEc9zatgr+B678gjI1wrQ4w78BTwuycPe
-b5wEh77+ugFCKOAlpmYPwTmVuPzQ43LDqyW7NMShHxmRQHYMwdHOTcnPwz5gvOtW
-Vlwge01hAaFHR7RdTcmPFy+AywruaMsh6f3vVvjWUjI7kV1pMrtqIqQT0049wDLq
-O72Tb7zf9PjAHhJm1XXu0jq2uMvCY9iGDmx/IBTBz8wFAvI6uBYtq5PPmEtZUOhW
-VYPuK3cNorE/cZORQ+p7/qyzWX+bOGIV8KW0wWiMlF4eyAppQHiJB2ALI/Zb75aG
-BnA32rls+sdehz5UeD2r
-=si4k
+iQEcBAEBCAAGBQJVgkqAAAoJEEqz6FtPBkyjOE8H/0rKaxjozs7vfF18sDr+ummE
+Sll4Isveb2d+eHUfafj76D4fDNA14J+G4jT/JeK2BxAZ0gGYWsszQbDpNN7frq2v
+VeHBpkNbntZ5B0n0VZqpnKFyR31ZJ2K55hfYPGwV7g8UzW0Fnu5V19qOQdBAZSVi
+njMgTua6N/6VziTEs63l/T5G0SSx9nX/sgSmBKHTAJrXCib3q4Jb9Z4RtA3Y0WKl
+SeVHX7tfOnh4/W5a81VuQul1hCyeBQunwkuBM0cSyAtAdKLkv3RSmLsQYt3BOoO/
+4/ABvpHMBHdS1raKUkkxONtcD+otzXaHBmtPjlISadTqWTy2iZz79s/f+kJr8C8=
+=5iIT
 -----END PGP SIGNATURE-----
diff --git a/app-text/restview/restview-2.4.0.ebuild b/app-text/restview/restview-2.4.0.ebuild
new file mode 100644
index 000000000000..0373e25b16d6
--- /dev/null
+++ b/app-text/restview/restview-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/restview/restview-2.4.0.ebuild,v 1.1 2015/06/18 04:35:11 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.python.org/pypi/restview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/t1utils/ChangeLog b/app-text/t1utils/ChangeLog
index ef173218c7e0..c99b0c531035 100644
--- a/app-text/t1utils/ChangeLog
+++ b/app-text/t1utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/t1utils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/ChangeLog,v 1.89 2015/05/27 13:01:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/ChangeLog,v 1.90 2015/06/17 08:50:56 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> t1utils-1.39.ebuild:
+  Stable for sparc, wrt bug #548638
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> t1utils-1.39.ebuild:
   Stable for arm, wrt bug #548638
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 25c6f5506b33..2ba17d006fd3 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 DIST t1utils-1.38.tar.gz 174513 SHA256 fc9f1ae744b22a6ecf5f54296d2d6229f1ce14c19aa7306e96ee7bb994bcddde SHA512 4cdfa5eab621b76f6226edee2167b26f01af4714d109dc4699a959a99170a0652fd8b119ec09aa908eb8ab6cec3af3ea10bf2886b209f3e2902ccf1ffca879b7 WHIRLPOOL fc706b8e5b5bdad56dcf2aa5a8bcb621f6d1f03188da6a95acadd3501db0ba1c4af2759b96f3842a8c7260f5711ec052172bf9540ed6d17e01a4f0fb1d4dd8af
 DIST t1utils-1.39.tar.gz 175047 SHA256 0faef3e5c4927b38b05ac99ee177b7d7cddbbf5b4452f98b244f684b52b0d4c4 SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301 WHIRLPOOL 976452434ea273cc1a42973cec28cd7587925490e37369715eeebb5e1d4aebca829d61893060512d621fe9393dd3758d670f0e1827347d8240cb622aa7afa1be
 EBUILD t1utils-1.38.ebuild 764 SHA256 c72a2c8a3b3a2b687478792491169ab5cad6084192981541a9b161c43d035b89 SHA512 377904980c000bddac503ccc9ba5f5d3571df11fb2dcc40239d6a77f876343476b1feb59a41ae157d3cd0123f70da5a52d61c890bc85b9a7c39d6c242d395d09 WHIRLPOOL f69b3233ab9656797ff7480aa7fe4eba9c45ee52f754772a91160e37298134f1e79b4bdf5d50412222de0d30a7dd167322e3dd6a2b935f5fb882bbb1d2cd9fe8
-EBUILD t1utils-1.39.ebuild 765 SHA256 7ac8e270050c83e3f95a174f6fe704c131f9d8e7b2a4e462dd644783a1a4e3be SHA512 e4778489c83949a584e2fb6d66d21575e0a42d6260809400389f50266dd226c7177555644eaecf8fd7f3a67f5eba73269a7717a788b2e91048caad900e2852f8 WHIRLPOOL 397e788e0c23eeae8ef3ba542e67639f9c126a179f5c46e68723f83fe947284418d2b54b3fbf519b3a507820ef2d3b6c1964fb0f54256d995d7a6d48b60e8bb6
-MISC ChangeLog 10152 SHA256 27e6451f65ffb620b380d869b7c4969dbd48e9efd9acb74758d80d1413e8b08f SHA512 cdba3da7f5acaf94d6f0a2af1790de02f1f2b58b3d5cff5caf5d23afd887804b2e12cd3cd6f675ddbe05c93d85e63c2e055518bde2b71e47654b754fa3d8bc5e WHIRLPOOL 0f87da2610a3175edf2d0296002122db15eeb8284ac391dd93f96c5707e92f6ad567dfaf63cda6daa9bdc9dea8bb7cba3f6699df4de2d21b8df817c82cf5b8b8
+EBUILD t1utils-1.39.ebuild 764 SHA256 904c89b99fa843ae001940f2079fcbc9f9974a936c84ff17946b77ee93779f8a SHA512 daf12cd711c6d19a0685a0fd7dd327f7105c8bbb55a6075e4c6c430978004f78c08c0f4a2fc719af97ada76389789a7628087e12f2112ccb0a7c48648f23ebad WHIRLPOOL a8a94b8bfaa2889ba162a868094c6975c7fcd173b95b66e180305e0eb66cf1c88d432a75cf1b9518d3d9c9451c08d6facaf7bdd8b397c904e238e96462cdb267
+MISC ChangeLog 10259 SHA256 fa15e9ed5bc85037f7040c24d27e9c077a46e04cee5722026580cf33d024ede3 SHA512 2e8ebd35108374f6b62b13a299639321d8d13a3099adae5cac6e4bef201cc3a8bbfa2d6f79cee60ebbcbfc8a07130d7ae5a94f2462582d092c0b1ab760c6bd2b WHIRLPOOL 0b0d60a8f9d5671bc7dfdcc94ee038a6a094e0a43592a9914433d1be8d34dd53aa429b2a4a596187b2bd32151021c502917dd02ecaf117fe672abc02d1735077
 MISC metadata.xml 255 SHA256 b0cf2f9b5f759909bcb3fcb1d80ba3cbb00220b6324b81022ad9dc17a9c38d71 SHA512 55890574f5c806f8bf4f43105e30b914487503354d363cd685868b1abefcfdc8fb2dcac040c1a4c2ae61fb51907f54c66158b5a5091455f0c88b028b04961555 WHIRLPOOL 07efcd2ea0e1a75c5dd57860f4c2f98c1142130570baf13b4120963d863a1ab04d7d28bea1c6f9eb4aa438ac3c63468c8c411905288cd78e5c8ef9d67b99ba00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZcAUAAoJELp701BxlEWfry4P/jZuyiQ1Y5ZCLsQkULjHndxK
-JFuOrOGaCfeSqeg6quwWEdPlbgCoVW89O+15h/vKzhNpSBvesGizcaBnkU1746pB
-62eJlGdjFJWaBToFabk9H5AB3i/w7KbuFqDZg2XoMzA1iqWy1DjsodUJ4GJU+ulH
-dQJN/rRvyhA6mDDv4zNPqUil7sv2EHQS5uPBJTixDCGDhk+wceB1hNgk+4HK/2US
-CpHlAhzYWokc9uqWWpTmpmTYAkMO31PCdgb1vfD7nXC5uwsD0ZjHovDVasSIogTj
-UfGNb/JN3a27renATD5SzEC7BkMHOJfc+ylSTKwciv+r4vOMh7GBvBGI8lrJCMYv
-kJFV6OpTKwHBFBsYKlt8hodjfmkiGVsrqPwtkfJrUntNDI8LgceIzGHHsrUGYU60
-2tJ7xfNwzkw9hB66UYwtO92XvbFjFwoRt4I0QwoF09bIxbBZKCwuRSRWoYs3e0DD
-63XHxT9enDMVF+UIZqWYht+OBN9sXtQNfGoJ29b+Zj8pBy9e++2/UaDY7kZ/oQ4i
-ejYudoomDxwGUnX6lWaWhvX5Hht3zIpnndI685ilqdBcdra+UbCyjoDeNy06tKNc
-6FWkt1ndn+Ng7LBKGtG0DsJ9KiYrcaA9yDQRnV7s0HU7BFJaf6MdCbhtMuBKIyHc
-WSSI9wNW8ph3yt7fQbGL
-=Islf
+iQIcBAEBCAAGBQJVgTTwAAoJELp701BxlEWfsFMQAKwIHQibnLnCntsWUG7h+0Gx
+MiOIsqzoM/Z/cRoIayWwALctbPKJCSDICyh3ef0v+QKW8MmraQwNKevD56Wkdh9Q
+ZyefYiMs1k1N9qj1s1arSpGGGswKrf2J/a4Cw7usnQ1ry2o7u8hK6WH7dCSrD/rA
+mBMWRZge75NNORBifpItBp+EvCdgwn2QZ7LPHuW8gwrGIEBgS762onwEKHdXgX8Z
+xX4o0Nuv59xcyFoB9cIEBvDF4n9kEmwIDOSXwsNfKu1M4ecL1M6JaChGjSgWpcL1
+LusHcmL25hO76Y2a0vm9VAT7DFh1+++Wi0dudiS70dCDpwIdGimfiNyXCSGGtajE
+BK72FndippabzsR/UJnx/1u26Yfu6akprHeBvx1C6adqnhxEJGce62RAslXnNpyO
+JNbo59wGRya6abzj9rxgBhhwDv4UcoV7OQvvwUXWO+wRPRpCOziy79gRP+V1SfKl
+gj/1rdC4eKMiSDilj3Yc9zoExamc2NdZzUscHzdkeCbvP+UijZ1Lwroi2uHjOzZL
+x0KZ+rlnrRehaVBLZ09PvKwlmmpjPA79up1/cpQz5x0vVGefpT9aavYPTN7wzPfJ
+jBjpeMbQutivaXZKgGllDBV7eFa2d79F87rQ9TC1bjurvg6TezXN/s2GxTJuuVY1
+FbYsCUfV9FleWFjINGWF
+=MedI
 -----END PGP SIGNATURE-----
diff --git a/app-text/t1utils/t1utils-1.39.ebuild b/app-text/t1utils/t1utils-1.39.ebuild
index 042e6d7de52c..9d9c02fbb8cf 100644
--- a/app-text/t1utils/t1utils-1.39.ebuild
+++ b/app-text/t1utils/t1utils-1.39.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.39.ebuild,v 1.8 2015/05/27 13:01:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/t1utils/t1utils-1.39.ebuild,v 1.9 2015/06/17 08:50:56 ago Exp $
 
 IUSE=""
 
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 
diff --git a/app-text/xlsx2csv/ChangeLog b/app-text/xlsx2csv/ChangeLog
index 0c9ea7fc5505..38b436653cd2 100644
--- a/app-text/xlsx2csv/ChangeLog
+++ b/app-text/xlsx2csv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xlsx2csv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xlsx2csv/ChangeLog,v 1.14 2015/06/06 09:19:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xlsx2csv/ChangeLog,v 1.15 2015/06/18 04:31:50 radhermit Exp $
+
+*xlsx2csv-0.7.2 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +xlsx2csv-0.7.2.ebuild:
+  Version bump.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index f707026d8c8d..b96c814ddee7 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST xlsx2csv-0.6.tar.gz 159419 SHA256 06950599efb417f8f4611af6587167688764fb864824973643230bc2849eaa0b SHA512 abcce8c56e354a234fb26980c4e77ae83a3da1863da9b8d4cb819c416ab747066ebbf8f285978ec498c038438d42d50c7bf5a5c79f2c1c85837c6a4f70c54da1 WHIRLPOOL 3819d14f015ccb80d5f4a40c10fdca40903d11a56e24f36151c28d8592248137a82e4cb05e70bd74554f88e5b9bf87ff2353854b04d09aa4371be1f8b1ec64a7
+DIST xlsx2csv-0.7.2.tar.gz 188520 SHA256 7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866 SHA512 c55535271801a690ed9ff28c2572d13cdac0efd206685a2119b73d1da7b4a46754da60782b36f7976bc5dc1b478860430848ccbee347824aea1a6556764c5922 WHIRLPOOL 4be43d36d2d123f6e263251f71d39451f84f881c7290999357b5a0c39bb71617460516e76adff939c36476fbf2675fbb8069a48d61877fd926706053e68e5195
 DIST xlsx2csv-0.7.tar.gz 169287 SHA256 147bbf64d501cc2c9d9428da9b0eee7b11e0981a52f49f188a2ad0a3d434f6be SHA512 e591f389dc8775bd390dd6a000aebdd3159e7f9d5c7b81a5da8f996c1e49c869a799f087815ca7209021f04553b9fade79da537cb1d0b034406c7bd2f9929e51 WHIRLPOOL 40e20d2bfbc92cb976b25f054f8e247174d670050e00dfdaf865af76017ce8fd413f15e60ce07326d6f6f822b5b36956eea8098c2f0ac1c3256358b3a68a0651
 EBUILD xlsx2csv-0.6.ebuild 648 SHA256 abb5d7179e526ef194f3fd368b6ff1b4973d90e825a66db6c5340d5bdfeb964d SHA512 8edb68a6939b91a1980c4f6230269cf90f6c4def1fc072cde16f215a61a2f215884004abb0282efa8b20f7add35a0b67d0c18d18bb12bf36973be97e6fecd18a WHIRLPOOL 6656d5af74f6d20e66c8d48aeec49ba28a2985a8c6956e9f525ea380c8a05f688dc1f6a4f70171de917151b5e54b317d02df949ff23b524706bfc10674750fcb
+EBUILD xlsx2csv-0.7.2.ebuild 657 SHA256 33e0126aa944bbc47a553615157d5acb56369bb4c1766be17077118a857b3bf9 SHA512 3e2df455a0791ca1c5e37b208f50d970f375a247c8defcf8feb6c06fade21ce62a99cfdb3792993e41734e38280a0c9181804a8bb9eb0c61f105513a7d2e7696 WHIRLPOOL 476ff9d3a6889d2f30958fb0d5d64537e5c3a0b6914998ff0d10d6bf94c09d7cee8051eaaa2a0f8af0fe76c686b3d9c99075071049c11db83f57b8210a5ac32d
 EBUILD xlsx2csv-0.7.ebuild 721 SHA256 96917701ca38597fc3e40807c7ec1ba5a54aa393a933838367c3a6cf25c2a9b9 SHA512 0752d490ea977a95083915e7d1579a0c6448b1a99ccd7da9ceeb2f6ea4c275c63be9e0051b0b957cf27cbc37fbbc725469079ef6a3576f38f09dfad966fa0137 WHIRLPOOL 65877a1a14aa26ffec7940900df6c56072980e1dd4e3829c0a54bb8bdff636762ddd0e5f39ff362ae8a5f7d574061d9961b2c35b5574c92fc5251b5b312f62df
-MISC ChangeLog 1885 SHA256 921c9eb937a6cd1a12196c61a7659def16982ca13fd0caf823c6cd64a2321cd4 SHA512 1cb2106ae0cbace20395291ca32782a47af1a5f4711da3231f237546f30a1fa355d22938ded3783b21beb8d0f14d8fa4b1d9a25139eb87f12a2d4ee5d0d8e64c WHIRLPOOL 41e11515576c3499995391a05b8f98f6a58aec7ba2ee62bb6e91f89d8aeb701eccebff04302a9419238f2dd83574c4c06832b7d447562ec1360144d9009bccbc
+MISC ChangeLog 2011 SHA256 a6e262a957badebf7b1666ef7ed20effa31753c9a2100d1cd216edb52873634a SHA512 1a80dd0c966f1699af165a446cb89dd242fcd744869086983a08e32da417910b763aaa18c2f3f6683d422f8c8d2c12e2b741b3a3db40bb6a496ab55aea2d9a09 WHIRLPOOL 5d880fa1d57cac4627c79432558bf4fc2f2185c4f92d1329cb27ba63225faf05665dd743f6fa24ace48f8181d11bccd5792926e6574dff72bce4a206b69d67c2
 MISC metadata.xml 371 SHA256 6dbd24a8058160200f0811fd0204814489bb1ec74ff69dbe9b55b894838e388b SHA512 de75bce4584ef1df49c896e58782f6aab91a1c10437270e66e6f052532de43cf6fb621d9afb7ae5337444052f2af5523132e2ab11b48788c49c5073f197eeff5 WHIRLPOOL fbf6ea9caa7797c6cc1ee196f7e4619dac3b7f2dbcc75ac87527e3810c34e0512b94aab5f4458003b7841b7138bdac9f692eba0d7879cbd7f8c9bf9aa11a2847
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVcrsQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+rAP/3RRcZhDw0G7wKVnvnmZTXl7
-NgGAQcL0Z6izAu55+KGUhwnMCP2HFhC40PmwMSuB72a74p5dV6dv52xkgKs9uums
-IwfZhqmB1pAKh+/tJYLn7PRgu17rkhmwvdE7WeMI+ay+Hvc1HJ7TybPNQ2hnQxKF
-pZDOXjFKIMa7pqr4xPwxKpqX6zG1/bdtYa1clZqvvqfbLXsXoZcfsqW+MEuu5N/1
-i00l58/QHo7FM/M4hsM0YVoOCVy8wIFkt8XtgLwleIREs3QRmy1CBAMXTeJZKTl2
-P+Aqah2mhhJifoJkF+yJ6hy2xu+kwS8tk1kqOKQv5OLkmmrnk2OfXablEVBA+wmH
-U5M/kiIxfEL3VQqcsQ9OB5WOdOUX9Cp38fzxmqmCGTZzCPsVnqsi68qheaBVwHAH
-Oq4PduAffmfjOiss+Aiq809sisVJ9TAb4W87ya0gBaFUOvrSz/uq6WRTBE5W+jl1
-/BXHyxsJjRwCJ471C7rls9vtui+ZrXb3uKTQMtdPQkNm3FMeQ/2VvCeJN47Eg+j5
-mrhbA2PnNL6CLaCPTfNc9xuN/yeD8EzNXvd9Uf9fMmT1R0gXuDusCT1EENtNm0fn
-tSnBr9miHVXDdXzBzQuDyW8d71sf8BLBnQuLgdIGzGzMtlhdyr+YO7hvhGCiPQrE
-n5uEtq9sPz0vKTNaQWD1
-=WgTF
+iQEcBAEBCAAGBQJVgkm4AAoJEEqz6FtPBkyjzocH/2LJ0iQ4NRbvAEXy77Jv5zIC
+TuLMD0AyQthymxipEVbc9zGGKtcBwlCBTMW8LVqQrZf7my6Rt56rsVl0S7B8QKfO
+lnTJOGds4HvSx2G8VvRtBFVV5KDtr0oTepeK5LDBCSLLVjY/oyNabN7ws2hCJwbh
+G7UYsR20YMQH7X7D6F7d0B2+4LCCnV3Gly/jvExtrndx7yiQG5ge3jF7y5Ph6aBJ
+CNBdyI33XMxuTZLn9oLTDQHdR65LCpx4CuVSJjPTncKuCQS2r4VHR1l7qewvKGBe
+k0WltiMF539L9PFs5epNgQxFk2AftcoPxlg38n0jySxm7pcwTg8yDGRQyHVh1TU=
+=y9GE
 -----END PGP SIGNATURE-----
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
new file mode 100644
index 000000000000..731af98373b5
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild,v 1.1 2015/06/18 04:31:50 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/perl"
+
+python_compile_all() {
+	emake -C man
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/${PN}.1
+}
diff --git a/dev-db/hyperdex/ChangeLog b/dev-db/hyperdex/ChangeLog
index f1b4a5ca9415..5e09638d99b4 100644
--- a/dev-db/hyperdex/ChangeLog
+++ b/dev-db/hyperdex/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/hyperdex
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.32 2015/05/29 23:26:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.34 2015/06/18 02:53:38 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> -hyperdex-1.7.0.ebuild:
+  Remove old
+
+*hyperdex-1.7.1 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +hyperdex-1.7.1.ebuild:
+  Bump
 
   29 May 2015; Patrick Lauer <patrick@gentoo.org> -hyperdex-1.4.4.ebuild,
   -hyperdex-1.4.5.ebuild, -hyperdex-1.5.0.ebuild:
diff --git a/dev-db/hyperdex/Manifest b/dev-db/hyperdex/Manifest
index 4c4946660ccb..26ab546a0c11 100644
--- a/dev-db/hyperdex/Manifest
+++ b/dev-db/hyperdex/Manifest
@@ -2,9 +2,9 @@ AUX hyperdex.confd 122 SHA256 8ecfb0b8fbadacff70efeaae479ff527c7ee868d2f98c17cf3
 AUX hyperdex.initd 337 SHA256 e7d7838d534d71df80cb358fa30b34a059b5d7f929acfc80f7c2337ad57e0741 SHA512 eff3e82e740dc8ba62f3253ccf91c04c5d79dfe325dae2271411456008e189b30feaba9dc17e7fc9e736277be240195e131e47d2a2732ba8797a736f8562502e WHIRLPOOL b809ffedd01c002d944b647ad52ed3e75f485e595cf687838eb977816057a52531873d909488009cddd664127c4996f0c82b4fb8a4090dbd34b9c9db1fd10043
 DIST autotools-java.tar 2770 SHA256 b74a069cf94d05cfbfe3eb65d42603d9a9d46a130044d76ffbf55ae822b62b3d SHA512 a193c3c3f8cc654967905c9ab559098425f1688a75c21a4207959fbe13572b4dba3e5c21e04913f20e5aa1b1c2fd2b13dcef91cc4f031b06884ac3130edc5757 WHIRLPOOL 3fbf5f0ab1a4bd231e69f924442f047c1e872f04c85afc46dca423c93641264347dc2d2c2a8b1cca740bf349d4db02594144c3797eb1c4bd649a35c169f7c86e
 DIST hyperdex-1.6.0.tar.gz 1490273 SHA256 1a29ef60b2416b078cf82f120386e4fda53fc40ef613653d6c1b8a46ef4167c0 SHA512 44e1c5fa1e0e2158bf3eb72dc94681f8aaf3a804ce7b2df05461c1f4c9f0e3e71ee7f0503c25ee9e00701ba9444df18ecbe427606de4ddd3b1f31d382b037272 WHIRLPOOL f52494148800b16cb663dc137c54beca61010a0a279d7a4fbefb0a3b149963437600808aa7d2efab5015c2c03efc544fb2ee6ecc1ad05da205a026b9dec1d1c0
-DIST hyperdex-1.7.0.tar.gz 1518090 SHA256 ddd3f65226eefd44509b5ece288e339f95d37885a49f1c9ba00de9819636f679 SHA512 b84e6d5713472dc98ecb900fb82958f2b9a81f47a17821fb8260704aa7277aa38130f708d770bd6877f934aca0a68cd1f69caedbf3a82e1f7767687134021c03 WHIRLPOOL ba147066806c418b009262f03751cddb732eb28b519736b79b319cd2d15218fbb909de21ec7886e21d98c1f657297fa229cf3888a87e2f72062c790e04a5d45e
+DIST hyperdex-1.7.1.tar.gz 1517677 SHA256 db3857aa74795698e50c6a9abdc6a0570c67e701b5213c803d5fba16b45cf1a4 SHA512 41bf8cc49081ba41917c737facfa7b5e29bcf73f510ae5743356828643bd7292ac8c610915985e52f6609c4a80cf70e7d515504bbe0a85383c74d7e288f2dc5b WHIRLPOOL 8bfd39e9e3aea7eae5a85ab64f583f5689add551c86a6c3bf40557ebb9fff0dbfec91bb1c0eb3f812be7f35d044ba16872eae850bc9127b56aff21168e66ead2
 EBUILD hyperdex-1.6.0-r1.ebuild 1526 SHA256 3be6aa2061126225732e9668c9a684c83ff3bb2a4f216945a01f2e287afbf19d SHA512 989a7923389505cfab8bfa04e8b1448902468a27b2dec2f9e16a6a62a355ac1533e51c255de48dd41e610cf4218a1be60d0d2640baaa5059e763a2f950876594 WHIRLPOOL 63933d38a3b383fa0f5977a8c7bcbb6bd9b5ab8a6bc016e89ca2d9f9455566c730a2bd30ed6c8ba15e9c0596f205172f8fcdddaa7f773e0dd8637f7eab3b6d99
-EBUILD hyperdex-1.7.0.ebuild 1523 SHA256 881ce155cb438d23334a977c9c87818280699cc1b6f671d76223ea5ccca146e9 SHA512 d58183f20f3ebc7ccde887ade5022297053f7b4838cb6842bae1cd17063be6feda5b2f967c010b71c3b1ae9bb7747a338dae54eeac41a4726f9fd02e4449a07c WHIRLPOOL 4d18ad73178c07d787313bc18e5e6845a3d1f7e0e826bff6db452fe0e5e54ed53be1ff77c33e2b5f207621f43413d97e77be6a8378d048a4667dd7433ed7f38e
+EBUILD hyperdex-1.7.1.ebuild 1523 SHA256 9dcc4f8b77f6e7b457076504ef0590a422ec4ec623511666d2035f873d345629 SHA512 f6cb7d6933448b49b50df56af12c08eb41f2ac88d44870a27184afc726f5be6e855026d9533801c0146c16e8b2ec8bfbb6e956ec0251991615e18918ff46d42c WHIRLPOOL b1e6f90484bdff7cc918e5c59d5f54469395cd6f61cbb8887a4a6c1d8be49aeb4e55e143034d1397f6598a91635b92011fe5d11ea41b63ad28c3f0dc4a1a782a
 EBUILD hyperdex-9999.ebuild 1400 SHA256 8d76edad580d2b09328843a42cee999ddab4fe7945f609da81611977f6718836 SHA512 a63a3ad046432a7d91813d1f879e1817a70896738097200814d70978dcd02b69802c07b131961c926f6d6906c11549e76e49ea0a47aba409fc0a00a39c02a7f9 WHIRLPOOL b14210a4fc448a1e1cb319ef22f093f2794f0e4d14b217ab0c03686e336371760d6aed5428f852a15535db29dce829eb5aa3009bc2078e88f1df64bfb4e92249
-MISC ChangeLog 4530 SHA256 8f98da16cc2e8d1800d84f7332418c306f068a5b1a8df1d3eff2c338c34a2f88 SHA512 7e4395f7ca898bc444bfe846d577934eba114b7c329344c6e8b5c251c5563d87f219fd787ab53567242116fea8c842f5bee9d78c3a4b21e6a4067f6d6c70c1f6 WHIRLPOOL 19fdcd52408090feeb950788bfa30fd512b9d563d6ebe6b6e4981b20fd7fec99d7c5f279497df68458f69e896ea5e3d4d38ff75031c5794a6c1694c464f63a86
+MISC ChangeLog 4731 SHA256 39ce3ec868c2877d6886c6207bfcb5ff7f6b63fbdf3b3d483d3863271d66bc9f SHA512 f4d9c500400eedd9c04acfe2287c2c22d8a0562742a6b3acc08abd4adaa1f2d85dcf03ff98c2a7c2dc71edebc79ed707e3a949f5bd6090b611d1a0fe5d251a9c WHIRLPOOL 2eebd4f47b3409964bbfc666581f5022892fc8675b48e817164a847ee3c606de3fcf9508d1beec42baf07a867b7366eafd4f7cabf675df7860b339b5b290f5df
 MISC metadata.xml 234 SHA256 18b8701557e457986cd3ce541fc05fb724a82e245bba5ae63959ec6916ea48a8 SHA512 23d74b4992965abe1c0d6bb9d511112de64e5a8ee25ef5bd9a7b7c0119a8d30e6c04439314f35cf9f93d9d6aeb1986868056e9d5912409188a030ff6eb2bfca3 WHIRLPOOL 387f1e5516b42cb431a743b804f89a52b02f2d2105465a9cc39073badce1960f1f518ce4c53d5193a899a421fe574b47186d39ecfd2205fd66d9c57daf66288d
diff --git a/dev-db/hyperdex/hyperdex-1.7.0.ebuild b/dev-db/hyperdex/hyperdex-1.7.1.ebuild
similarity index 96%
rename from dev-db/hyperdex/hyperdex-1.7.0.ebuild
rename to dev-db/hyperdex/hyperdex-1.7.1.ebuild
index c617be423be9..0e22e72426c2 100644
--- a/dev-db/hyperdex/hyperdex-1.7.0.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.7.0.ebuild,v 1.1 2015/05/29 02:10:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.7.1.ebuild,v 1.1 2015/06/18 02:47:00 patrick Exp $
 EAPI=5
 
 # Tests fail, again
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index b8946227d54b..7eb47a1ceff3 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.438 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.439 2015/06/17 08:58:30 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> postgresql-9.0.21.ebuild,
+  postgresql-9.1.17.ebuild, postgresql-9.2.12.ebuild, postgresql-9.3.8.ebuild,
+  postgresql-9.4.3.ebuild:
+  Stable for sparc, wrt bug #550172
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> postgresql-9.0.21.ebuild,
   postgresql-9.1.17.ebuild, postgresql-9.2.12.ebuild, postgresql-9.3.8.ebuild,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index ff71549ec93b..f8dd6ee5318e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -40,45 +40,45 @@ DIST postgresql-9.4.4.tar.bz2 17616272 SHA256 538ed99688d6fdbec6fd166d1779cf4588
 EBUILD postgresql-9.0.19-r1.ebuild 11086 SHA256 539c6d8fc147e97548960d7f1040250681eeb2e62e35490d6289d08b31bf92d8 SHA512 97fd888f880d5d205a3a6f95e65be6b5870b2a1b7e22d94099f7fcf51b40808b86cfc9d726cf05aded417ea886cde20296cf0d2b1152b102e478079823ddf657 WHIRLPOOL 7ae41c3eefb9bd162dcc9527369c2e4e538446ebec576d0a80f41e87931140339955f4ae306a5080dd66e6bced7e23cb5c2cf0e82bf6dc51c3d7274b4bf8e9ed
 EBUILD postgresql-9.0.19.ebuild 11052 SHA256 0c7d753184f28c95cf40df4a2a336cdedb46a892c6e8046986eba3a47e797ee8 SHA512 2af6d783e1ab28ea83e2fa6fae19534e4114a7f0a9f386951fa02e463911bad461d3508003e02ee097da2121ba78a7a5c60a605075ac636aa181d15fc4875436 WHIRLPOOL 9b02d35d474108d52788941fc005d3c2b4137cc3d4440e8cd220f04e8c9e652b196bfa0a2371b5f87de7969cdae84deb5258474e7f29e14f763846af878b779c
 EBUILD postgresql-9.0.20.ebuild 11085 SHA256 d8a3eb8f53168618a3b7c70a3d50a37201cc668ef05ad648e13123843342fe4f SHA512 086a8a880384967d114b73d4aa34f8580d8df9dbedb85d161d03fa5db920f693712defd1bf91d52fe85c24e3a9ccd65b2b6be346de64755bdf9a0a71b172502a WHIRLPOOL 015ed856b38f97c95bc279d66845496cc51a7f8e5c288eaead2d9d2ea23707939d423015e2e6183156f82c662440bdf58a8d42fbbf72ee066cef3384af4f755a
-EBUILD postgresql-9.0.21.ebuild 11079 SHA256 e6a92c611b8c64a44a928e8c2a95a4dc82b2a43f318cee6a28fb37934ef76f7e SHA512 c24430e6dd46dce6769bd24e44474dafeb88a8b1539ecf596b442ed40a6258f35a3429cb9f98e70f696189928ae20ca4e91f7993869e1b661a3a77eeda1cd9ef WHIRLPOOL e9ed105c46abd7b3fba34fe13cd0fbdaeee6b9e9e2844166af40ee3e3d32a62d309668dfe7283f616cca73be1c824b437d5697e54a1de7ff30a235222eda18cd
+EBUILD postgresql-9.0.21.ebuild 11078 SHA256 1604b692e05e253491d1e791d749f1365cf85a4f38a1c18e64ed78e387ec2417 SHA512 ba47584020c5c371e151219688648fe121428ea863621cb2d21e981852d2ba223aebaef072a2ab6cabe4a4643014461613ae68d664a9ec699d74966c8ab4a408 WHIRLPOOL 28e2ce8a7b9a513fae7d247e0cc3148f1db7055536bdd05607d83399c1ba857219eaa1c6c653c470937da818dbff4bca5b782507ef9103a0817d59d63da187ce
 EBUILD postgresql-9.0.22.ebuild 11093 SHA256 3fe1a9654d50a02b5a440a2f7cd770b3b38c5f55dcc078771ca64a9a84158d4c SHA512 53e7a170d6ced73d2279cc88f050f486be5ae2741e74e3a11f20daf391066464c6f02b8fd9e77d6b23db50d9fd3261a5e6a2615d067f5b32d8625134a877ccc5 WHIRLPOOL 481c9fc5b3336b1db202677db46c9728a06b5d332b8ccbe1f487a0e0a52f94126ba40fca5e56f3110182cce0f6c7c02975e2796e1f857defeb55336d5ed703f7
 EBUILD postgresql-9.1.15-r1.ebuild 11274 SHA256 fdaa2cd11d5e23937abd7a292bd717a1a095ceeabb1f9ff873a3bf6f05c3c694 SHA512 509faec8c56449d3e80c17f70dcc3a61fca24dafad23d1b2a8a53365dac0f3dc66550219eff294060733fb2a7c4efdf886fe50fc1ee5f53857a3958df8a31c6b WHIRLPOOL 7e85b4c73d6b1be63c9bd2093c5335bdd0998d4865c3dde6a0a6ed0be3d4c99950eb9db9e3e5f18b00f17a3418c7cd11d190a9d05c3e8a60ad92069f0ef7f0d0
 EBUILD postgresql-9.1.15.ebuild 11052 SHA256 7e4f42f58d6126cb46f63d2a8f534bfba35cbcbd0258eb6d65c725fdc479161c SHA512 5532cc8077535a2e7bfbd0cd4bbc32748fc21fac66b653342b1aee76df3c3b27e20de13a10de28fbb584dc9428b318e026b5f0d79a5d8cbadad5715925d519a5 WHIRLPOOL 583d4207dd79992f2e45d1391083ffe038706dcdbd361fc48ea827f501eb1077f73b98e9e03ab74dc973108414c64d91311fa8a982a6dacf8d5f813537c2823b
 EBUILD postgresql-9.1.16.ebuild 11273 SHA256 267794bad8adac577ef1420ae5f9656145ef59c60250b8a3407f6d4fda6afecf SHA512 b4aa0a35a8fd8ed12bff5020d806d5dbdb58abbe8868c7c4b1edfe668b6ac8c8252b232e11b6d296db078a67ab5458b5f9a5897094cf9a912d477899fa61b8d6 WHIRLPOOL 9c547e90fa0ea97c0b2e2b9a6b3fe3031fdcf47c776056e524cf2315b52dd525aae1047b1f9c9a70f1bca0c62dce4c15518fcad3e4f6354c3e0103b9a72b863a
-EBUILD postgresql-9.1.17.ebuild 11267 SHA256 8c2ddbe5803a30b871e45d7d817843b7d78965caccb370cc5fc98676dadeb527 SHA512 a5e72b2d8f76f83a299b93b3847b64d448074d9bbd883db10d1a53c63d66a2c6ca119f1d584755bd8a8c2b15f86ccc53b1fa552941b4c388c306046b1f661e44 WHIRLPOOL 680887a3cc4b93d939f718997c0a80848e8b9943bced2112666885aea19faa24eefb6a4ffe989f58718b051614d4993aa0038757cd3da27ee219d2de5469b729
+EBUILD postgresql-9.1.17.ebuild 11266 SHA256 c18181237cf5e6960cda9a0d0dc580cc0348dbb57df1f6386325c245a3b9d5c0 SHA512 f092e56b5aa88408c9a012bab5ab3060258e3f3615690d1fd7411b89eaae695b9eb6a8db40a728d2f8838b4f55e236a15fda5cced58e949a1d1d8de8d54c9b73 WHIRLPOOL 1190c949c9ea05d23748608b6e39c46b401b80705c486f4bc4d18f45c76b9f9c0af7e7e92bb3a697b785bfe313c647c53625bef337937f662262fc4716dce0e1
 EBUILD postgresql-9.1.18.ebuild 11281 SHA256 18bb998b8f0e780d9af5177c924e6589b77ced0629790bc184581ba878a94116 SHA512 1b760a7965dc914051fe0cad70f41289d3037d0243d458671de7f6f5eaa62fd0d53bcaa23c64c195ec2ca57696c875954ea49a648eb22169868d5fda5f8f91cb WHIRLPOOL d58deca2836595f164704c63fa9a855ab43d8da4e06461aae37dee0be8248b3c6d6709ee925b9acd6b675de405a80e95aca51017448f0d472d441c0f9c6ce653
 EBUILD postgresql-9.2.10-r1.ebuild 11614 SHA256 1d006a9e10a0d6565c37405c1461b4f04989c84bc1118f79146c137bed3484d1 SHA512 f02c729e42dcd52cd8ee1152dc3edf720ef98af16fe145ba5377e9976f8be983ce6b1e98fc6927caa7853eb49906b2570e3fa0bf48d78efd630b4f642eb7b369 WHIRLPOOL ca66cb2f2951ca358671b3d36032822c6df22fd40c175d621ac0344f2052ecb3d67f8e5d889386463a855c3feb1e02288afec340e733f1c2a48a25e403b7a45a
 EBUILD postgresql-9.2.10.ebuild 11388 SHA256 3faada08ade10b9a3aab70f49022eb5cb70e1a72acf110b12ad44bf2e54964c7 SHA512 babc40e3c02d317b4231304ae8c6fd04a624343c57cb6ed1fe7a261e1984a7310fbfde04c5ee73e14fdde04c078d2a027e29c7ef58cfdaf3d2e135c3b49b518d WHIRLPOOL c80256e54dc1efc3e12388d8dd084b07cd8ebbbfd8d90a5a8e2e4500ad5ea641474f96feb6926f70b859df5ebb4d183015b244779e4fe2c96fb92ea72c8cab24
 EBUILD postgresql-9.2.11.ebuild 11613 SHA256 8b7afa8e59d1fb856def018e93177efb7dc7ef2ef3aae52259ae0d2645f6942b SHA512 c2fb4e33617924b2e85310bf93ba239693a29301c022de8b8fd8df2483b8d8dd2b965e77384f87df971d423a7d583ffc7d184227ca94cfb70ca20ce52b002dd5 WHIRLPOOL e86ce50350984632b693cb330ee5136be460fffc5cedffdf4f9a4a26f2cc79c41bf1dd703ba3b87d44a9189d18a7873b9c2764a4c98e416b3061fdf8579de68d
-EBUILD postgresql-9.2.12.ebuild 11607 SHA256 fe482e482bbab00a953a64a3b68d2f2a1f28507fb9e3c706939c97b2069b833b SHA512 00559cc96afb35854d3020a083e16dc0ab4b64513ede574a642517c3fedb34a17717010859d68b4aafaed895aeaa65e699d2a61f2553fbea0faf5ae98d01d64e WHIRLPOOL de575665bba3c06afe79cce973ffaeb444a035a7fc41121ce743c6cbcb5b3d33ed69b8cde719b72295f2b617fa5fafb03a1da61b74faad7a7a474137931be4cc
+EBUILD postgresql-9.2.12.ebuild 11606 SHA256 77222a46f7b0c8a09c2b9c19c3881f949218d8c280c82760f325216d7805f324 SHA512 a63d32061b308a773d227dcf31c2e127d519c9b2ff59e416edf6d26dffefea4fe093a3081f3384b4c7c4071cd56acc6e7fdb1b9eb1c037e9429d40f4d66fcb9b WHIRLPOOL 61a45959617fe1db8cc897c79ddf8bd3dced9751708d078a51861f0df13a984420be8a95276b3ea9145a9daed314d668b55a98c1172f5def20ef3e23af181937
 EBUILD postgresql-9.2.13.ebuild 11621 SHA256 dd25b54b0195f268d1e83e16b0ac42ec954dd48bcaeae1909e871655906cef06 SHA512 7e05e3e570fd49ea7240025394a6b3d880787983e2e372078be4fd0c8f23a1f31d62fa57bda50b5393f2f08fafce492dee96bb702f9d1e4a234d05b756ed56d8 WHIRLPOOL b6aaf6bc98bbfd647cc06f211f64021023009e42971ab8d8e45449f19774ed7df5b18adfd1bebe90b4af13d0ac7e962a1b4787bf71244a607ba6bdb049927358
 EBUILD postgresql-9.3.6-r1.ebuild 11613 SHA256 45e38af4761001ef229ef5f67e0472b5e53a85c732f17804d5af0ce407fc4c7b SHA512 2548f12202ac2555bdb446be09accd7327dd8c066f007177d1a8a8a0012f845c080979ede0ad5cb379860a9be9dbc892ce93ddfdac0986732852f2c7940d2cd7 WHIRLPOOL 7163feac1ac68ec20a734b6e42ba26d2f0a29b819b6322a38c54bc543daad01035085dd46800f875f21e00123fa0ef71437067a524a835d9e2a788d8f55f55d7
 EBUILD postgresql-9.3.6.ebuild 11387 SHA256 be0591cbd7ece2b9a3111f362197f7847410fb3e6f3fe197c6b4d4efa552a6ac SHA512 9b9f6bdd48b2c2eeca506dcdb9e65b736bec136a30019a3a2c1a125c9bb08a31388e21882c9e89561cdb2c3463fe0a19aeff868a506f16361820171fe8eca054 WHIRLPOOL 847d213488f96ed14d18ba7bc6b1c61bded1dd1f8c263ca3bcfe5da95114ce79c34f309eab4b37704f8f53339fe74022b48f59865633628d4262dc622d2d39fd
 EBUILD postgresql-9.3.7.ebuild 11612 SHA256 2e9701db3027b5cb0a951f22013ff4d535827d64cc226f687964d9038032ac98 SHA512 9ff02f0268fd9fbf5aa65120fc937223c5c2d0982d6e6537522b1c3fbc75e6c65256e8b4c2a813a157ecf80b3a0db4c95530c61b1912310de5b096a4ca8e8d12 WHIRLPOOL c35618b45b23db63a9869d7d8bb99a00660a9c5d944d1e3fa380f84ca29324d0afe26955c1f883a75a467ae5cdc8f0939ba300bf4f655d55ac3082c74b445a59
-EBUILD postgresql-9.3.8.ebuild 11610 SHA256 6bc397a28f6918ef6de81abf14c7734b996275e81fc7d19e139a4f9d4046f810 SHA512 4b952e6a23367fed9bd6d0c0cf9b937b319669e6fe10708c14a38133ba2e65b9d2a1cb6b6e7b9950020905ce929170400e800f798efbe1ccec2cd6c6ebf8d27b WHIRLPOOL 880c65dc1eddb2ab3e11d75bc4e96f2165cb73e9f3cb2ca0e29839a4054dd5835d22edc3f8e7c6608b38a84d508f710ae3a05e3936756c5cc1694efe2faa52dd
+EBUILD postgresql-9.3.8.ebuild 11609 SHA256 051a69bbcf878fd3081ce7d3a6cf77d7a1257a407fcf6858180fd61b7dedad58 SHA512 85d0ea3ba8e862c34c9cc93da8309f53b6dfe0fec8b6c9f8664ed68aff7373ad4b1326f1eb8fe2fbc03a87eb73a772a93f441918ae7bfb5653ee882ed4ff481a WHIRLPOOL 93d3ed08b7dea2eedf77bf92216c1c71161b9945a3a5401f40edfa9a5118ed49d95e50b142a84dec89bbd9682980e939b14b0689ddd7cb52b9afcda72a3ae6d4
 EBUILD postgresql-9.3.9.ebuild 11624 SHA256 ed702bf68e09c296be44b022bc99efe5e0a490994c0939034b8497d1522ec528 SHA512 90294e42ddc4b2a4ec6cc9ba57b3d6f867dd703620a188421f75d55b324a2ab683040962b650c90271767348064f6c7b21ec6d482457402aff361e83e97762da WHIRLPOOL e08536412d940bf8621ba48e71cc8c6d9f49958dd400d08ff93d6908fdbfb8ffed56c4b4e7116f2896f55509bc163511345ab996e9b5ba9bd234b8aff1ed3750
 EBUILD postgresql-9.4.1-r1.ebuild 11583 SHA256 4bd39367ba1159e005c910327bb76fda23dcc9cbbcef0151878b5963dff1cfe8 SHA512 c2d715815e531ee95e34f69ed97df2126c6dd2e20ceed287724d5d4062911bf70e6f64064df547d8e16f90f93c74fb683c1ed42dba742f061ba91bb5a2e62e8c WHIRLPOOL 83039672c079659a75327865cfe977214c56bf435c63760218cc24d3b00d325e396488e4b203ff056bdb7ab4ffd7cf6dfdda7d0203b54afff9d4ac7ae8e5fb89
 EBUILD postgresql-9.4.1.ebuild 11357 SHA256 3ac9a1171bf09481d11d4bf5faa2091c16c8a5826d214155704d59800990fb8e SHA512 880fd32cf38ca2491609a0a86aa883b851d1e69f16a5b3087f2ff33be0f98d5a3e2926e4815ed4ab6b1cb485d8c40fef23cbdc1b30f20601a6cb9e063c250062 WHIRLPOOL 51eae1816099d50e3a997421c2a364258b9f8a8d00acc95a9c84693ea12d3049fcb6fcb1c901c790d9405b0a9c59173f28457e20cbcdbefdee695ee8513c3362
 EBUILD postgresql-9.4.2.ebuild 11582 SHA256 0a3f2aa4be1e7173bef453976d467ab56dff547d685c91c0dcebc05bfecd244d SHA512 4a4a7cbfa7ad8081edca45224182e080f9f9ead156da244ece180fedc97016e53fd39a34b940e42aafd055c3ac1bd5bd7ad339286ed50186d55d53772115c671 WHIRLPOOL 4ffb682fc7a64a5a29e93f3c19361e5c69162536d18c44782799f2f7a69f0a0f322098e11425efcc282679a77edeb420dff623d91e15aaa517f0233c0be1f2e9
-EBUILD postgresql-9.4.3.ebuild 12421 SHA256 f9f454082026fcfb77b58ce34bfb088d72b689dd421d71ad9adae5b14f3ddc8a SHA512 2da3a0ffcf468eff9293c33091a7d995c25b914d4dc8203eeae4d21b068545715c3c3f335c2363827f2a7b3941ed6eeaebe94016fff87e37fe474af6b5aee937 WHIRLPOOL 331aa53c19fe22dc490fbc1917cf06d2de6394e95a5d67a60e377af812b042ca52e0bf5177e555f9e744a9a15e829300949ab55f6d6dd1fb395b55be0a3f1367
+EBUILD postgresql-9.4.3.ebuild 12420 SHA256 0cea3e80558b7bc63d643b5388aa0caef569b7564fffea21796f95ef9dbbf00e SHA512 ccaee6b991eb9407f52cba2a66da4a4704f55e1f2b8fad33d8df7225c0304cdbb2de96f817a6599a618d2dc241257b84c258d8845dabadead49ce69d6e783546 WHIRLPOOL 370ba37fa4a758f80361dda49f4dedc92afce398a1d6c779891153c0635a4753afa43e97add4ed1b0e4f986ab0c818fc8c78d01710f869e65ecc059be9d5e3a0
 EBUILD postgresql-9.4.4.ebuild 12435 SHA256 2460a680589f8d70c6d9730107da3310b3bf0bb468de21e30fd61247e2aec047 SHA512 d0bde853a0c5e9ceb91e3a1fa2bd7944f5d85c0db18e44bad40b702d5c53e7df99e5224e1c4fd729879e0629c1ba8ae530aad5f9683639a9c8020fc6908d166b WHIRLPOOL 5080af670221b8cc7f2d3e2096f7e20a60961db9905cf2b93d2df7e450982cc64b8fab5143540d9240cdf7e88fb19f33aec3314c6273ceac6916b20c62d7b795
 EBUILD postgresql-9999.ebuild 10864 SHA256 9d268db4017c973491b420ad3161acf881d495f6c4401e0ea5affa8427feac1b SHA512 c0725042e26133db6a9c24695bca5f5b9376c6ba2206933013313dff85a73f9364b60ecde40116a7b3732cb8088368f40ecb24ebff6093ba5c0ba16da5f7adcc WHIRLPOOL a19cbc58d32a2bf469829c40628791d5f140cf959f921fef9f76006aea3fbfb7a495fbda5acee63baf357d66b8d62414fa38d5e79dc7c422133746ea31c81a06
-MISC ChangeLog 15413 SHA256 45994f5770750c5bb8aeac22b1431ca2cc16c1587e7435eec245f608a49f8a8e SHA512 78b648529821cd5119342d8396152051e94a2ae102a9c7e6588802470ee5e16e0f5162a83585b998ee51b6682afa230e957e84fc16ba814dd3b0e4adb3369381 WHIRLPOOL 7c2a8256b536ed08e485d78220faa4f3aea5140f22c03ef6ad3042160c28f721cb5177118725772fe98dfb12f60b19ad03843b4ea07b0bdea6aa55a822e1ab6b
+MISC ChangeLog 15631 SHA256 78f2c1cf799364b3bcc316d7426dee714cd132144047fa37cce2ceb7328e2a10 SHA512 6856623ce65b8692a2d8b9c6e89e814d7bdf725f549611ccae44abb172672ab9e46f65a7b35f49109ef5a3efbb90e9f227082c67d8113e0a5553ac5ef0eb6442 WHIRLPOOL 569f97c14bebcf492b4f70182ba6be2408494e2c4d136d5d9e258e833e88f43bc9fa509e736aad430c25bfcc38f927f6db7f757114ebedcf0bdba686e73f1221
 MISC metadata.xml 620 SHA256 85335fdf06be777d6fa46902094b666ddd7e0a64d12f03b0ba54c181641822c0 SHA512 00a3f52a73add4922a366534f50decb308254a27c64130c9b4fde4f27fbed318ff65a5065a95e0d99219f5f4c439d502b0b0a3951f4589393617385ad656e003 WHIRLPOOL b0a0bf7d88a585d04cdc7acb7aa46d455fff5508100c3a81485ecb9cf221dbbc13f10501652ff084253eacde019d4c79c7b4f997bc8408ade041edb8a23cb1cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf+WlAAoJELp701BxlEWf4cYP/Ri0WJa3Tz6Zoa3GSw76Sbk8
-iSbCY5W83S/HY12zqskaizpNa1gt2vfza6F31XOoV3OPPRcWuqbkwDGBN0c06QlH
-qw76d5/3qN85yjwYRoX9Yq8WE746U4UgiX2xLGTEjdbOBIC8VFzZmAHcJzd3ZPEK
-gn54q7iKs+2c1PgGBlfNTRt9o6f7wkhAKhe5HrUFaMFNfvm1ICtYlA/eNsFBhNTD
-1kXJvyBx4ADqb2v2wMVoBwqz0H89YxYhVI01WMN+Y4h7bI+X1ttI2erj+QR4N7ga
-tuC5u8XNL1bhuJzXBlc4dCXC8+6xQZHazxRgMGcl5I2p4vFX8aTx6yAc2gsYeepG
-+qqhfCu6EmrZ+T+h5jKZPEB7ak4DbOEMo5Ba2TH8DMEpyZoJPO3CP5qHAKxRSJt7
-q50Hd853AG83diycAN1QDGjmubJdI3wvbR/G2jP7qB+S6qtWVRFeNOb/QPU5fPdd
-HJ5+kFZL6kKhFHnIMLZI2VTuJudH/TIbIBAKKrIfOrKHQMZaLBteBSA1ZkDDFfxX
-CgTSLx9EDJ3BHW6GdlNJTP70m4KhwDq2eTWIJfLTfDhAtk5H7Q2HsveZOnS8z0IM
-zylubpmZqT+aFGh2YLuncUpjQAIngrCg+mQxqL4n59TYvUlnFcolOQmN+bKE/Vv8
-NbKDA4YFk9ypDJxM+2kb
-=ytcd
+iQIcBAEBCAAGBQJVgTa5AAoJELp701BxlEWfX9wP/25Dhi2TiR47dy0MM/SujXZ4
+1o93Eld+3pk2yNjPV83agcFGVXpZwaZBjy4Oj91YXVVMwso5tSTd57RmIgdmxqkp
+O+VdMiyD/Xt5GicEhG+suWXGTTOGSsM3JZVE5byLA6UujdFcW51MjECluEQh7rI9
+KGT2oMv7IzvvkoVm3edHSepcLSp5R7bHS9TlxocBCZHTZ7qBRYqcI6GSshdHRPP7
+ZZmUbXJAPaF81qw4mRAPlDzaCWFpb6dkW0sKt+Vu+1rLDBkotg9seT3bAFBEggEd
+G3SdzAojFt5vEPYLr8DuKKBdW+jgmswfNtL9pWh/OtRNHvf6IsT3oyvMygTK52nx
+68E0pOwBkKIcLl2YMdZ9XBpPKEDpVCeD5XQ8TzPuWsoqJ8goIAYMzfY/24R2/2bH
+q7HDc2dkpDOpfbgaAZ6lCmRpa46A0AwqfsVE4B2eyhWqLqwtcGTKVM5qOlfgQnvE
++Vdpt70PEgyDSC3N3NvjPMR0YGQxrNSrs1jtx5zXWESC76c5Hjppmf6byPAVZdTw
+sBaXv6zm56APeFDJTSs2RUtD7qybEPXLINtZdTy1RDydWJ4CpFhWapQ7img1/A9K
+Q7/UZzfJpZsf45F+lxwvFZ92e2AYOvKgqxjx8odYqITIwOkDTgolHXwixffNR0VN
+LwRQcR1V5L4KC+XljEYx
+=q/N3
 -----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/postgresql-9.0.21.ebuild b/dev-db/postgresql/postgresql-9.0.21.ebuild
index f70bbbaf212e..993df0a14767 100644
--- a/dev-db/postgresql/postgresql-9.0.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.21.ebuild,v 1.7 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.21.ebuild,v 1.8 2015/06/17 08:58:30 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.1.17.ebuild b/dev-db/postgresql/postgresql-9.1.17.ebuild
index 56f008ae5ac2..2fed6188f65d 100644
--- a/dev-db/postgresql/postgresql-9.1.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.17.ebuild,v 1.7 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.17.ebuild,v 1.8 2015/06/17 08:58:30 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.2.12.ebuild b/dev-db/postgresql/postgresql-9.2.12.ebuild
index a9482ed9728e..a3cdeff9d819 100644
--- a/dev-db/postgresql/postgresql-9.2.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.12.ebuild,v 1.7 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.12.ebuild,v 1.8 2015/06/17 08:58:30 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.8.ebuild b/dev-db/postgresql/postgresql-9.3.8.ebuild
index 75ba07bc6ea0..0daad7b62a24 100644
--- a/dev-db/postgresql/postgresql-9.3.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.8.ebuild,v 1.7 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.8.ebuild,v 1.8 2015/06/17 08:58:30 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.3.ebuild b/dev-db/postgresql/postgresql-9.4.3.ebuild
index 8ab0e5219737..aa85a3db6b21 100644
--- a/dev-db/postgresql/postgresql-9.4.3.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.3.ebuild,v 1.7 2015/06/16 09:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.3.ebuild,v 1.8 2015/06/17 08:58:30 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index eb63afdd8101..d11d6fed0571 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/batik
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.75 2015/06/16 07:18:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.76 2015/06/17 07:31:34 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
+  Stable for x86, wrt bug #543858
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
   Stable for amd64, wrt bug #543858
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 0966b6c4e932..8d95c331b48e 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -4,23 +4,23 @@ Hash: SHA256
 DIST batik-src-1.7.zip 15060504 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd SHA512 7fee3e0d2c99e95517420c8170f68b4857fec87f69c7c55719b5e9914608900fca4c9d7d9b3e1166d678a6c844fe870a3c1051e2c1f35a2e6793a17b9087893e WHIRLPOOL 7e8f4e537d5c1d14778a8c151ff469edbc25e629c0cf99009c65a99c1dfac47d58c0bf0fa6b194bc51d8fe25ba7949f264b5d055cc22563ff50ecdd95d36daab
 DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
 EBUILD batik-1.7-r3.ebuild 2610 SHA256 1b561e240e697f44be35b34bf4c0a27460a6035bd9c13cb9605151d9acea7dfa SHA512 17e9d144f009cc04595568c704bfa2d14f907dbb6ba6143d43bfd0cb6f32e5e35eddf27b73902fffbf08a50e6aef6e659052fcfb1e87f3143c38352ea4d78478 WHIRLPOOL 215bf1cdae087a6260803cf1fb0a481993eed63f037580a8b1975232316b583376c271b4d369ee87c72d82fc06636cf05082f2857b166e0df9945ee5d17d060a
-EBUILD batik-1.8.ebuild 3092 SHA256 b10afab741b7171ef3a8e182d1f241a2ce5eaca1de6112c02d2c760fc1853399 SHA512 f562f4fc06e90ce5cafc11da0b3c40be2ffbc33b0c29056b06d6ba048032c10a91e9e7a139085eb905eb5267f0f1a08a81c70f140226a09f2270f60ea8058732 WHIRLPOOL 070094c8f196fac9d9cea7923a4ad9fcbfb5b60f91ec4921da76a42d81ebc955ca8b5abf22bca3ead57aecadd24b165dbd3e31b7878e296d754c043e102749f8
-MISC ChangeLog 10028 SHA256 507d565eb75155fc2402ea3a49b96ac64e089f4fb187ed25369ed0371cf92a39 SHA512 3acb785bfb4487dd137f272a0f175173380456de0b7cbfd8e23b28a7ae4b034ff574576d37b82f8d8d9ce4c85ce758d91eb5692e827ff8d582825be15caf3b05 WHIRLPOOL 4f6fac751219cd6e360f4cc2b393a3b28bc2657babb58e412e5f7bd1b271e6cbd92c51249a5d938f5c8d3303865e4f23cc391325d7475ca18eb708f15ee55a19
+EBUILD batik-1.8.ebuild 3091 SHA256 4c55b8f821bc3576ebbbb7959e4c53ad227b92d09be7dacfa595f5026a4c018a SHA512 8044acd5d57a35c4fa777cd1efb95d71132bbb9c11c5c587bfc2073e905f458591accc1a7b44a0ba1a113790a5c4498c8c308e0cfa26d6e4690c81ee99fe0ca3 WHIRLPOOL d5c7d67a644f10870a5c4d34eed3c8166a94dda12e062042228b604e68a26b0d6cb9bed12a7f5e99b6f72db01507545af4671cc65342aaf7e9ea6cf8ce264f50
+MISC ChangeLog 10130 SHA256 3519822db2d86ed604aba189dc1ed779a4a66e8eb446a8dcb3e5680aca8e9874 SHA512 8a32d4035c9716f8df2ccd0e2c096fe6f03b05e8523ea517e407c2695f76a12bcdb7b37455bd134c7fb080ab33358e2da5f31acff1594e977540bf4236ae3b4b WHIRLPOOL 30c21d7b9beb920d54ea78e8a5d0d4eb0105aea0882cb62cca2c093a4ae48fb6f7e75e5aa6fccb6403cfb722bf5215cc372b4ba0e293391ca165b8de4a45c016
 MISC metadata.xml 374 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 SHA512 57c2dbfe07d5395cadb81efbfcc2af61785d373e8b791f243895489af12945c3fb16e4f9fb229ebe2379868fec5d8224443e92b9389ddc9104224f6af8acd3b9 WHIRLPOOL a8475c29be2005c682b07ce66370d46bb562b49d38d62883005d7ed238f822043e95425c4644454dd0c1209c17c71362fe02bfadfea81fc6dae07de5dbd32cde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf83GAAoJELp701BxlEWf2fcP/RyEXOur1150aYjCjuHFMzjI
-D1x8eTcHcgMBfVQYZp1asgbdnGWO+JZCWyewtW1Ctqy4NyvAEnB3eeQoVZHMFmo7
-EbdfSfOFuTpRnMNWnrIQ5+GisBZoL8dfGrzwRlI7gmNq05Jn7JpZEPgOYCzyhJ9f
-bZnt7EKFt+OzYH86VNT1dUbXAF/OQVVUVksFXqUD/GPIgWBm6CBs2dSLGMGPFhqH
-Yo0AbVKtcg8+oZYAPmaX7cbl3pMR03qqaIf20vwpdqLlGiCTGD7wubQUKWh7bsGN
-xs0Z6NbwoEvxGWt/tklh1D0ki+8d3tKftW7k/fUqYBt1eUwXLAA81o5s+rEGsM00
-fBbt6iq2egcdQ6c346Rr+QQZoGuk3KJudhJbKaUNx6pz876L+sE4gK1KtucymsD0
-ec7e31jpSXRfZaMrMOsUel5EwdoP3VO6hCqB9wKKIg9LDAsMGSXe1MEkUigewmFJ
-UdbP4N/zhGAXi7cOrpJY6MXlFIUA3fmgZHET2erUIGIjz5nHFnuEe1dgErEFLsBA
-wivSlAfAl7OD0G6lrtBx543RVcPuLCw6EzpjuesYQrBe7l++I6L1jdBCtsO3WqK1
-tA9e2/nK6bmT2cn+k9IyRbKuA0B851ag7/OtKwEoEg45/zH8ekZ/T4/jw1O+MWZR
-SxSMgSMap/63i4lqWfsl
-=vbgV
+iQIcBAEBCAAGBQJVgSJXAAoJELp701BxlEWf2H4P+QF9ypaqU5ERKTmrzfi5PZzd
+K0LddHq87JS5MnlWqPms+En4hf39Nif886oUVq/xli075pwnDaTn6INGcdouiU2M
+u9WHlEslJB6WjdvIcQyYvS6tU50+l22rjQAOGlq/C9tYSDxo9mAtsornhQGQPgzG
+aRMMdcCjNqcRux0MD95+WI4vecpYafwEqSzRfgtkmpo2XFFbA0dzTO0HcYT4UsAj
+sJkSZg2aNqY2EExBMOHYBHsRY3bffLLw9j62OtdSvAZuF4WpR0NvdenXpJxnsgLZ
+wxoft4XIxQ5rJGQRJUgAHy8hsoSyBF20Boi5hRcs1UpAdEyJqP1yyUf98fAgwFbt
+rULA6pw0UTdfC/laC5j6wtdwfk2rTgUF6rgO0yd9OxXrVN1py1zMo4X8k3RDVzGN
+paF5eJcpYyE1QW1ITZO3WyeF5bTEo0TML1q3Ni9LvOUUbTAKJ/Kwu0ouGl7nSlmm
+MDqWhsU5H+ZaTSFpoXxH6cKD1GWdnIzQJ1GE5H2hmWr/KPhwlEIybvFOdwNIVcKO
+qzDQcVFzxdg3g5iGn8XpkU7uPi4lAOjaD8PIVLusgaKw9zarXop8rIMoroDvIEFj
+GsHMao2TOlBL40eCGKnDZJmRjJouD1YdT2HWmfpLr1R5jbasuRSTTZMTB5kB9XBM
+PBh5VS//tLqoq2DpwZ1o
+=HI/k
 -----END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.8.ebuild b/dev-java/batik/batik-1.8.ebuild
index ad9c7b2b0211..507ff21ef6fe 100644
--- a/dev-java/batik/batik-1.8.ebuild
+++ b/dev-java/batik/batik-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.3 2015/06/16 07:18:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.4 2015/06/17 07:31:34 ago Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc"
@@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="dev-java/xalan:0
diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index b9db53d2ce68..9a44fd5eda2b 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-httpclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.67 2015/06/16 07:18:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.68 2015/06/17 07:31:49 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
+  commons-httpclient-3.1-r1.ebuild:
+  Stable for x86, wrt bug #442292
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
   commons-httpclient-3.1-r1.ebuild:
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index a623361100ad..81692590f08d 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -7,24 +7,24 @@ AUX gentoo.diff 444 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a1
 DIST commons-httpclient-2.0.2-src.tar.gz 1447937 SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 SHA512 2902a5c8e85c7c52137e54746d9c82031b02f35e5bc69d48f2fb30e07515d3de2da4189f72dbe87bc385547e8cecca064c23ff99ae584a8a8352433f60dba1bd WHIRLPOOL 5fc9aef3847a1d288ac0f60dd471b0f3ea7465bb6da29a99a8a977439b49de47adc9cc6eb7cc806d047e92b06dc21c895ebe1296b248891cc9224df198ad1fee
 DIST commons-httpclient-3.1-src.tar.gz 1882664 SHA256 f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 SHA512 e73ceeba3f34a35c30b24a3c6cb8dfc2102ff21079a5ff9270935908cb2f707d366c2f31a53fbdafa99673cc2b82e05470a2bf40d96767c72b2ab037c0f55490 WHIRLPOOL ea95a7fd7d6dbe0dd2326b12274629eba611014e0d2461dbd75500d3f18188d30962bf132c2a7fea98e51a81aaf44cbe097f27d8b3894a5626680ea893ea51e1
 EBUILD commons-httpclient-2.0.2-r1.ebuild 1477 SHA256 80cfdb9b8c1a6ee6e65e008d65ca02ea661aef50d2d6a7c9dc701c964b038c58 SHA512 2c0849b699bf262e49fd99fdf7eb012f5fecf3d42777867da5c156eca0fe0c83c2fb27dec0ac1541af8b42021ade6d11f7051fb4097d755b722967554a968f08 WHIRLPOOL ebac35d0c89c2dd60eb0ef10fcafb091f6422b9e2f16350839c0422021cf9fa653ae51ae9e350cd44544e55831a186d418cbb62e3455a9a6c86fd240620f1dcd
-EBUILD commons-httpclient-3.1-r1.ebuild 1794 SHA256 cb3de338397894466c61084a1993db754c38937d054336149d781669c0bfd41f SHA512 dabe6482d01449adaaf92be6d8498874b0165dd10f5beb38d153f9242652626ac1affdf5de83a8843ea9a9a013bcc732e98048fb091eb7fe5b747df460c16404 WHIRLPOOL d96263f174ffeb6e24de7f85b31958d466dec53952d21997bbb3b2a5a5bf73c390b9bc44a15b44564d6d16c23ec7f9a3f1059489bf4d13a02c8a9bd3913b0ee5
+EBUILD commons-httpclient-3.1-r1.ebuild 1793 SHA256 b2194ce6c9f3bf7707e975f8b06662cea6e32f9739aa54e782a3db0623775797 SHA512 133cd608a4fb8e23a10993e5cfc6f41613863c82668add2fc4469af5c8fce252753a386738051aa643fd2a6295502690146062874c675113ba38679842ac647b WHIRLPOOL 2466aa72dfe4e66ac3aecc93dc110c9e72e81c2455dc34e4cb08d5d9684ae68444c08fbf358a8c8d49dc262f4d7530c6f415bf4ba22ddb3af672368120334709
 EBUILD commons-httpclient-3.1.ebuild 1601 SHA256 80c196cae1a95e6c61a3b41351e96e0cd58a03b18e97bd19d5d05de8c0c74018 SHA512 4d457d19a0d00dee1e943f967ed0e62049c02c4f151ad752bccba16ecf701ccb49e72a07f24a9cc3037ed5176e7be0dc5ddaf37f111ab82987832bae0ec4501c WHIRLPOOL 4ed771bbd6feda3a685feaffa4f4adc7ddbd6f710b1d1fce0460c45786a787ba5a54ada4da997aea8b43fb69f39825c19048939274967db8ad82c4724b6cfe7a
-MISC ChangeLog 10215 SHA256 8675c6177fa4a0a0679ef5b609a0796cf2a489551558ead63035fb922cb0f372 SHA512 0ec2b3624f197696f8571e3ff252a6019efe4928038baacb00059fbb0f4872e2e25ce3709748798dfd77f348fbf7065f25c87fb806479654f494cea2bd50cdda WHIRLPOOL a32113e4601c8803a7e5d55fc5a9e58d93d8e3935ac8ede30cc0733a2dd6cc0a1bc2fbc6a867a2945f968befcd6ace2d9cf8ed9a50484648228db9513d14e5ec
+MISC ChangeLog 10335 SHA256 22898bc2723afb5081f21d757e31968b7af46330dd0876e1e5d6e09680fc9aaa SHA512 e4c90c4b1e6abd21cf51d46d8a1bfb0f8d0652187c2b0781ac23d9a6601e2590c8416423edfadaa850dbc4f8c373cb5917af3fd4f5695076bc0406067e6704cb WHIRLPOOL 55f98abfe3958ba3cd5cd9c83351bce0f455ba3a8fae7c534a845f08bcb7a54e9e7c52656f66995e78898009242107b98933417cc37fa6279bdc33d397bd85c8
 MISC metadata.xml 378 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab SHA512 3394f05be1067ea259ad9ba425804a3d904e2d7d3392e17641876243146faf8888c01a14be328a1ee58f4c72dfcd956f961767f809398a2c61b8b7668d60d932 WHIRLPOOL 0fe59fdb65d47de8380c90a96baec6c924d83efa6841172702b21f70bebd8120803a368f2bee47ce544638536fe62a2368c4044e95ced12a22f2722d6c6a4b7f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf83UAAoJELp701BxlEWfh0oQAIEgv6wwNdSd9/GIlnlo4osq
-4w5DmDaUYwVtbJ4Lih1Tu5HCUtbl9zxZg9cDAua1n/LDJo/0eIKfvakvTtCfU3QH
-vBcE01FB4kv12HKcxlvBCdo6ENrWYuWg9p4EBlY+6bNz52S3F9sF10iY2kq9/SQS
-KpdqqzY3oM04FJBsv4EchE9aqLv8Xf/3X06fa7Fnl00xpnhj925VfS7yIxXL0+Zb
-dHsdyU5vANC61ln5+O15sIfd6P36vKOFUT4MN8fO2Q3PPHjH89U+J8PrAnLdckuj
-C2IcHNlbOqcJMB1a3uo87mrQIK0TK3R0E7nzsbJNCH/8fjgrmUJ7hOrVBoOZdJA7
-6SlyNqUFBB7VjRoUFqRLb/mGjTTWdnAmpT9N7miX9bctfih7MYv2vOuNdA8K3JdT
-p+2KV3mOTHvNmeBBdicQGp3hjnCwgBGEfGrvAFltMYtILy4vPm9025JF6skisDo6
-vPg/FlmqVf8gsqP6i0ypJmmQ9DWg2s+kWakfGG33gBRDQz4NEmWuLMcpXFuzqlDl
-JixZqfN6L2lpRpUTgmmyMKgrNsZ9imnySlL6bKxC57K2O+mEnXyTMtvADtEVic6p
-iJSAsKtBoNhmVEclwLTL/A4BnsNAnpU8JmwUy7poRv+Xh9N8M9/z9Yrd7BRHm+xA
-zUTPft06Q8DYGv+2OYc/
-=KN79
+iQIcBAEBCAAGBQJVgSJlAAoJELp701BxlEWfZ4IP/1JjmP1jhLSnRCqvhy1+whsi
+vPxcn4fuMKPHzZtVJTSYe4xf8e4seZ25jM+6S4noNOxAqgk+kmKloNn7rccdJfdL
+AHXiNtNLznn/eqpw4nBeAlnN3X8sh+vPTjfWTt5/ySbBI/ypGVbPvas4gHcU8Hyg
+Gl8N/hCBRug+NtfMmYbnHRMFNu9CYlKHLky10lkytJtVqskvx7q+GcquH332GHSO
+cPh4zDb6YfJjgtpgP49OOpvmEi9J/fpQf0x6vR8XKF/HO+Zef9yJuL5Qbo0s+fIG
+0Ie2p5OmDCvc0ovtBxuYu5og+OdIwQISIoO40eKb5MhvBkWKvIAO8tvKcGfwhr1K
+SknZxN1SqDtCxXgW2Am3bYIb1hNFsqWcjJ200GYvy3rGm8paH7Wz0Agahl182lZ6
+WcdSk5VXBEW4uoPIVjNJmgCbH1ckMneGhSBEVGjWwJ1cXGdo9L62j7F0IGSoPquw
+oDO1rIJNR92lZ1BWBGRItMS5mSL6qRcs6f2Ygjqiqqq9D0l1jy2tBmMq0n6270lI
+xmnGgY5jljCf9qA6FTMlES47p4AGOZZ8ppYdXVQiFpqCyDz5AZfrswDT/0EMLdQQ
+jfKbj9l7q4wVGjra7i9yX1LRgq5OHKs7jmOn+aa2CjUV+2tUPXN/UjWLu8NMLoRI
+WUyjGqe17HpM4hyEUjy4
+=qU6O
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
index 41b8bdf30928..2038db146bba 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild,v 1.2 2015/06/16 07:18:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild,v 1.3 2015/06/17 07:31:49 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://hc.apache.org/"
 SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 # doesn't work with IBM JDK, bug #176133
diff --git a/dev-java/jnr-constants/ChangeLog b/dev-java/jnr-constants/ChangeLog
index 158165f97a7a..423511efbc2d 100644
--- a/dev-java/jnr-constants/ChangeLog
+++ b/dev-java/jnr-constants/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/jnr-constants
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/ChangeLog,v 1.14 2015/06/06 18:46:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/ChangeLog,v 1.16 2015/06/17 09:21:56 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -jnr-constants-0.8.2-r1.ebuild, -jnr-constants-0.8.2.ebuild,
+  -jnr-constants-0.8.3.ebuild, -jnr-constants-0.8.4.ebuild,
+  -jnr-constants-0.8.5.ebuild:
+  Remove old.
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  jnr-constants-0.8.6.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-constants/Manifest b/dev-java/jnr-constants/Manifest
index 6dbf0af0c346..5e2f40d87ac2 100644
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@@ -1,37 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jnr-constants_maven-build.xml 11304 SHA256 ece9c0e5dec6f2794c5dfa64bc3031520597dff0c7b69faa286bd2d3d593d047 SHA512 ebe66da46f9d80e02361a895c2aba7b635cf0a4e550f7a4f4c5534684bcf06585b43458381d6a3dc526d0f020b96bf93a259d2b4b6125c23e5d6d571a373ce2f WHIRLPOOL a849304c97578fb41ce810d10d884ab005f3a942e41b8cc97c982ee2b49a3edca8ef12d380b8fc793f105d79befeb58224435cdc8245e6289eb5255180dea82f
-DIST jnr-constants-0.8.2.tar.gz 110511 SHA256 924b242877a8472e5828a5ae5f9d5a1f0c0981b7629cd68600d76c9536f2f323 SHA512 b0ea28ce790291dd778bf7ec7e42d8f5b69869f0b3496126a5a94b5d3dfe4994394a5e95576a546f50709cb78c0294a58ad4dadad13a994c9dad66971d851a2e WHIRLPOOL 171feb370e0809c6b76c56a16cae39dfc180f7553cf14fbb2b60933a2f87e41d6d7f84f700213d6bf823c31816a719cd3e59e3d11755534b284b8e902a9fb85a
 DIST jnr-constants-0.8.3.tar.gz 110622 SHA256 e4dec305fa7c703dd9a693f9d417d7a16cec8b690c122078fb3518b0f4c258c8 SHA512 1d37596b1a791e4b727c51de4732512d4dcb14ab8cfe6ff0fe4f42c8c253cf8e69c5808f8e408a14d7e752fe13bf6c39b015a81bc3c3610f43ca4bd8161a7694 WHIRLPOOL 40d2d3309984971421bcc7bea7331860bb3875e50b4b57e27f6a10e5e360c55e30623af42de65b171be00244919f81f35b96ca98dd8cd474f6bebc081400cefa
-DIST jnr-constants-0.8.4.tar.gz 70498 SHA256 39be80c7f5506a0e1ac13cd9f751347fe24486956240c2aee8f3693ab7b04a1b SHA512 aacd59e43292486653d758705e8952ded6557415298487b5c708efdd1eced539747bc0d8654a212b41f39ea086de14f6a595f85a3bd831587d67006205bbd51c WHIRLPOOL b5fa3a99e93a5d303cbe1f41619e362d3552f8b79208d70b5c57660d77ca9f3d3818a1751b2e36b326230e90b5a9a3fde7bc81d578d5fb7fa1e0c3bf265b9ce6
-DIST jnr-constants-0.8.5.tar.gz 70543 SHA256 d8fe01855bbb5b2a44985b7d6df62b9879b54a413bd5421a2d684500ad83552f SHA512 aee055c577df8a436bd97198c4c19ae7d3e59e1c14615cdd8c4a6d0df36c0690af8ed1d83bf4e2008d7af0edc160cc672114012ff3fc9fdb0ef2daf5859dbe35 WHIRLPOOL 93367c6f39b3fea2e21fd96b53cca8670f4fa0c2b254194ff0b4f799d3d9c110594c1401abcdf712349016b414680f6463bec3de3679f27b019a2d1b24dd6a4e
 DIST jnr-constants-0.8.6.tar.gz 71080 SHA256 6c90abaa12004962032dcc4958adcb256b663840b082b07f3fee8e038c30cf26 SHA512 2098f8e1869b9c018ba3afa70ef386fce2609d9c650ee851dcd7cf7dc9d4d87dbe26886eb2e744d96cc11425f6b66144a018826360b7bab48a4b99e323f3717a WHIRLPOOL 108fbe7cceb25b21192047761e418e56e6939e62116a8896f14a804f56c541e58b43c5904df972075b8307dabb8134b83555c13a2cce5af294677ac5d0e6591b
-EBUILD jnr-constants-0.8.2-r1.ebuild 1198 SHA256 46051085e01674a2f8bbc85a4a80ef7e9361c30638061541a3779cc6daff1ae6 SHA512 92f42a0ae2dc26941e74d8b34672a9ae42cb1b297e7964128a8f70fd7f322419aa142455a82f55ffabcf8b86199903a2493bbe8d8d81d168697f5483364da9da WHIRLPOOL a6a1cf1164e88766710adedb3b5489a74d568d50c5cf0d0a9dbcc56d41c67162e6a91291740d65359b6686ea4c7a62354875da064c0813f7a0f07b749ceaf411
-EBUILD jnr-constants-0.8.2.ebuild 1195 SHA256 c2e9fdd325a9832bbd22a6f21fbf3e50acbb03f55c6399beccf1f13e223b5fd7 SHA512 56c33c01632848bb4519c3e468c1d11731233898e5a721578cc4677def46a49c2ef2a8fc8aa692f19cd12cc1ae9bc4db6235d5dcec54e42afde6d94d8634c8b0 WHIRLPOOL 32303a30fbfe4b5949290c365f085324f03f9d804fbc2b7bc09c49ccfe38695b75ddcce8edf4ebfd06443e590f2fc264bf6a0d05c3638ebf634750094a4cf0f4
 EBUILD jnr-constants-0.8.3-r1.ebuild 1108 SHA256 d35164d1e948aa2ae0ec91528e50dc5e33d06d5155be46eb0c290bd5e712af5d SHA512 fe0235fd6ed4114adc541160d8f0facce0fe0f3c9001b87067898bfa0e9c0d45e78085378a49ce09a78bb4d0cb0e18db9e6288692dc976f97ec1ee52ed7b5e76 WHIRLPOOL b587f5a18bf92b290d70c6d5bc91aba4efafc326251ff5156d27ac3148ef3c1b686ab8c52cb931a3e25aafd0666d9b23d6b276ecd8a3c87701bb88ae747e12f8
-EBUILD jnr-constants-0.8.3.ebuild 1099 SHA256 244320df5d05ab76d335aaa5a62606455f71bcd3a53e58f4ea223e312d58f407 SHA512 0ee7b57d801353fa2b689e3c7171d1d77624f404578b7ab5cb2d5a6c5de4732899f2b06ae4e778e3237e4c37e8de1e9bffbb78e11f73aefa52579a252b2574c9 WHIRLPOOL 78a16228096ba86fce74e8daa5e88cca373cf91216c6b1aa9cf53b3c5e99cc9d52a585b442b528f7c7c40b8a9d9d4783cfff7a801a56db2c01cc8fa90b618e8a
-EBUILD jnr-constants-0.8.4.ebuild 1096 SHA256 01ed819af6fbbf4589d781cc79699e59a8befe4e859f4cf0054aa72160090dca SHA512 b9fe4a12ad1055d83ef4667aceac1bb35dd5d5afea4760f465573c97c711967c302f769f175eac25133b481647358c8f8b92314690b8804871da75605164fbb9 WHIRLPOOL a41fbbea5049e7b1e9c8e18a99da9ea63ddc86eff41ccfb7bc63d3545cd47ad12b3e4a70fce5bff497e986d79299ba785919b24116469c111d502d4ff82c78e7
-EBUILD jnr-constants-0.8.5.ebuild 1097 SHA256 4dc5d572c73c77d81755a7a58468b13b1a5294df813c1a4930b30c6db9befb97 SHA512 4d896132110fe6b42f6d8bd74871858ac06bbc8e8309f90f05c57c0d4c0e81e0d109bf9fc18facd4289d196fda0e15884f9b56c431df8ab9e1e3eb99a2f1e1f8 WHIRLPOOL 863cd01704b8565e38d4dcce8b62b9eb8695f8edc32d0d4b4f1d3104c54bca120d6cb13d6ed9c792744d0fdcdaad1e216937a698386b430c02abf252aaa72b9e
-EBUILD jnr-constants-0.8.6.ebuild 1182 SHA256 c22b1d6bc2f17e1ba2e460b6f18df5fc1a731a5e16292b8bc734029cfa2b9a43 SHA512 7aac77864400bb2ee6e6ce0673578a43624668d9a8fe61d75d831718cbfedbc94cbc106d764c687bc7bf9e36247fcbaab8446e67887611afb83d357fa7b3b7ab WHIRLPOOL 004c680269ea915b191d26595757abdb37990183e60c824d07975c74002f75c9f28343cd2cd81c8395aa8a14b30fe01182b6d968025756a480cd508ab69d430b
-MISC ChangeLog 2294 SHA256 5115f55d87e7c24244ec4147dbe843e9b67078403a1cf1cb1e25ee57b0c86ed6 SHA512 72bebe5603b446b2b2a63b003f615509b2d286ffea088295ea637075013a94bccd19ef8e37bfdd376a4232d78f6d31644be0be40225960e2148261f15710a503 WHIRLPOOL 570947870663a17039ac835e4617949078b9948e88af93a0302aaff2d9acfdfb0e981f377f084e3d023a4050323c5b0cca117a5374b7a5de232ea2d33309ab09
+EBUILD jnr-constants-0.8.6.ebuild 1178 SHA256 c9d6b7064e08301c6015a98b2caac90ae24ca88ac5aebf0f271630a03055212d SHA512 95b9c1463e2af666a117b2eada33c498d571147fd3c86234fef1f48b990d8dd3cd9d0c0f278acebc47f79705628b5df3d47848d3e7291c1d31ad60ab09c8dec1 WHIRLPOOL b46a6dc55a467069532597a5bf647a882ae02bfaa6799c696be3268c2bc92a7b88ceb95de729ab3a6e8bec5f3fe85290e4327c7f2ebd4bf8335c23f4faac692d
+MISC ChangeLog 2665 SHA256 51ab5d6b56a9a279cfc3698e620a568d35b323d8ed4d3d2557fd61de91a35518 SHA512 f0daf5f22287bb2e40ce092ca54c254f94c71af883dec7d5d9b5b4841b897e1746b8c5ed1103d62c003b9ca7157f7a38cc19d1244b8d68ad52e8c0c1ed42cd86 WHIRLPOOL 67877b9888dfde509a6203e5e5c603632693cf5688bc801d023236fd82560a6d37ba9f948eb17bed051e00f93e5172a921be9c96a8d56742d14427de9999bd8e
 MISC metadata.xml 294 SHA256 8b1a030cb4790acffbad705a5899c1977ab67a03402d2f31ea21660c89c95e88 SHA512 c51d4b13e60167a8c3f7b4b927aed50a7a20a8425158b394b272073793aef0529d443cfd81cff99737d64e95b69ff6f54a065bbeecb07826cf6c712ac4d3eb89 WHIRLPOOL b5c95e92f21c133415f5322770ea9e992d742d2ce3173d5487b7cd5213592d7ec088c06d2659315d4a488fc664e7946f0f5eb22482b82fbf3e6a237674bffcbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVcz/pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBvcP/ib7Hajqv8o2VPv+pUso2HO6
-211B/pP1nx0bXoao8f87sjCffU7YFb/jSK7/ZAUBCXE+FhQKFCy4pEbkdmLu/U5D
-ELZf3RBowEb0ztNLb6l8KZZr2OiLyQtEAvNFzPlDQAyRC/3uTpR7pD3rC1TJUFIf
-xtvUyvX/6SXinYPZDoMQXEOEbWi910enNwH4CVHPXBqJxe4n9/1BgQGqCKNKhRiJ
-TKrubVcSSSWu4h7y/5ZXK/ce2QstQQpdUwaZC4nx98wgaVP0e8bVOMX3I0v+QRME
-meNhsmUOwfvx6BtAxawOb1PxzlyDw7RE9LhFhPpS/1/GYBzvuFiZK/pwb7BU5IJG
-shWrNg3TlX//NWxBkuUEz4E880LgdEgpbLnE8AoPdBSHIZcWzoR+FVmEt/Z3TNIF
-XypUC+3dn9kC2+yFv0ig3cK7tMPcRe89shKS1ltZRN8j7jUgadnr5ihFDnImAD4D
-gZxdNs2MXXApbt+fzyyEsWQJ7tXyfYaJ3yfuqOdRBuHdDDXaZ+nbN7Xd2aaZQ6U5
-XoBA3QqQfHdU+M78/HU1LUi7a5C4FvLzEJHwdtvOrGvJFsGsvbzYF40LPLDO0rEK
-VZ6HJR9XdwsljUYG2zr1B1T8j0jUEpw2ic3jpDHh4GGGZIu7rvtsPWXO5B2ccd8H
-/8Xg6LUVLZ4IWPnOI2OQ
-=RJj0
+iQEcBAEBCAAGBQJVgUqyAAoJEJGRpfGTSRu4Q2sH/A/6sDt2bXvvM+i7vzPGYbgw
+2qLrQcT6otXLXJ5imUpMM9QqDpYVKFeRKMVD2hM/cTyC1shSepM4FTAjerP698Fw
+Gvkq00AM7CPO378G8KojkwVkaxt4XDdLlb3G8p+1SJxkB6sMte9xYWqIsW1TwK88
+ToqiI2i1k+WUDkl9rSITjGvMOYWxK5BIYLAeaoROTNXi0nq1nzOiiLt5028A9C5c
+83XrG691VsBZntBiTD3tyFBNwK9fKNhQO5hI/604xvt0pHF4Ven6ItOp2zQdV5Rp
+t5M5rgl5Zyt0hhEuWhqcPZ1qQQSCBsyCZAHEzeZecvG9fZ/n1K1dJXZqxSEn/rM=
+=M+qI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.2-r1.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.2-r1.ebuild
deleted file mode 100644
index a29c6f31419d..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.2-r1.ebuild,v 1.1 2013/08/17 08:18:24 tomwij Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="http://github.com/jnr"
-SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0.8.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mv jnr-jnr-constants-* ${P} || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
deleted file mode 100644
index 2bd589320ded..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild,v 1.3 2012/05/09 17:09:24 phajdan.jr Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="http://github.com/jnr"
-SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mv jnr-jnr-constants-* ${P} || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild
deleted file mode 100644
index 88ff5356d407..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.3.ebuild,v 1.3 2012/08/09 21:02:49 johu Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.4.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.4.ebuild
deleted file mode 100644
index a17b27d2cb7f..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.4.ebuild,v 1.1 2013/07/11 21:59:26 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=virtual/jre-1.5"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild
deleted file mode 100644
index df97fa9f0d41..000000000000
--- a/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.5.ebuild,v 1.4 2015/03/21 18:37:49 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="A set of platform constants (e.g. errno values)"
-HOMEPAGE="https://github.com/jnr/jnr-constants"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=virtual/jre-1.5"
-
-DEPEND="
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
index 9eb3010cb393..cec89f2dcaa2 100644
--- a/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild,v 1.2 2015/03/21 23:16:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.6.ebuild,v 1.3 2015/06/17 09:20:23 monsieurp Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=virtual/jre-1.6"
@@ -35,9 +35,7 @@ java_prepare() {
 
 JAVA_ANT_ENCODING="UTF-8"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
 EANT_TEST_GENTOO_CLASSPATH="junit-4"
 
 src_test() {
diff --git a/dev-java/jnr-enxio/ChangeLog b/dev-java/jnr-enxio/ChangeLog
index b22e88c3d8e9..a8b35c55d938 100644
--- a/dev-java/jnr-enxio/ChangeLog
+++ b/dev-java/jnr-enxio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jnr-enxio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/ChangeLog,v 1.5 2015/06/06 18:46:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/ChangeLog,v 1.6 2015/06/17 18:38:06 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -files/jnr-enxio-0.4-build.xml, -jnr-enxio-0.4.ebuild, jnr-enxio-0.7.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-enxio/Manifest b/dev-java/jnr-enxio/Manifest
index 96c25fb5df50..18e8a6661b18 100644
--- a/dev-java/jnr-enxio/Manifest
+++ b/dev-java/jnr-enxio/Manifest
@@ -1,30 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX jnr-enxio-0.4-build.xml 17106 SHA256 829c0be95bf450895de453e8ea3e0eefbbe82a310d2cc794456dc155f6aa2c48 SHA512 13862d59655774ee503f4e5531b548292a1eb509060d3e2488ae9e9a5580561e24639523b2f57e33e889190567f3b240bab8a6065f720eb294a17b6f11752b16 WHIRLPOOL 35016ce4b404877e1f1583653b8038fdcd7a66e30a284f2d3f026a15ca9cf8fdc350d3bb06690ab39ffcd71121d285ca1ea44dcc6f59d64bff52a51cede59cbb
 AUX jnr-enxio-0.7-build.xml 17106 SHA256 80963afb03b7738fc888ebf9388492d58ade76530fd07e3b964e51a56717f042 SHA512 e655b5c8900ef050f45fc2a59dbfea520061fad94380d2e43757ed35f676a59f0816d006b4c6c3100cb063c29b44eb6e168edee65027a4a86f9c523ba018ba5e WHIRLPOOL 4a4f974b608197086c5cc93322498ca9cbd37d1f28799e641de6a54073cf7005041909a881ec7310a0174c874d570f691d3b177cda5d67d4ac25673520398807
-DIST jnr-enxio-0.4.tar.gz 10508 SHA256 691ef92ce8567cb9cea77647d8373573c04bd0020af7f5e424ec5038575227c3 SHA512 148bbcaa3f394492c6013dbb54593056a466844b482d57d8b4a57adb61f7ff2e0c6c74105384d3c8464b66e981b5d6a25303577c20c8318e90c2b6cb5888b3e1 WHIRLPOOL 73a652445ed0cf3a9229c70133b0c1b5e1ba4f93368de6aeea7b156854a6bebfa16abfac66b317db8cb30120a8e44ae20018ecac66dc8c8095885ca853899219
 DIST jnr-enxio-0.7.tar.gz 10520 SHA256 6fa9757b7bea93e780f536a124d73dbabecfe0a3badd78cca33021a9ac8244ee SHA512 ed8c13ae4de2334aa9ddd9a13534e0c49fb1bde48e3bd5085a62c96f2b9fe6970b4ba08fe6b27901c5e6db1b360511265ac276ca56f89fddf5e18db9726bd834 WHIRLPOOL e5d0d4f3408578e5f92e2b7dd330f19b484018ed1ab90221164a947e938adbe6e8b679796f5e21a2c031484fb974c2b5bca591b5d3ef6cc0a0c9cd9be65b2b18
-EBUILD jnr-enxio-0.4.ebuild 1063 SHA256 422a0677016b0dd48a7b5f5863c2d95d8e220a569a143d3d1ce8d4ddb02dfad3 SHA512 80acccd15af84e4dc646aae71e036b5c49b2edf344552a66fd24b9d879e7bbfee929ab75654f9a48afaeaaeb494a69685c45294b6b76a28348c07c6f69ea82f6 WHIRLPOOL 2f3f58f3a360076770597c6a7c8892f4f4313e356aa01251ff5cb7e50dc3daf47ed4b414bcac3ce5eb8b40c4b86c5b7efd4ccbde32945954d97ee4f2848735ba
-EBUILD jnr-enxio-0.7.ebuild 1055 SHA256 e649f257e2e6a8b3ef36a25afd6f499bddb0136e0e1201b7d406b797dc946a25 SHA512 1f146ace5d47c6c0b850a44fb39fc075ded984573fe89fb5f2a082775e4bd4c52655c3a1ece679ac157690811e3fc6b3cd972404b812625fec0b0c7a7eab7515 WHIRLPOOL 32e643d5b518715791fe8400f98f607e71e0caed4a970a4ddd7852c48edd30077bf7d2e35d556566fdd790206881eec3189d10fc39c0e8896e7403ec7e3f12fa
-MISC ChangeLog 939 SHA256 d646ea04b22b8de25af9ff4f067f3d9d4bca255288fcf0d6e65747b9e44e5586 SHA512 0e3f5bde53c0deb0123eb412cb227277f171d98152e37eb1eab553d101dbaf398257b471cb45ce27316094380ef9ecbce84fcd31817e6b08433ae7d5cd896b1a WHIRLPOOL 487882851308574ab821bd054b1048b43111967379dc7b919942ec6c3c0627094d90f1f01e3bb72cd51f71437e158b99e37a8eb1cb41856cb44e76d2487c4a30
+EBUILD jnr-enxio-0.7.ebuild 1057 SHA256 231a6fea91cb63f6e2e93760e72c40567afd46853c1375266836c41cdfd88ecc SHA512 b118b577b99b65ddb301f12c8089d01a8f719fe5e425e1b982d865ef619f6f015c3f9db7c7c503d8a3fe4fb664e35bfb11cfedbddf2215958537d8a0a62df6ef WHIRLPOOL 1bbc97026bb36e32677714aaafb08795914f11918253165d725b1530d659d50353fc2c4aaab6e3fa2e4093f1092a35b703737d14f8040686e4162f769d6b3a59
+MISC ChangeLog 1148 SHA256 818424dfd334acb30aa9abf03626d3a88faddba8c895230e2b5a7e77f3e87d2b SHA512 a75a4766147c970d1c08809c556dfaa89eb83e1614a3e33fe8e5df372a1c878b0fcfa7c25b69cfd3bfde8d99da448359290082539c1711c9babc7e6465bf346e WHIRLPOOL 9cbba110336af9f2ec7b8cc3db5f092e9d5f6ea6a7d991c73ecb45c5e6323c1c14caf548d4e5b433c4281e3ed339d47c86eaf1c188e85fa9a6f9bca5f381d5b1
 MISC metadata.xml 241 SHA256 a77d232b3bac11f13d5e8e36d4e3ab992395153b07f113154f2bffcad08f9e83 SHA512 90991e4e4bb3daddcfc5dc7f078cac92df22446c0e8eb5d17cc72f2b9bdaae0f5d553f9738e4c44dbb508310cc8f941d0d00a59c6a700b75b085196a9c5180aa WHIRLPOOL 8ffb42e0fb86165dfd8db7262d5418865a2fe03ca63145811b49473ea521c37c4b1290431d4b9f5b37de48cebc9984df0f92f4e6df06fb4ceade37574a6b900d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc0ABXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizFAQAJDD5KxYYZbis6RS9+/YguzD
-KhpcGdytdxFY2D9OzFthbMB0yOPpk9hkWOBFTFDhAT37Soq4fcCUz30r3L3UJthU
-0Ys/zhQYcimvBVSddeYjaOcDG3K2jF7Z/ylc9Snzu2xU9wfB/P2tv7lP8t/wVIdC
-QjB5XyVWhhyx4fZyjSn9SD1PRH7U3+dGBc+PZk+WcXu6VMRgPJ/pX5Q2Us4FBygv
-OSNzuL9y8OtTIeg8haoNW76YdMJZ39n4kKlNLYQKEO+UZINGdL2B7mqA75lVJhO8
-8+z247MRdrjtSExYqhpAU8cuervmmEo7PqruMzO5TRbTE9RRZXBnB1IYWXiYUwRk
-z0B4BPxdfktxqe8JFOMdu9DQT/8qwMjoyCj/ZbBZa5nhkbgUdRldmD7nPZfsqJJe
-B+7bvg3eeSCdM9IUcjWSnCt0MPXTiAnlyzywBMa1wzcLaeNvl1xnw7Ur9yeeIFOw
-co/C5rIYO9NChfAIQLJ5/Amoz+U/VnuvCpMzk1swPAif15VrqdgbZC/qDcegn0XI
-6uzGlDs3AeU52hwioEiCR7+sa/EXk1G7KRk868/ue5mMNGK09UAwq/jhwMw9IDGl
-JyS7URWouN7ZOyzyLKpHgcCJDOkzLqRWYGp8qgFx1wScMYLKw59IaAL3Mi0WhDHr
-zDSpip7Y9fTjyzupSbTA
-=2yxu
+iQEcBAEBCAAGBQJVgc0MAAoJEJGRpfGTSRu4n3IH/2yt1Vd1txPCuGjDgsksVVRH
+WsJkJwzLKPWuh5IatpOf7vi4+plyyoYn26okOPb/iJJM1FY+/P9J69mbTNy0NQKx
+/Oipi+HxR6X4k0lx+4pWuZcDigYQnXXaLXTDf5rIEP/M+XXYsIprU701laffcbei
+0NLc3CmQ81D2rBwNj6RyVaZa1IB6fkzaXAIYzEtQ20OREq26cH6kA915Sv1BbCgS
+/sfOyvGEnP4RMsLqcxOQlUaaovFjP1cLVg8PbUewt1qX9zrhb9GCfIrbe4ZrhrCc
+jvHra9vJbhBOAc/DgR3Rr5FS7rS3eItpwS9aaKhWShvsz8EzyoP8LsgY37xdUyc=
+=s9Td
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-enxio/files/jnr-enxio-0.4-build.xml b/dev-java/jnr-enxio/files/jnr-enxio-0.4-build.xml
deleted file mode 100644
index b5bc55cee15d..000000000000
--- a/dev-java/jnr-enxio/files/jnr-enxio-0.4-build.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 6/6/13 12:27 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jnr-enxio-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jnr-enxio-0.4"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/>
-    <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar"/>
-    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.1" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.11"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar" 
-         dest="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.4/jnr-constants-0.8.4.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-ffi/1.0.3/jnr-ffi-1.0.3.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jffi/1.2.7"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jffi/1.2.7/jffi-1.2.7-native.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-commons/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-commons/4.0/asm-commons-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-analysis/4.0/asm-analysis-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-tree/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-tree/4.0/asm-tree-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm-util/4.0"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         dest="${maven.repo.local}/org/ow2/asm/asm-util/4.0/asm-util-4.0.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <mkdir dir="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2"/>
-    <get src="https://oss.sonatype.org/content/repositories/snapshots/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         dest="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.2/jnr-x86asm-1.0.2.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
deleted file mode 100644
index 7c1a40b7672e..000000000000
--- a/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/jnr-enxio-0.4.ebuild,v 1.3 2015/04/02 18:13:52 mr_bones_ Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Native Runtime Enhanced X-platform I/O"
-SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-enxio"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/enxio/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild b/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
index 458ba3f516e0..7d467faa8a02 100644
--- a/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
+++ b/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild,v 1.2 2015/04/03 09:27:41 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-enxio/jnr-enxio-0.7.ebuild,v 1.3 2015/06/17 18:38:06 monsieurp Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/jnr/jnr-enxio"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 
 CDEPEND="dev-java/jnr-constants:0
diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog
index 3a13c6ccd02f..3763a6cb46e2 100644
--- a/dev-java/jnr-ffi/ChangeLog
+++ b/dev-java/jnr-ffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jnr-ffi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.19 2015/06/06 18:46:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.20 2015/06/17 16:55:02 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -jnr-ffi-0.7.11.ebuild,
+  -jnr-ffi-0.7.7.ebuild, -jnr-ffi-0.7.9.ebuild, -jnr-ffi-1.0.6.ebuild,
+  jnr-ffi-0.7.11-r1.ebuild, jnr-ffi-1.0.10.ebuild, jnr-ffi-2.0.2.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 835a62f50bd0..d9b4b84421ea 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jnr-ffi-0.7.11-flags.patch 727 SHA256 aa37ae8a3d6674a141f3e2e448bf5a2ac9c6a64d41185b42fd7f50ca63922b4b SHA512 2ad0a5682d86a3c93eb5b099c919c866b40348addb8efa779cc94fe575f37e1e8638438faf34cad9641c74c0338c8bd3983c0fa940bdff4787e4b60226619d80 WHIRLPOOL 7489d8fd7f92abddd1a44943bf1eeeab8c794f747e2565ab3625cae2b37625521b62ba4801cc640e16e0ded959913fda70cf2ee502b0ac987d7da156d35ea072
 AUX jnr-ffi-1.0.6-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092
@@ -8,38 +8,23 @@ AUX jnr-ffi_maven-build.xml 11211 SHA256 8a69395ee802785c1b55f4527cf594ca18c59e2
 DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f
 DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a SHA512 ea5997de1201c4d326ecd4753ed2ac11ba288d029508891a38e8a8ee8929b3622865057f9276373585414f88b48389ef607fd00474998ca4ce372a2cfc1e9170 WHIRLPOOL b205ecbce04e65981dc890fc0494dac01f5d47090535a336efc980f8877b64ceaf930fd157dd0a5de97987da61a0bbdb4b9cdfce9547d000f4f7c299d7167d60
 DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
-DIST jnr-ffi-0.7.7.tar.gz 130740 SHA256 d0f93346af0edd922e330975524f01f3dc5a2beb329fc5a62e32fd5153992807 SHA512 41a315fa6e03837e675a06d1f537a080430005c3a6ba63d03b3471998171a82b8205ba3d784a4d6b6ed4f94aeeac51121057580d51b14362216fac820eff2fa5 WHIRLPOOL 0ac7f995b396e95fdd80c470d2df328af7f97209feb09367ada66f49640a4fc413e111eb8e6748e9bd7341bc974e8b8dad2235be2de9b78621699b675d845225
-DIST jnr-ffi-0.7.9.tar.gz 131265 SHA256 8b9cefd983afc45cdf9dbe6a0f8915d636f26708c3e87de3e88156f0d87cef7d SHA512 fe6d2735fb538b11d9cc72e02f9cf37151db1750caad3ad8a758055d4693ca1e928d101e4f87b1037b99b982eaac7b878e56cc81c441f36e088ca24ca28de8ac WHIRLPOOL 0beca5fd67ff08c92e3a22e625e1ebc088dfdaa2250da0f6de808fec2dbc2fddfd98fa3bda73d7a9c436f7e905ce57901a6e8dcadfeee93b13fe071aa23ff501
 DIST jnr-ffi-1.0.10.tar.gz 169196 SHA256 8d37e264705551a0f6b0283046dcc1264b311925874d7f674a6abc1f1f85775b SHA512 a46899e6a71c6fc5ad8586eae8dd718998de1ab30fe7c4b396a6291a54a63057c229c86c195c59e790bff13daa628adcb0caaacb05b1d58683e493fd6aa7fc3b WHIRLPOOL 467b1730a6e6ad494a00063c85bd90c34019df8730ce3a74b60d635f6f574ca0542fa3e2769beb1cecbe0feba2356662f0a2f35021ae425be52cdf1e63d73a1c
-DIST jnr-ffi-1.0.6.tar.gz 168393 SHA256 b049161d4e327085d3c9074dd97c41000fb812b8c5ea6c70a75474db469b81a1 SHA512 7673f9d5a513713bff5992a69db848315f7961a3417c4a247bb26226535d25172b6de26bc4ecc58ae8889da2ba62de40a6e434fb3a4b21a820962e2bce2ba2fa WHIRLPOOL b39831407e3210ce5736842bce4a5ade2d1727abfcfd159ae2d376e78c8fe4f88b3757e7a97e06c56aa47845fded054506f27141ab057a9266d3b06dba0c08c1
 DIST jnr-ffi-2.0.2.tar.gz 170707 SHA256 a79772f3c46cd5afaf272752bc9a8292c8fd53c8302f8dc825a3cf2444ee2ab8 SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 WHIRLPOOL cdd7b4b27dd2018747d0a669f7237f30def64bbde18486e81ac99c538a8d0c4679237c2402f955cbada773558a54492cfdc9f0a127d3de4007472339215891e8
 EBUILD jnr-ffi-0.5.10.ebuild 1746 SHA256 ea839d72e3dafcf20f290002e7e2c76f26c4e710278fbbaa9b562e3402a4974a SHA512 7d8cb9c1179a5291ad07f99fa6d490f3f7177db18898a30cbba9497e499d35ebc3878d9da922d2fdfc2cf54202eb7c4d14bb82710bae5e766b97ca6b58bbd33e WHIRLPOOL daf9e228af119b18ce3226aa122883684f16ffdbbbe7efda1ab100ff1213e7e33e46ca14751ad65292b4b0d619a682b8227dab978ad69d0697a4ee3438523403
 EBUILD jnr-ffi-0.6.0.ebuild 1574 SHA256 b1749c5d98efcfe5dfa41009c04eba7a9be189a4967f91642086a68ddc257104 SHA512 385095e9f0373b531fdd8a903ff4ac6ce507b47decc9e3cc53db85fe6a6cd6dada19fafe397944074e8abe87c9dc9520c894b1b3a0a3e7e0fcfacc50bb3c5d0d WHIRLPOOL fb842c514b1395229b7ed2e2723d609db6e64f7cbf73b1576506a6fe9e365522cd7c7e987a2c7a033a52b7b383355511f9284e09f6a45e16dda665d1980d8965
-EBUILD jnr-ffi-0.7.11-r1.ebuild 1824 SHA256 f82d37e1833c772d208776529ca52a83733f77a85b7333b2add0f4ff0aa89926 SHA512 a33f8fafa5bd548297f43721e4b10e18a676aef67eba3569f5b7bb3340832dd83062c5e3e9f6570d8cbcac149952596828c0837afb362b4253244207a9b82825 WHIRLPOOL eda071cec0e94631853a3d6360fd0901fa3f3fa497010db5c44fa14accc6173d691f22f72286078e94656078c75115ed3e812c429a9e67cf63cac1af08358aeb
-EBUILD jnr-ffi-0.7.11.ebuild 1578 SHA256 7919eb990e6cfc7a7fb158618c9bf0fc80bb5a2051cc4fd2f0f8de688e313e49 SHA512 03d3002dbe5271a0629c756a0f8ead24ccf38a38b0343f5226272ede53e1a84e5ce2d91618580b403a8fac06f69d48d29f21e722b59829379c4ad6d5d965696c WHIRLPOOL b0530fb7a62a9b678d7fc48f22ea82c35ca234fbecf64e7346f893342ab81be983719d9c1605d26cd5768524110573c27ec1ca47f4c8056c58b3116069c60b08
-EBUILD jnr-ffi-0.7.7.ebuild 1580 SHA256 0fcc5c2ec8d688bb2f4748950e3a1bd4bb037d3bd5b903a5b1d054b36bab53e3 SHA512 5e97cc87d9dca8428bb94191aa6bbd7bb29570d2d98afbaa2f3318fe41e3493a1cc78bb4ace62a37f50c142ddedb966c8b82c0880b5af39ab4b2d91253a8d7b5 WHIRLPOOL bb83600aed3954ccb27e116f25597858946a7ed1f5e95e83f4d035ae6032fe34030f61889c45302558d6be3c3a7d7f5b7a528e8f25c41ea388aa39cfe2e32a10
-EBUILD jnr-ffi-0.7.9.ebuild 1580 SHA256 bf5cdfed3383fa9c008e0317be9a8f3278b314fa16e9d9ae786e9ecad29e42ed SHA512 f671f992842419dc8349ffb9a98ab443cd4cf93a87e5d69175a00be7d42faa7f6e79373d8f13ccd2ed52e4e1760b6de1dfd1fef03a9c9fa8a255c278a74db95a WHIRLPOOL 9406931780b528f935779df2823b357ea1e274f3e2cd9aea1c3ddc8352c304d7389f843fb76c2316dbea5dfcca09ac3a32cb08bb002df768423f0386bf6ce7c0
-EBUILD jnr-ffi-1.0.10.ebuild 1502 SHA256 e86c8af0127cba7cb0606a2228e60174c8e0ff45ea15c271dc56002d573a8966 SHA512 b1aa6003dc94464185e194db7e1e1b25b52eb5402ee4b131cf62b493cb762c0ffee6d16bc818c4de1a9d5afcaf5bd3380f954ef2a5504425757d16e74d72db4c WHIRLPOOL af9b8fb43ad70774088bcbf32e469983cb72119e3b90350bfe2f62a412778955e1d6399f101b86b67ff7888a58761f6ab7fc3e5a30395315bc418001811d4eac
-EBUILD jnr-ffi-1.0.6.ebuild 1620 SHA256 1a5889cbfb1f8880bb90ad54a92f268d14c8328cb41381b1b9f75aa872024b49 SHA512 fe88c695710ddad271c13c5c14c39cd3f5983daa6612ed935eb745f4e4f8d3cbe632179343743408080d501ef2d69ae374bbfede29c8ece2bcf3e7af502a0ed2 WHIRLPOOL 3a4d05b909bcf8d51b47d724ef8b92176e05acf9461c491d3fda2f11a7956ce1c3f3487635dadbe552f23b301ba6ed5cdac4615d46c3af4c896eab2cbee7b05c
-EBUILD jnr-ffi-2.0.2.ebuild 1494 SHA256 524f6cfc88398340fa1d241d0c0e6e70eb6cd5ab9c8a24d03ffcd0299598db4b SHA512 85f1b5cd6a2ad6aa73205c6340b36ce420021ce30cb153041f02917bcd9b8a530cc8add22bcb8cb59c39c1ec2f21a3dc445fb579f662cb081631737e3daa5f61 WHIRLPOOL 85a94a105165db141504226a23f4dafe4a422b49c01a58cd3676d7a4e5417a504a7780c6958d8de5137c94d1da6fbc06787dbfbf4605bf70ac3fcee1d1649ab8
-MISC ChangeLog 3497 SHA256 0f43fadce35fe5fff1f1bd408ebc7e97167ad2baf1f86d1685622403924adb3e SHA512 14a614ac2ff793eeb80a7387d315e4db710c08015428ee70f4531ba5a3375ddc13826ec4837b2e959d52ca3a16dff2413e528ed70bb895192cbfa56c91b60a7b WHIRLPOOL a1e0b9a48b0c112edfbc60434203deabd83a2e863faad0b39ccb9a6a9919997ca15b51c7291ec0fcc731fa0b11a0e4f8e4661d03c699115f1a4c9f88fa49d715
+EBUILD jnr-ffi-0.7.11-r1.ebuild 1826 SHA256 39836a4561ada78c0f157c4fc484c3838183f6d115a0a1a581d6ea089e60cd77 SHA512 cec3f49c5bd09d163294f64edf3da5acc450ee12590f9f91e29a26103dce00a1cd7a08b1fdb1eb8e3b07d376d06d1c70b02a8e3b097e6ff01c928a562c74324a WHIRLPOOL cc9adb37b04eb1a41e5fd544e9a677a785bf0fa3cfa28bdbdeadbcb3dfda3694c96e918ad5f034f1212b4c23e8a75b026938c341d94c6dc04da25c974c98256c
+EBUILD jnr-ffi-1.0.10.ebuild 1504 SHA256 c80bd123d64c76a510e9ff63f4c8e36f69e04b44d4226d46e5b39b8752338186 SHA512 b11901467685a2ebe76ce1561c08ffa10fce50b842e1fece4ed0f433e3737ca96a85ea86fbb0eac231639282121af2a6d58e71ad53b7b262061ee54f86d733c9 WHIRLPOOL 1eeef0f228a1d216524f5ad63671f8db8c33cd9de136096404d5580b89ccb742a4987265f66e1628d75b8448f85be2d47415b90b424a16f2d649e364db903384
+EBUILD jnr-ffi-2.0.2.ebuild 1496 SHA256 8558c0c79456901ee980589ff7a33d50706eb11c79a9a8b803251ee373d936b9 SHA512 0942c622ef5b12617406f8889632cafd94314dc22eec1ec50b9fc01d36dbf62d9e97c4df6e0b1561930ab3afb335fddd6e1747d63d6a20b5374f5b886ce64809 WHIRLPOOL cc7e0cb860e00eec5c710b04b6814aab89a6edd43305280bfafe328cc759658a49449558420886be0dce61a84838b7d6c1de5c6447b5be6b1d93c017c545fad9
+MISC ChangeLog 3795 SHA256 a6c4051e7108693d97be7beb8193badab687afb2c44564c6c6db22b366e8766a SHA512 4ce8df490bddb5813cec6080c33f233087b94037ff94821c35ec9d8d602745c52a83487b253012590a5707921f1b5587296f92faa771408ea4d5e6e2199139cc WHIRLPOOL 31c4d149d86a2773f6c4e514315eaf35a5ba6f5be6b35a17364e920f12a8ac652a1b7f6a1faa62ec5b3ef25a6ae5adf9b96eb77ac8d4cc19c1ab57eba0a05de5
 MISC metadata.xml 288 SHA256 7555eabdaff3bf56326d8edc013a415ca0148c18127a54a4cf5a23513bdcd5f5 SHA512 0fd78c55a333bc0b1924a929c0fbcb8ac7c765f8d0395f7964658c59d1ed9d82eb7aaf0d406b3c20f675bf1c4e365d571731743b9c3a9009396f2648e3b6de6b WHIRLPOOL 024b16abe48e8803c8c6b3a56b6c09db053c0077efcafdaaa2bb56e23fea672618839911f7ef879379ff08ab5ef44bab9f54e1a8d24198df97a2fe63653cd917
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc0AfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminJgP/0OCkQZpI+6wyyrFJQKu665s
-vk2mtVMCLCcKh5gF/GFNFsBYmqCUAy2++Imjmk+b/WTfStpClYWDKVD3EPTC0IMV
-wnUwPeo+zdsKc3z0tlk3J2oSglPukvC+Hjp113nKCYQXHSAnW4LxIR+gzOZ+MJHj
-UfojHBvcjLVtsEaW/3zVw9fjqPfJDmOwcqCxLwxKCj6ZSHjPO7EA1fjwolotRxec
-dft6pfpcxn8HnsAC0Zs6DbiVqt9DFh/QotC/P4hMzafech5egOyNTyE7x110r7if
-HZNJ8/aoUocoKOwraV/fPSl/iI4wQA0lEjh5Y+RLUqha/TKMF/1ma7sT/s+8IDpZ
-wowLTWxTjJOjL/rQRSNnjanYJqZ+CzBuxuMo4LqCnXdJDY2FSTzfNArleWx6kw95
-Eoe1MzXvLK8JoMoEvDFWsXyJtTvUahSvdDCj6U/33KyyjRYtE/hcIQ9YBu9/5ZZJ
-r0Z2zlcuPvJQCRDPp5oWSmDGRKoaiWqb1rHql3KxCwGH7F3m9CEOuKmhGQSOoZWr
-/GprshTVZIfCwUqgzXreOnmi//K4eUtLx5EAEmK4ypmc/jX3H12IdjCezzcNU33N
-iIOgwfKib63hTnco1dMEEXT7a2s9zutxeV3HSe2iDhgHVQw6BMrpOEDzefycuJYG
-D+qoVZYgHs5KcwPn1/ip
-=BdNb
+iQEcBAEBCAAGBQJVgbTlAAoJEJGRpfGTSRu4/xkIAKqpJAp67nsHRP2XSts7lzfr
+21ZpjVxYSVyf0FWMKafQpeCzBMWH1ZzbCNzxucHZneDVdOzQHM5XiV92uAfuYka0
+LVG4YslqiVCo1Dcuui4Nc353+UHi4itjKj9wlo9UuZedJbpQ2SSccm8oWO96oFQE
+0hY1cqw/ZQvAwtbSkgnOqgXytYLCk4Mut064cCuBqSgDlnGVMAkUg7Yb79Df/Tem
+cX37s9Dty8Iz783DI2WI6dOIODobU9Y39zYkmE1z1yyj43B4hxWvO6+zvxv9E/Ra
+yPq1p5n+AFIgur8EM017NU1SlidMpEsE2mZ0iRVsVCNIH2rFQaKNFaDASDqlkj0=
+=ZRDv
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
index 32c85f0612e8..d1f83a8f9037 100644
--- a/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild,v 1.1 2014/11/13 15:11:53 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild,v 1.2 2015/06/17 16:55:02 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	>=dev-java/jffi-1.2.7-r1:1.2
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.11.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.11.ebuild
deleted file mode 100644
index b72c83316691..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-0.7.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.11.ebuild,v 1.1 2013/09/17 14:28:50 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="An abstracted interface to invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/jffi:1.2
-	dev-java/jnr-x86asm:1.0
-	dev-java/asm:4"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild
deleted file mode 100644
index 5f0c1588c1d7..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild,v 1.1 2012/09/25 11:04:16 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="An abstracted interface to invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jffi:1.2
-	dev-java/jnr-x86asm:1.0
-	dev-java/asm:4"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-0.7.9.ebuild b/dev-java/jnr-ffi/jnr-ffi-0.7.9.ebuild
deleted file mode 100644
index b2c4c211bfb2..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-0.7.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.7.9.ebuild,v 1.1 2013/02/07 13:57:02 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="An abstracted interface to invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jffi:1.2
-	dev-java/jnr-x86asm:1.0
-	dev-java/asm:4"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
index 61d3a8131b07..f26311989ea5 100644
--- a/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.4 2015/04/02 22:13:15 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild,v 1.5 2015/06/17 16:55:02 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/jffi:1.2
diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild
deleted file mode 100644
index d0a55e8477e5..000000000000
--- a/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild,v 1.2 2015/03/21 19:04:42 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="An abstracted interface to invoking native functions from java"
-HOMEPAGE="https://github.com/jnr/jnr-ffi"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/jffi:1.2
-	dev-java/jnr-x86asm:1.0
-	dev-java/asm:4"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		>=dev-java/junit-4.8:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
-	epatch "${FILESDIR}"/${P}-junit48.patch
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
-
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
index 9339005fe72f..4db4fe3f16fa 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.4 2015/04/02 22:37:02 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild,v 1.5 2015/06/17 16:55:02 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/jffi:1.2
diff --git a/dev-java/jnr-netdb/ChangeLog b/dev-java/jnr-netdb/ChangeLog
index 9cb09ab5140b..5308e4d89dc4 100644
--- a/dev-java/jnr-netdb/ChangeLog
+++ b/dev-java/jnr-netdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jnr-netdb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/ChangeLog,v 1.17 2015/06/06 18:47:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/ChangeLog,v 1.18 2015/06/17 17:05:04 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -jnr-netdb-1.0.6.ebuild,
+  -jnr-netdb-1.1.1.ebuild, -jnr-netdb-1.1.2-r1.ebuild, -jnr-netdb-1.1.2.ebuild,
+  jnr-netdb-1.1.4.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index 19fff670642d..5c2068705c3c 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,36 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jnr-netdb_maven-build.xml 9637 SHA256 fab6833838210cdd393863f9fe2d69b3bb26e9ef0d7f37a00074493a27350c94 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24 WHIRLPOOL 999d99a9d1fceb4dc90fe88882cf7b097fa16784dea5b5a2385d6e8f2d09fc59677fd9997ea7e26c31dd0bb63a02ca0517bf7c0b134400fff5647cb8ac22c064
 DIST jnr-netdb-1.0.1.tar.gz 670834 SHA256 654360f56c4a0131df293b6dcaa96618dfa9ded549180284dbaa20e6305d8906 SHA512 d62718de9e9b0a0bb1463f6bf9dc22ca00d5d107f22fea77af0b5cf77ffb6d681d0ea345cad0301e0f9053f797fd0a502325c71b3bf8aea989232f73e3f18cbc WHIRLPOOL f4e0493a0df380fd372e407d2e5014c40dda88e832ab6324fc579d6a2469cad9a3aed98f268c43aaa35b966324de7b746287fb075a16ddd58068b5fa00f04523
-DIST jnr-netdb-1.0.6.tar.gz 648348 SHA256 097d621cc5ac8550e1b1bcafc034bfadd9a7a307f7133b7b7fe5ffdf38782c4f SHA512 61ddb9c7eaae955eb732ba3cec5222c231b17ca76f8b729cafcea8fc7c0fadfc80bb4c061dc4afb918e983719fc4451447f7fe290282fd9b90ab0f66d71f60e4 WHIRLPOOL 09c6e6bb668beb96083cc8588901e678ef903545675efda7ebba0e82dd36827cb68822954b21e2a30ecb06219644a36a19fa63237b00d36e43151230336a4e88
-DIST jnr-netdb-1.1.1.tar.gz 648340 SHA256 077cc3612d4033c795f315d3fe1672ed47960d5b68a6e8bce0b107e3103992d0 SHA512 8fe5e7538aef142713f1b0956040b5e5069f263de5aad4ac71737aacf96f95a779f3ed11c7cc725d2ae55a4a6016c1fc8ef9c7a6b3548e6975d0fd0801060ec3 WHIRLPOOL 0d587154cd0c1232969c003dc4f00a752bec84eefbde87f2036a62f8c9a421b334cefa7fb981ec8003b279ad0657e313451bf4fa1775be1a2513f85c14be2e24
-DIST jnr-netdb-1.1.2.tar.gz 648381 SHA256 d526eb8c94590babe3ea6f16b7b64bb1accbd442052916f687a1400f0b0f3b87 SHA512 a9a7782cdee1f3cfdd6eb4ea9cbd2e275bf59191dfbc48362f5787ba57535d9917eab651f4ef04ea7861b5ee1def4c58c8f5660428d50eaf3e349e0ec0f8bfb8 WHIRLPOOL b5f29def501ba87cd0aa49e641f33d84727f71cab587001764b3cdf274ad49270eae4682f9a3429c3d47f313579fa574302f9d5de8e73c37a8be0da5466a34fa
 DIST jnr-netdb-1.1.4.tar.gz 648347 SHA256 d67327943c8ca59432bda152bd4a8611ff1eab099f2d4bf08a743dfd5f963c69 SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195 WHIRLPOOL 0319025334a12e59df01da1f13e74401373ec7e7e2ea30db549e9e19e226d74cdc74b62e9c5c78d74374d05f98adcc3d18bdfc40a8e760a4c5f2b5fa3c7d4a76
 EBUILD jnr-netdb-1.0.1.ebuild 1758 SHA256 b11e20c57422cf25533d10505140191d538c723f8ea89cfa7866b51ed6ee6cdc SHA512 abb967d64334b860f59462aa16f97ab1e5fa1eff1b96fe3e5470bbde74395625cca83b0d70cf74db3668fc9386b3d9848d1bd913688a15e4bafb684423cf50cc WHIRLPOOL c206c9c7c48d54a6111de383824a6e3e2247026992566ca6aa07b607de47ea19981f8a5cd14a204d0a320a3f74397baa4815a19461a1e18e3f3e94dda2cda380
-EBUILD jnr-netdb-1.0.6.ebuild 1258 SHA256 a2d29adefe990cb4973e8579452e7adc4c975d91387203e780699963da322bfe SHA512 c45a07bfcc02e81be75d533d6aeeb53e3e1870f00e7997e22ef906303d6c8df3ec95fa45304f7837357c76f8ce90ef1c564e764011d390bf9b5f2b204b52f891 WHIRLPOOL 0a005a8b42d95c28140e885e6e485e1d32bc519e98addce49db193a9c96b10082281a6bf71aec6d1e27e19ada4900549de6206a0da64f85faed3857077da1fdf
-EBUILD jnr-netdb-1.1.1.ebuild 1258 SHA256 46bfc0daba9f36ccb72510a9debceb9e7cca8a597c6c274ad4ec256a351cb1db SHA512 e8bfcf41e7d1cb61a46b15964ae10c3f600497b5fe5c2385fd5c2868f3073ef739e424268c3ab2ba89cc29d89b8e892165ccf34a2a3ad96e5622bccce4e5774d WHIRLPOOL 2a2a500c167f2b9e9df19099d1491782d7788ef420a7b1c73f6dbe6a35954a0c8c42e8576486014200249d30077f5329e3f1d2dfd15b4d3eb127e66bd75056d2
-EBUILD jnr-netdb-1.1.2-r1.ebuild 1256 SHA256 6e9e732a029adc78d4d2d59d5b4d6120b8dc9fd768c97dd8a4b91d38cdf6be2c SHA512 48ea24455a30a2e29b22250a40e4a769676f848d00454fb94ff5015bbfe763d880b38b5deac4c4bc9163486a53ca81af70d2e712580ad9f7b5baf6241ecc5946 WHIRLPOOL af1c9020d771c8500743cb2a992e6c9f3d8ce60622c749dff9aa80cdd23190d6537ff9e4165774ecd02e7b0d9d6ebcf955d9bef56f20e28ba5e7fc794cb5bf3d
-EBUILD jnr-netdb-1.1.2.ebuild 1254 SHA256 5b64645834dbfbbf0358e1fe6ca0363ba7e1a43e9a4c80b350920249f1449e5e SHA512 fe696425ab13798be9006207ef2073de591b5a7378a4086437ef31a659a1caaf519cbdb6efece7a990021939234613f14e3dad3e5d3b88a05870d9ae6fbbfdaa WHIRLPOOL 610585091da32c2a2116a9e511472fc35780305abae6e2774b0eac9dd38e99f193393bf8afcdd3ad30bc235969d2c5bbdfe76daaed4d2af1d08230ee2915c505
-EBUILD jnr-netdb-1.1.4.ebuild 1243 SHA256 c51ab6883436367484b2361ce0c07d847e9a71095cdac21fc82a9cef550e7613 SHA512 f5d5fe7142a06ec55f5287b05d45da260024ca41f525dc76616e0234c5d6a1cf27c8f1335c0f88cfd1df4acd52cdf5e9a3808ef0d3d3bf79fbf2f68a6405361a WHIRLPOOL 3666607eed4a6843a5ff1588016e99c42825e38e71d255ca6d15efd52bd930b25d5448aaa126c0d0b0b304b9be3aafed9a5dbc34ad322099145413df8cf02890
-MISC ChangeLog 2719 SHA256 bd48dbc76e950f988228836e545a53456b502cd85004c3a0ac1a1f467f093253 SHA512 9a1e807c523b94a653b0f91ef08f978ed71d1f35afd2c0aa1cd30a00674bbbeddae5c0fd477386835b2ca9a70147bcfd92032f02520238d26f7fe0a0b7c743e1 WHIRLPOOL fac94ae7f652a5171e26998a789f4f5c953bd3ce0a862b7daceb12020632dbe3e2b5a309cd5038df66377d82d42e1e75c700dd5684fb0ad726fe40d06d19099d
+EBUILD jnr-netdb-1.1.4.ebuild 1245 SHA256 5f54a35bb48e7a05289e448959f85466395eeb970ccc08399c09c4b593d1e102 SHA512 b29a4e9dcf172524a7ee4f346206a4728fd5193d37769b8ab3c7391f9882dbaa545ded3bfa44456aa461d2b91d1627cdd41cc80976c29a862c67bfc11609d700 WHIRLPOOL 9bfb2046db4fc705f2d441ca3f0f2bcb3a9d2a7676f4f50b9c39beacd897ccd2dc6ca7f6c970f1c4c69bd24b2f5664703aeb73544d3b74dcb58b228f87c12197
+MISC ChangeLog 2980 SHA256 725137ffc1b4ae2e79386d0d01b1ec0d7f501c0b568dd7595834ec3b790b6ffe SHA512 d195afac4438d8ca1bbabf7b28749b65760fbfdd0c78bcfd3f8c01c29b6a199b8f3f8478b60c10d31f724969d0f83c4c8225f597bd702eedcfb393c4a125deb4 WHIRLPOOL 2950d5e442ebb528acbf71fd4f05407e94e2ce8076fbbb6e23d99d21e55c575a6adebec99a897285fe48e22b2805e7b5288e10ed13bf44c7faf7a81386c161b0
 MISC metadata.xml 583 SHA256 2d344126f9529ab75495579319ced30fd5a85eb67f0c4d1ae00ae48e504d3796 SHA512 2bbdb89519d35e3fcb0d0e69b04f219e30f5db56ef0a7e6003fcf45ea9a08b90d3a9f4e775e2df202779a5540caa4b9d7ba75e0341eba3a92866c06cad1f2970 WHIRLPOOL 75cbbf049915b9bba2b1834b279f1d336655d25137ad49fe956179db5f0e5aae3b4a18b00af6d26ff9d0439f8c69096a18bc6a70fb64da1932824de46c94fbc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ7BAEBCgBmBQJVc0BGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikXoP+K9kUiU1ZKSl7/DEMA4w7yGH
-sNbP3OzE1bfEdp0jXYjxYseJeH4FEvIt2lwuAwfI/3CdHRr4smMOz9tWdf5E2/UG
-WUVP2+HQEGGkYG8q0UJY71E/vGK8HCSd7jWZUMopaPspPJWL+hdYrd60sYtiJa7O
-VZBurPKeuV8drvWAXxhePlyAcbeYsUwNKPSjcPN3V8hu0tA1zEZylQglIgwLkfAl
-d709UJnE6Pvlm/ELEsyA38/zBe50TjLnKHwcZGGx7uzi06SD1fCiCHzqRzBVTy4O
-atRVRZs4ih81zQVYjSJc9m8YjYw6jSJIb9nYmSgtN44h2eZaxlXhXjF2raklcVKs
-u4dQ4sQrzP2iARB+c1GnSg6lAXt7T9SRzYuLJJkeUmcg0Q9qN89SIJSJ64/BZafO
-/dqf0VstXxIIJi0eEJdaV5pV2/64OPRTD//FvLlC+tzl7ZGeRdWLLEgHFjgJas7s
-gUxSW1vwhl39GdDulJRWgPt0ZEPoevB1mFN/9/A7xCCdJaRevTQk30WhtQO0MtOb
-jOTNiOjsapEhFvTUpspmHOhdEC5kWNKxqoZ+FdYJXNGb3Flylt26blOmSI3BX6z6
-HJF37tpAJlA7XH0L8C89R3qF7295whynAom+he20XS8cw3LbllnVyBsYqSF86WJm
-o9sm5O1pelbH5YJIExI=
-=oBNy
+iQEcBAEBCAAGBQJVgbc/AAoJEJGRpfGTSRu4yywH/1eTR8Y+DUM1US06TMp8oUPS
+Dya2Emmi/xPoSNRYTl/s7+jipQLoAdDsh/wYKulzmZB16ilt6cDoEZRfQYiO0E48
+r0mhRHZs+WTI8+d7Hzjbk4TGA5WORY8w+1z/z9/mOFwJ54erAd5Gk5MLeXM3Yz7V
+a88dMrTqezPgbUPHNy4tGA8goMs/2qvm0san1/Ep54WyicV0l3swm4t0wYe5IFrz
+R8Yri9X6bAkVrMG03ghIppYxrQT1ow3JlK/XheISkXx+NCEyfQA3afVBPmpxXX0K
+FWTk5TDuJ9HeTolFHVmQe6ez9fk7hcvYcV2SuxOjGkbZFaFxdXkw4LhpH9PDbO4=
+=T/8z
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.0.6.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.0.6.ebuild
deleted file mode 100644
index bdc5f0c4986b..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.0.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.0.6.ebuild,v 1.2 2014/08/10 20:18:54 slyfox Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jnr-ffi:0.7"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-0.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild
deleted file mode 100644
index f04e0b226135..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild,v 1.2 2014/08/10 20:18:54 slyfox Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jnr-ffi:0.7"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-0.7"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.2-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.2-r1.ebuild
deleted file mode 100644
index c12a4bb05583..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.2-r1.ebuild,v 1.3 2015/03/21 21:38:09 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/jnr-ffi:1"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-1"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.2.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.2.ebuild
deleted file mode 100644
index 0a8193f165b8..000000000000
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.2.ebuild,v 1.2 2014/08/10 20:18:54 slyfox Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/jnr/jnr-netdb"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-	dev-java/jnr-ffi:0.7"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-ffi-0.7"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
index 4d53de80121d..f14e2b4c64df 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild,v 1.2 2015/04/02 22:55:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild,v 1.3 2015/06/17 17:05:04 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEP="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/ChangeLog b/dev-java/jnr-posix/ChangeLog
index 629da8b6adde..a2e01315b9ca 100644
--- a/dev-java/jnr-posix/ChangeLog
+++ b/dev-java/jnr-posix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jnr-posix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/ChangeLog,v 1.16 2015/06/06 18:48:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/ChangeLog,v 1.17 2015/06/17 17:13:00 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -jnr-posix-1.1.4.ebuild,
+  -jnr-posix-2.0.0.ebuild, -jnr-posix-2.3.0.ebuild, -jnr-posix-2.5.0.ebuild,
+  -jnr-posix-2.5.2.ebuild, -jnr-posix-3.0.0.ebuild, -jnr-posix-3.0.1.ebuild,
+  -jnr-posix-3.0.10.ebuild, jnr-posix-2.4.0.ebuild, jnr-posix-3.0.1-r1.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 4873cef64ee5..0c91c5c7b4df 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,46 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jnr-posix_maven-build.xml 11760 SHA256 1d9dc44187241278fad78b9030d8bfac9ade7ea4e1f92ab2c1fa60616d13c71b SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e WHIRLPOOL 977c8324901c0febb7a14732ce7cbb3f12e73cde1ce8a4d73d5b8fc07c6f5e80135b1262c5c892bda4b9d1e5a509a0ade6511b0c92403de67e9671eb1c246fc1
-DIST jnr-posix-1.1.4.tar.gz 195235 SHA256 efac5b9239a2d89036d26e647b55a3dac52eb0383d133ca44914de8c35d9006f SHA512 d6f757210ba6db28b6648cb2bb0203a11b2b018150df5321252099161788ac5cd0e021f2e98cf392c83f3788ea4fefaa5cc82c53cdf8a1e39bba14d74cddae29 WHIRLPOOL 5081162d83801de790cd77f9bed16061bc7f8349fd3709a9aefae873c875a54a75c682b71b2ba4e5ee7ac946b4f926cac2965e4fa3d031607f32cb8a02222bb7
 DIST jnr-posix-1.1.8.tar.gz 206617 SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1 SHA512 566289eefcf4c277145621aefcd5c412b38e2feb5d1c0297ee9b3945223278aca4ee4914c55c638230ec968ead3c952773aeb49072b3883c0bb04fe7c0d7cae5 WHIRLPOOL d74ba3c21c419cf9c0f02abbe76728a61f622a8c8e03da84c661ad9690cce1f8238003d15e0349ed12220c581fdbfc05c9b3cc436286bb400a40b30500ce5783
-DIST jnr-posix-2.0.0.tar.gz 54286 SHA256 e7121253092afd81adf2a28225ee92b5adb8bcb36e3d9aa159b5861fb8b27400 SHA512 be2e803a1d3c01bf512671fccda3562f2f5213a4c5c3189202c7ab8ea3c783856cae35738b2e4c4ba44631ca2d3bbab804ae8428f59dd419b13d14e1c37b3c3c WHIRLPOOL abcf1ba825c4cd1fd129f3af85d6aaa4116242636f1dd1b971795d4d3d52be1f9f2962e2c216edcc0b86d021b12ee3a383825af7b126ebd3f3f2c9dee0e379af
-DIST jnr-posix-2.3.0.tar.gz 59201 SHA256 c7209964c32e1ef2410d6a4334e681a5b0c8e43367aaeeb06073f31bc34a70f1 SHA512 87dc887f51cb1a000d373415b7e19d305433fd78b59103503b96e4f8f57a299200b65593704f7debc132dc6ebae97c7d24369ef412f739b86949eaa839d029cb WHIRLPOOL 411fa26a049c6e97716a03f2402fcfb899334535c819c7599b1fb6d34128f7b7c2bbbded601fd8f7901e577ca99d3d6511b997abf058b1d821c0fbd66fd1bd74
 DIST jnr-posix-2.4.0.tar.gz 64601 SHA256 773e5d70c538493a6e8dad2b74e039368d3536b7159d24d02128d2201e15537f SHA512 5e59eaa30b7177cee8fcd57ecd88038e0c043bb5f929cbcc808f24088b19b0ba464dc2af68d7cf94f7508281d1bc6ea26f1f39b8651727b75fae6eeb71c2c2dd WHIRLPOOL aa0711d8706032aea264682c414f46409e71abe1fa6e447b3c2d52f0af6e58442073e8e72721098f87ebaa116a5677830d3a50934799a28acf2b85d9b4e1aece
-DIST jnr-posix-2.5.0.tar.gz 64175 SHA256 6e6bd8ea961eee6dd334218f50af2b6506966781b57d29e3b149d5a406196750 SHA512 974191a722da923923c6013f0d71b4e7791a66bda10aaecf38c8ac2febfdb223b6bd0b1f522fb8c98ce3010f5e13f2eba6bbc91e9999b6532dfd2604ed4b4dcf WHIRLPOOL c59b0253a5149e45b908260c17a08b9a59476a7ac321bcdfb6edaa0b4fadb3ab55515532993705a0b2ac845abc64c2e8a62ebc3a07e96c8856bfb79786bdf372
-DIST jnr-posix-2.5.2.tar.gz 67633 SHA256 00dfffc7bde6ccd27e96947772149a5793f384045af169ec84d684697d1c5a8b SHA512 ef2ae17cd035cb4775ef20c628575c582787d57c6e312ca9ec980dec2eb96aefaecbba045b48c879cc7285a476bfcdc0c6c95752487882301d69ce218c292215 WHIRLPOOL b31c4ee3a44d92d7cfc89f3900b8b3af48a753327d603df9d03e599a4dc7628206be28c927497190f73bcc789860861b45de9406b23f23dab0598cf0044d6529
-DIST jnr-posix-3.0.0.tar.gz 67819 SHA256 e9437fde312d651aca3ad54e8e773e4a884676e542d2ddcabd72c0d7ab415e70 SHA512 e26e44c05db6cfe52c8cec5e8d6304987146e840cbb316aeb4055b277acf152e197ae3b1480b000f3e87d08a52c29f371a5e1d25ad1290d7dd58cc1277a7abb4 WHIRLPOOL ef2aa71a4ab58feb627192bbb9041d00067404e5e9dc8322284252ff34590c5406372f03d9e7f7c9bd07a92427abde5b727d4a8f55b7cb772e4ed89eefde4053
 DIST jnr-posix-3.0.1.tar.gz 68893 SHA256 8dc26abacaca5572a9d574cd60590b73e06b5b8770e4ec3885c62b8ea3d23398 SHA512 908c78daf1a01abcc02d6f18cf93443482dc9f7c4ba66499e4cc46b708dcff7a4daf4a6f204ae256a70e08bf2d54307ecba82bde602783ded0e6854a7e558c8c WHIRLPOOL a0a7da375a1c7f37a332c859aed426342fdfa38ac7c7df44b899849b37241549e100fa0475f9e7ef6317e518dfa7c6d5efe5dc65fbed17821f63c0f8e71fa470
-DIST jnr-posix-3.0.10.tar.gz 85912 SHA256 bb68f39e911563458cea6334cb32733618836b5f96d996528a300a457a1e3746 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1 WHIRLPOOL 169a774516eda1176e8b631bbb16bcaebef287bf5c9ce1da871071df40081842e5405e7c4dae15f1c7054554b2d8e907bfeb3dba20db176912082cba1b83a525
-EBUILD jnr-posix-1.1.4.ebuild 1789 SHA256 e53f807ac11533e547ac770fa516cecd1a7162d376894e7e6845f271095a9ed5 SHA512 edff8dedc17dd2a71cbd540121ffb0dbd364fee60d20c229f0c67b5a224234e23b606377ab257436ea70a67d774c290ae9778277ea902feefdcf001e95c5d9bc WHIRLPOOL dc617cede1b777789605fbac68308c3f85afbafbb6bf044be08fa3cda310b41c316715abf25bde2f3141a3c22b597e60cf70593f2521f71858c12d7381f67aa9
 EBUILD jnr-posix-1.1.8-r1.ebuild 1498 SHA256 0d5fc030c08b7ab82f7f0180f393ecfab8173c7b978403a23fd8ba57ce16fd7c SHA512 a541d54387dee3ef1280de5e34ee8f7d944b55c3d24226eed1a63affa407f1b21080357f36efbbf92179dcd6b23e47e99ad419be0a0199af02295b63358817e6 WHIRLPOOL 6797f10d2e6fb2e13da85c95b5b6111f6488215dd27da1aadc29a871d35ba562f4185c880b67c4e020041da0a3535dd3c1b19fbe988485fb6491d89ee958101b
-EBUILD jnr-posix-2.0.0.ebuild 1416 SHA256 8dbe106121ed8a55de29bb020bd6151f27c150653fc4317303cfb4dc8dc0a285 SHA512 ddbcb1ef725da634a86334d9419ee2442ef9db1410a205eda1871d8efc7c71fcc5aa1c84883ec92aa763872e34397b9b98f3493bc2a644b96400397d9cea77a6 WHIRLPOOL bedddbda6175bbe5c5c433ed6884afae02a301488f8929eb86a5c5a683fbce8f9f768bab40c15c200541c6bb376be5b9d0ca1181b6fd8b67649a9f84993f01ed
-EBUILD jnr-posix-2.3.0.ebuild 1491 SHA256 27824b643d9f42d7901b78c59e3c1ee615e47f8e9d99e2bcedec31c2cd0f5d76 SHA512 930ee87fd4e959da8fcc61e30beb8eb25abd5671b37a5ef30a982b7829338bd71ca07d2e0d03d10c3558259eb40c6bd0d855fcbbf496499ae3fa66d3a04b5c97 WHIRLPOOL a376d718e3a53595410d5819ac972f8c91de3d15321094610301f5ab4c3ed5490afab959ff833c44bc4def9a961e7cf272e3bf363a4ecb00b1ecefb21a92b1da
-EBUILD jnr-posix-2.4.0.ebuild 1544 SHA256 3b9735fa16461c58727495592d41033ea04bfbb89abaed0c6b4c9898818de4b3 SHA512 01334e2c7cc1f0cd5b6232c86adfe0a62daefc2b580b1c74e089ed6ce0d71e4f77af7d69e423f72127af166abab932764efa048e42337f56452d829d108a1186 WHIRLPOOL 97715559f92798227578dbbda309d081dd3a6e22f8d601b0c4381cc0339c304ae14fad705a4ef4668fed5a808c71e6ef8fea85fc4e6b95a57fc8e48cae99a5a8
-EBUILD jnr-posix-2.5.0.ebuild 1540 SHA256 6c2eb7bb69f3ff1406441aeb9ffedaa6f66fb03e33652ae3d0f981c5ad6f746d SHA512 834abe43e51f444003e1087bbe580488908b4b9a1982f26b0cfeda73e71e900c3f887409ecede5b92340a99b8db8205cac0402b892acc3010ec0a932801860b1 WHIRLPOOL a705385f434ae6cd9f2662cc2f069fed8161708c730fa8a9782ada2437c16afbc571363931bd9fd41f305a7f5ad33706b9a4dc3a0e3c70cbdfbe068fe86b1331
-EBUILD jnr-posix-2.5.2.ebuild 1540 SHA256 f639c63300ccb35599c50c57493b1e0ecf7ce43c7c93f1027723b99272df0508 SHA512 2f0d52a17979b106c46148c74f357d4e856fc3406c5412b8a3e6909e173c015bc8d3665062b483962b8757d97e297ce12e43a4642a0995e008c02d29135c80b6 WHIRLPOOL c0ab795096198e310fd00b56f4e1b10cdc6b3bdb86de58c69f973eb2b6d08334ced8541f1ff0ccc7f24fbfff22fa38e6a17c19596a3bb14c54369232c1209047
-EBUILD jnr-posix-3.0.0.ebuild 1540 SHA256 287ff85972464e88d0efd4d077d1e076f08d0dbd07f0a94be553d19a9c930103 SHA512 0c4240e90b8f5ec1f845076c7d72ceff8329e9f1017617bd17321cfdb7adcd61b2f70943813d0ac3d448787b5156460b786bed4192977b3ce32215a493637ac5 WHIRLPOOL 67c1c2d43bf70c04afc0eeccfb589f19ea5f475feb6b2327dc5fad7d30ccf0be901c408bb4774cf23c1528e8e8b9cb400915269ae8dff987d8400264617cc148
-EBUILD jnr-posix-3.0.1-r1.ebuild 1542 SHA256 a54b24a202ecbaaaa4f8264e8aa3371443d2be5a894f499a3f30a73fb8eb9cf7 SHA512 e3d8dc22f2fd5610817850f3a1c29ffdc37f67ed171ec85e9ae4b9e63a868b119008cce98fb6b11fa38ae1b64fdbe226ff97085a2b60bee7ff97e58168af9f1c WHIRLPOOL 8f299d1355b9fa333a3cb3328572da7d5380c8957be8b3265061c25b1fc446c96709595df3f19d1962c9e10118145e7d2b169faed3f1c6408368991cd4129015
-EBUILD jnr-posix-3.0.1.ebuild 1540 SHA256 b814225485596bc5521ca39529112f05716f790556fe9542d04fb9c74d0acfc2 SHA512 1c59c79027df82739420fb39d6531b8eb924b7efb3e76b4b110a1828e8d32bc54b7497598a771b9511a372c23ff04cce9c6b1894d3f6622b30e067eb87237cd2 WHIRLPOOL 6a90504d026d5ea32195594d3d3ad6fef40b55992e185c88059ab5ca5f007bbb8545c929c87a2a67c32f47efd7639fac0d52fd9fb95c39e0e9f9d59f81de785c
-EBUILD jnr-posix-3.0.10.ebuild 1367 SHA256 0b7a9f2f57d28afba8e19265692a1ac6bd81e815e34ac03cb1db02d35c1ec6bd SHA512 a1e0b128a2cb8da5bfb18661aa7101bd5d53d290e71ede5a7e331908ca993ce7cf42ea090ab1f514bb1420c8a2a181d66909d8497d47ecce5c3d862a0d8c19c8 WHIRLPOOL 357205dee1d0a73de28ecec2c33fc1cbe05e353a21e737d32c7d15a8305db4592a743950d3b1a697a7443969ecbecb37458d82942e43e0201dc7b98b2e993246
-MISC ChangeLog 3066 SHA256 490479d38981e763c95aebbae82ac5fdeb278f3ccac0c8db67ab8fac47cd8a82 SHA512 57986e824135d1a490c7d2f566c7f89ee1cfd15918086c916959ae46e349260ca2350e2d2192823ab5df76b37fe3e5e6f54503130c224e26f7f19cadc3abe282 WHIRLPOOL e3338815add2a4c3a0e924e74fee4af8f452f7198396b44304c8b0bbff6c97e2ded419d60ca5e2d9d1c46ac0b88361a0338b327c1bf1cd22b07d5af4fd57111a
+EBUILD jnr-posix-2.4.0.ebuild 1547 SHA256 f34068ca2b3f7ef71c027b7db1ae5369bee0c6f2fd8792bc425719092b8b9589 SHA512 6297d81148ee40ee430f17558f7a90ccfa8806638d9c1d21054019f64ea4b727932c1eea656928f54698092e7a5fe554694f97f9a852cd7f0ef3102ce2ce6aa8 WHIRLPOOL 9010b0aeaf611c3c282a5dded787304a9f5ab81e0b5c0bf34a74b572e711a9d750cf52dbb9276afac316772f9bc3b32b3708a689604f13a2ede9ef01bfdebae7
+EBUILD jnr-posix-3.0.1-r1.ebuild 1540 SHA256 c1def50c0d9283b222dd0741f39731c409894fe420fd9984411f508a97a6e6b3 SHA512 480867a37eeabea54c91143ee11a31df14c5a0ed81ecadd80a801ca6796537ae92d7761cde4fe5726ce8b38e6487e97eceb130cb08cf3cb6d68a65508827db50 WHIRLPOOL c69b8cf85ec4bb4c931f73ed63fa7aaa28ff5de649fa6dbce8c1fbd7ea2f9cb671ca08a24c58bd30ef2358e507001af7ee4fe7a22f3e56ba5fa0e36350ff5ab7
+MISC ChangeLog 3454 SHA256 613d6c67fcadc2d2fa5073a36fcc6fca2e6b3a9408fe09220dfdae0601c176bc SHA512 111566119cf989302e5077d7fad170c595c4ea499d647be10b2e82c20e8ed76b2cc9b834a74038ec02583b073d54a5be8b7a372350cd41d2c41fd7e349a748d2 WHIRLPOOL 75b02204032df64d858577522d43ae2611578bf3d54737a24836672e8e52a4f3c4b3e3d6eba0dabb6e7fa76b007a480f9d1e355c3a075ce62c50504097f79d72
 MISC metadata.xml 241 SHA256 3db2e5207e98da7e91a473b4e98ce921d22d6d7ccedfa6590b0be3a92574b564 SHA512 c4916b9422a859f69c847499398f1f430fa821f6faa397b395b086186d251093b6adb3e9774ed7c94035be6b0c86f7385fa76672cbd150ab088abe90b94fee41 WHIRLPOOL e463835353dabc5cd151dde11e54982f5c7dc76231ceb432539f091cfa3068d15cc4dca31eeceaf074815f7f49e966565a7393cbc041f6b7b90de85fb312cba2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc0B4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUAAP/RUj8JDxRndsgN6rlrz1Z+lV
-s7kOCb7EFA/7iXxMLn17bKf89tdGTM2IUtkMw+wQKOIYRrYbYkqSvDV+3WCJUTJY
-EAEqnmDd5NoPKWhmDZ5KYCTNUJNnp9Y7b1DE84YOitLH0r6N/uPC4CpdG3r9YT4m
-6Zaw7nK6bmAYFjIAVdAifrGkJwccfBvfuiHY6V8kQUjzaZrl7c4fyhZUFcjTHYZs
-BFLl2X9PavVNlnfGy9EEerWi0sQNDjg0bRC+tGc3Y7qI7nWHZwZmt1aKKqa+mNop
-5RF51+5E+hI4daLMG4eLMkKlcYKJ9yLQMBHJ7bSOIitHV6ZIsg6P1GXI26p5uMyj
-E0tVLrcoS1E/xGQN/G1xTlDVmuWSeuEYyjoUEEY1+aIUMUP1EsE32o4YcRKDHPcj
-IOdd7UfIhkl/kLNb3Zzmr3srhuDMCY7huX8g0IhWbfWR4Ar1LC/a0uwutXw7BOGs
-0kp/ddrI/9FwehZClGD9LwYrCW5VHq4OB47/lqsWxCafilf/z/RSjmd+eh2PSLbl
-Obm+U5d1nck0X1QjdVwKn84ZpVYT4AppCcw0vI7fXkqsFW4TyhxfvoN3ZiVX9Q6e
-0uHf9lUYUv80679rKenOjoVLgJrcfkB/1g2qke+fSfY6M2EJoNykPH+1ABO4x+vG
-m99gPYOzex1HMlasl2kZ
-=ztXO
+iQEcBAEBCAAGBQJVgbkaAAoJEJGRpfGTSRu4MCMIAKuytAQk5EoxdhKvRWqpcqCk
+RqeUSQ4RTjS1eED1psRX6S2/ux/LUVY0YDAkAKrO81AQ3c+DybA0uK+twRQkBWyA
+8krKnub7B9nUmVlADYmWIi/1J/8P4c1EavxAa+Y1eEM2R0oDDUl5ca9687NgaMkI
+n+qqc8tyCAvqsO7FzXrC913hW1dqxdVVbUed475p39CI5ex/knIYlHX/qhMo0upc
+4J5AdTkasqjL9laa1n87U3aCHWtnkbvSbc0s0Gn5YT2AUQrqfhje2vrnNH/TE8fe
+zVds5IoRBdeleNR6/CTLnW4s7amWpqalMGz32WT8RgCsf1tupsgckLpzJ0Ujg18=
+=E9wg
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-posix/jnr-posix-1.1.4.ebuild b/dev-java/jnr-posix/jnr-posix-1.1.4.ebuild
deleted file mode 100644
index 6b14e1733b24..000000000000
--- a/dev-java/jnr-posix/jnr-posix-1.1.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-1.1.4.ebuild,v 1.5 2010/07/17 09:07:21 fauli Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="http://github.com/wmeissner/jnr-posix/"
-SRC_URI="http://github.com/wmeissner/${PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-CDEPEND=">=dev-java/jaffl-0.5.1:0
-	>=dev-java/constantine-0.7:0"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit4
-		dev-java/jffi:0.4
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mv w* "${P}" || die
-}
-
-java_prepare() {
-	find . -iname '*.jar' -delete
-	java-pkg_jar-from --into lib constantine
-	java-pkg_jar-from --into lib jaffl
-
-	sed -i -e 's_\.\./jaffl\.git/__g' nbproject/project.properties || die
-}
-
-EANT_EXTRA_ARGS="-Dreference.jaffl.jar=lib/jaffl.jar \
-	-Dreference.constantine.jar=lib/constantine.jar \
-	-Dproject.constantine=\"${S}\" \
-	-Dproject.jaffl=\"${S}\" \
-	-D\"already.built.${S}\"=true"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use source && java-pkg_dosrc src/*
-	dodoc README.txt || die
-}
-
-src_test() {
-	sed -i -e \
-	"s_\${file.reference.jffi-complete.jar}_$(java-pkg_getjars --build-only --with-dependencies jffi-0.4,jaffl)_" \
-		nbproject/project.properties
-
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-		-Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" \
-		-Djava.library.path="$(java-config -di jaffl,constantine,jffi-0.4)" \
-		${EANT_EXTRA_ARGS}
-}
diff --git a/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
deleted file mode 100644
index edf72edc4e38..000000000000
--- a/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild,v 1.1 2012/01/12 12:06:53 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="http://github.com/jnr/"
-SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.6"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mv jnr-jnr-posix-* ${P} || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.6"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild
deleted file mode 100644
index 8fb0bcb98d1b..000000000000
--- a/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild,v 1.1 2012/09/25 10:47:17 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/posix/FileStatTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
index 608bfe54cbd8..27b28722f589 100644
--- a/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild,v 1.1 2013/02/07 14:23:17 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.4.0.ebuild,v 1.2 2015/06/17 17:13:00 monsieurp Exp $
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="2.4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jnr-posix/jnr-posix-2.5.0.ebuild b/dev-java/jnr-posix/jnr-posix-2.5.0.ebuild
deleted file mode 100644
index b66f84011d7e..000000000000
--- a/dev-java/jnr-posix/jnr-posix-2.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.5.0.ebuild,v 1.1 2013/07/11 21:57:07 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/posix/FileStatTest.java || die
-	rm -v src/test/java/jnr/posix/SpawnTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-2.5.2.ebuild b/dev-java/jnr-posix/jnr-posix-2.5.2.ebuild
deleted file mode 100644
index d91ced3ed8c4..000000000000
--- a/dev-java/jnr-posix/jnr-posix-2.5.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.5.2.ebuild,v 1.1 2013/09/17 14:40:43 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/posix/FileStatTest.java || die
-	rm -v src/test/java/jnr/posix/SpawnTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.0.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.0.ebuild
deleted file mode 100644
index cc296432090b..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-3.0.0.ebuild,v 1.1 2013/09/17 14:40:43 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/posix/FileStatTest.java || die
-	rm -v src/test/java/jnr/posix/SpawnTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild
index 16452d057066..b303472ef2f3 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild,v 1.2 2015/03/21 23:17:44 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild,v 1.3 2015/06/17 17:13:00 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="3.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEP="
 	dev-java/jnr-constants:0
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.1.ebuild
deleted file mode 100644
index 7ed55b1baf8c..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-3.0.1.ebuild,v 1.1 2013/09/27 16:26:29 tomwij Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 vcs-snapshot
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.7"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.7"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	# Fails, upstream pom has ignore test failures enabled.
-	rm -v src/test/java/jnr/posix/FileStatTest.java || die
-	rm -v src/test/java/jnr/posix/SpawnTest.java || die
-
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
deleted file mode 100644
index e54c43919059..000000000000
--- a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild,v 1.1 2015/03/21 23:17:44 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
-HOMEPAGE="https://github.com/jnr/jnr-posix"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="3.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:2"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.6"
-
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="UTF-8"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jnr-unixsocket/ChangeLog b/dev-java/jnr-unixsocket/ChangeLog
index 4bddc68e8187..ab28dd1ffedc 100644
--- a/dev-java/jnr-unixsocket/ChangeLog
+++ b/dev-java/jnr-unixsocket/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jnr-unixsocket
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/ChangeLog,v 1.4 2015/06/06 18:48:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/ChangeLog,v 1.5 2015/06/17 17:14:09 monsieurp Exp $
+
+  17 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  -jnr-unixsocket-0.3.ebuild, jnr-unixsocket-0.6.ebuild:
+  Stable for x86+amd64 through ALLARCHES. Remove old. Fix bug 552362.
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jnr-unixsocket/Manifest b/dev-java/jnr-unixsocket/Manifest
index 839ca92c9048..8855828c7102 100644
--- a/dev-java/jnr-unixsocket/Manifest
+++ b/dev-java/jnr-unixsocket/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX jnr-unixsocket-0.3-build.xml 17192 SHA256 71e41c0fb2531ecd8e43979e41196a47ffacec203366dcf63d81e260426b613d SHA512 c5aca83c2586dd45b10b0d28fa922d2b720ea7ccc41ba403bc28776cdc257d745b99c50cc1d5514c22118e6471a65990a800b756268203724bb7240f2dde9664 WHIRLPOOL 16f1cba43be14554bdced2e0a8a0b0ff9748dda9a81cc9b22cbb974318f1ded756c7810de95fc944644c7e642f22b499f3a35d29b682790ae147d8fbc5ade986
 AUX jnr-unixsocket-0.6-build.xml 17192 SHA256 947a532b91736fbdda74a26b5c1b29f4628eaac44477fb88e67995b7abaced76 SHA512 d9d33107fa8d28ff5630e806a6a0415cba0fb0962520918f6e6373163a6eefb6ad58a4c3a1f87ca041f6c0dfc48c5bee95e729d591472199b8f07153f9ca9426 WHIRLPOOL bc4210ec8adb0706190b0d976a373a63385cc522bf993653d9b474ffd78048964debb9bbf5fc03e09d93855ebd8c8e644a63a6b80f7ea26ea9a5dd99401b7f5b
-DIST jnr-unixsocket-0.3.tar.gz 6400 SHA256 958e1be9eddc6768fa8f28ac0e1183c63b113d825ab93860ef73ad1db6b7f2c1 SHA512 8e6005f7c5c74eee9ae94fb6050acbfe1ae3bdf594199649f04f29faed478f263353e76c04ba50e6c893644cd48c1fbf8afe47a2faed946a16b16de625938a6c WHIRLPOOL 409b1f3a9f3fd45ebc688e0a28e57070d3f79860e9d0999abe5a1d6efded1c5b17a2b07fbdb4729bf1c26750f3bfa08b30c2eae05f1ea06575dff1c3a1289c04
 DIST jnr-unixsocket-0.6.tar.gz 6756 SHA256 f5243dd27559790dcd6a9b70d2671ab2e20f20ff8a1cba9923e9bda4133982b9 SHA512 93ceb4f90b259c94eb0a68f13da1bbdae547b77637102fc36b9aa4427ed079bca1e9d503579c52cb4ea591bf67df30efcb99c6c4d71e7545cc6ff35f5ca65249 WHIRLPOOL 6464e8d6fa895044095c6ddce4dabc761c6f4aeb9e0dfc04df464f3e20b9b4546d16a0fc6f617cec4e937b6bcf59fc690cbf0246fb3dc04ee80b8acb804715fa
-EBUILD jnr-unixsocket-0.3.ebuild 1093 SHA256 3fb57d582d4709c9394de3ab31a29cf50a0f2ed2695b3d7a2a5121b3b8700cf9 SHA512 ed3a067663425cd67749624038283a80260fbf2be160f498de9d45e9332754740ce5c6a9c37b155670aa597cfb74c67cafa7aaed507a95c53f33c71ae48123cf WHIRLPOOL 0745feb8a7138dacf9579cfc0253ad038473535feb984544178537842933ce5cc374180581e8befe4973ca6af06447da29373ed08381ad0c98ad74f3a63d5b7e
-EBUILD jnr-unixsocket-0.6.ebuild 1131 SHA256 d0efad5bc811b3b7cfd7e3110fa04182d8c94fdf15bc624603183c16beaecbf5 SHA512 0615920375d254f75bc1e0ec68086ba31da79f61bab5065dba956d99e7bde7937e2795af073f3251b4cd115d6e0dfee3f319702ca08c0e6bf8e21f37a6f32acc WHIRLPOOL 366ddc5ff5be20fbfc8c0b7546471b403c557477bd7d69bb445882931021c5e1d953c9b4829f1a912739f2f69b5bb6c78a58dc18e4f763df56da391d45b3d201
-MISC ChangeLog 990 SHA256 ca005f7af61a24be33426f1bb2a7c3fff6a2d41ec631fdbcc15330cc61e565b6 SHA512 b8af2e417379ed53c23a42dbe8493bfe8e10bc3a9bb8908be19ef3fdb4828047cbda0d1739ee2fadd0ccdd7b9855de4ad32591a421a4b95b77233c2ff408b72f WHIRLPOOL 22c0c5fbfe5d0e8cc59e7a604f320bcdedc82e0702045e3d9f277ad1b00da63caea404a0dae0d33c850c33c285d0aeed1a95d2e7934b5f0ab45dfa0cc57aaeff
+EBUILD jnr-unixsocket-0.6.ebuild 1129 SHA256 34f0dad091b991825bc80cdb504968169e309312d7df321c4fdc182c05e352c3 SHA512 1b6b56b1382bfe7f6c0892edac098e2e06215edaa5603ac9426240b7756b4396ffe51989f3d36f28a33246b6a38d8779e4d7746447023114a18048484578ee70 WHIRLPOOL 2c329b54a702f7643a1870bad3d55f385a4debcc9662da4e0b3bd6dc63935db75a73c207f91b0dc1fcf305b397c203e3ccc222f851b3ce08de31efedb6213285
+MISC ChangeLog 1177 SHA256 30dfd3101769c72f404f330980239ab4f706f99d5c8a4a7919d68c38a8b227ed SHA512 9580ea4430eab3f0135850340c60b6afe50c24da9060f38194b6e323431d02026a9710fe12b05d01411a106e76f84e2dbec4fec7a3af6b321174a7df1bae082e WHIRLPOOL cf9068910c0bf67871a4a748b22cb704bf0087f041f0b2d377295f1a221ef5b9f3976aabfbd57240c3726f32a046a79fdd72effa50415d34703a573e765cb170
 MISC metadata.xml 246 SHA256 2ffe84ec7556e2a01f9f94be56acaa9ab3775e4989fbdc9764ac08082db2882b SHA512 bec61db20074eced6f53a231debd7676476238f582853433f9d28d980e85be5d4d8bdcf9f9efac83da46e8253b4a001a40132552c4fc00cd387a64bd9f87ec05 WHIRLPOOL 06e43c833d1446330d2bfdc03b7da8632cbf75bfa0e649ecbd9b011c598f005ceb59fa3aa6ddc66f39eabf8794a188f83ad00fbf8cff0d7731c95c5899007bfc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc0CKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFVoQAKCqN97Px03HMFq0/IYm2zeH
-4ZdgFA7E7yC4N8YJ+Anv6bYv6pCUlBU8kIvqhkryWhTGtxm4szZm+BcokQYK4acO
-uNLIYi2MhQ/xhrVjobATZAxpv6+SQipxSUVLM0WvDhxHAFvsmamdvTtos1fD+3SF
-HvenswTMirp5k2cPeiWgsq/X5/+0zerfHzis/PfTDxoED/FYbicOf1yv8Lb4aBsb
-LyrmHL9eImB+2+QoQ7sllOE2ReIzvzsKYq2mPJNDDEWSTfmBwr3GsyTMmVrXLgJ4
-Wuvvcrw1ivczWL8VzBQNAMAYGtR7uArvO6U81XfRCp8m4PGsgkeW6wskmzL/gv/9
-T3o/Qr8d07pErvwQkz7xiRmEDyXCHLlngXOE89f+6PRnRxNvrqG7MY+4e4WY7FSM
-SrSIojXyuTyE20lBSe46KX7PsLGlyvTHnQvUGSKyB0JQPgUSSLca3+Akw2006lHU
-3G+MsO+Xy9ygO84d5o7Lo4DQjeRtYxdH+zmTA9oUSw6+r9Xk+XpjJas2qA65Jedl
-EGbEYD1Jw9W8kZ9EyjEJPA+ukLijGHrjAqKgPylt9s+ST9qwdmgAwU7dqGIKvTte
-vnoZcQH2bcWF6dMtAVHHMOzMTvc6jWf4xLsFZsY5yRWbfBJOhzCbYI6oPxHKrEmf
-yDOBPr7BliFMjIioIJGY
-=I+ci
+iQEcBAEBCAAGBQJVgblkAAoJEJGRpfGTSRu4EEkIAJNpqgTDLScuZpQlZuBFfdFJ
+Qpa0aRIxDGYgDgEDSNAgIAk4S6xeD2oI0iJGqH7Ej81063hMlKXFnEnC/I1H7Gbm
+5hbnOOOOZj1sZLCl2ImmFHFi3Gitr7336+I5klbgokHJGNy/TFm/XcmsF4rKfa+G
+TSivPxmAEiep4vS9sO8g4uLMnSAQ31GWOh2PDpPM8kkdVNe9qAp2IDgzf7hITPrY
+TCqoxVYrOBBmSHfPnCMZyXQ1m+QG6cge4Q1GWUEG6eGqMCP8pE2WeUpgNFanfefm
+YO3tuUbxZn+rQiGEgqwaAHlrAzni72A3U3hQTA+h6QybfxkbYcyNSWW4WOoU0Nw=
+=WWuu
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
deleted file mode 100644
index 4c4ca8e627b1..000000000000
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild,v 1.4 2015/04/16 13:34:32 monsieurp Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Unix sockets for Java"
-SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-CDEPEND="dev-java/jnr-constants:0
-	dev-java/jnr-enxio:0
-	dev-java/jnr-ffi:0.7"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jnr-constants,jnr-enxio,jnr-ffi-0.7"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use source && java-pkg_dosrc src/main/java/jnr
-	use examples && java-pkg_doexamples src/main/java/jnr/unixsocket/example
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}
diff --git a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
index 1aa07e1cdd91..51f779cb2a27 100644
--- a/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
+++ b/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild,v 1.1 2015/04/16 13:34:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild,v 1.2 2015/06/17 17:14:09 monsieurp Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/jnr/jnr-unixsocket"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Apache-2.0"
 
 CDEPEND="dev-java/jnr-constants:0
diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 316f8925c57c..85960dad37a9 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/netbeans-websvccommon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/ChangeLog,v 1.26 2015/05/21 14:57:05 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/ChangeLog,v 1.27 2015/06/17 10:48:09 fordfrog Exp $
+
+  17 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-websvccommon-8.0.2.ebuild, +files/italian-patch.patch:
+  fixed bug #435022
 
   21 May 2015; Patrice Clement <monsieurp@gentoo.org>
   -netbeans-websvccommon-7.2.ebuild:
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index b17b0f0c498c..2183acd10844 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX italian-patch.patch 1116 SHA256 96b661a6466db9b46566320279d93d9a3cd8a682ffefd81191831452ed422f71 SHA512 15a76f503a7e3639922974df7b018004bde2ccc9bf2a25abe9c5548a6d229c738a21622271d7993b7beb5fc2528a1ab796e17afe084aa4630cb954886b4b6886 WHIRLPOOL f6330d6719d52e134a0d309d0c62f49039048b3a901d30255d32e63f231538d7528c61e1657b898a15e372e2ae75413306ce9a79d73138e3a15a6b174cc951de
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
-EBUILD netbeans-websvccommon-8.0.2.ebuild 2779 SHA256 0ae251558e34c9842ff36885335a2edadaee88df88ff8a78946b8712b5eb2a8a SHA512 8f626f5275275a3efbfe97fa0b32a7d0003cdb3d3f7695dd4944a3fb481536451dd9075777e0312a517b07c89cb4c5d2b8fb04cce5216a92fce12793cd517515 WHIRLPOOL e0ca20da45180867c1466cc89feeeb99b419db3b68efe2dd07e2be54a94c0c65266ee2897a903d4e3f6859f930023edb1aba2fe244c7775b45f498c65e74ccc7
-MISC ChangeLog 4127 SHA256 d3070b1331f95a1a00958ab2b83b7bd6daee58f8a82937803c4d37aa909b4b9c SHA512 4c9caffa2611a859b45be60b10ce18de55a89753ba7ba80b4c13ccf48bc6749938be946d97bd70400a16b4d8c01c31ac6b41dd09d263b59e9f7b24edaac1786b WHIRLPOOL 8672685c92d9a1059346019ca4222c1eedb8ffad01a5c539b53278093dfba073a6dceda4c6b962135c3d13ba9c1cbdc745c0cf2f1668194ac8f9251d82d5d8ee
+EBUILD netbeans-websvccommon-8.0.2.ebuild 2826 SHA256 5181e2127aea3f256ddbf27e906d2a7c1b5f5d24e627a9e43d01df0ec7d6fba8 SHA512 f949ac50c2f23fa5bdaa81b5aad6f1d113b84137e6a68e3f061c2f89fa6384be5893c73352d002d7a95f30c23389a1a795d71da5156cbba9132d376a5bfb4527 WHIRLPOOL 70c7ecd812f1c8e7420328f2f7dbc0db08e90b49dd99741d9d8a8e8d16f04af20d830acdc755f8fa185a09e0f96fc2f91cd86150021ceb969801f75d9e5dc31e
+MISC ChangeLog 4265 SHA256 06f26b6e669f55bfe37da5713363be7a72509ca0343a25f916d1b7d0e3808198 SHA512 f861b2a2c47cd6e7498d82628751aaa958f12b4a4fe8eb263d76e9cd6bbf9c29c665c2572ff1af43fbf79d2eb62a1ad1a6daebe0cd2e7297869a16b1b2f06770 WHIRLPOOL 10f483cad177d5a8be5b97985dbe201533c4562d755e0eb271547a46d10e5a6b7c9e1f0edc168e796ae49e29aa06a02d5800d65034da61727458a7f66bcf6e9d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJVXfHbAAoJEJGRpfGTSRu45+IIAI+sKJReWC4AAw2/IieTuLUe
-BovKjFp0FMpYE3Pv5yicVxz1IZ9gmQ7i9li2eHkXSKYz9mRIB6l3tdteXgb91Gee
-qKBaVEjaN7RAAAjgQbS3ZOSA6bg06Z/7DpfWVJqhs9kfiBPVcHx4tvbOfiY4hRbl
-UUzdmizPTmmMy883bsFSwFt1FWeEHwFN801YrbaPAFtqK/FWuiMNkl8c+qOJ1FLI
-bMj45KHGDMq4VvGcY/k+va4vX06HMk0gzBI/eZLarbJq+/xbCKXcPmOnUze+iahM
-9DUWjaltqv41Xno1MIGUWJCHwnd8JkZzdVduFQWiMxYhhc5TGbZ56gpg5kv3R5g=
-=3O9s
------END PGP SIGNATURE-----
diff --git a/dev-java/netbeans-websvccommon/files/italian-patch.patch b/dev-java/netbeans-websvccommon/files/italian-patch.patch
new file mode 100644
index 000000000000..dc20e6bec429
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/files/italian-patch.patch
@@ -0,0 +1,13 @@
+Index: xjc/src/com/sun/tools/xjc/MessageBundle_it.properties
+===================================================================
+--- xjc/src/com/sun/tools/xjc/MessageBundle_it.properties	(revision 3965)
++++ xjc/src/com/sun/tools/xjc/MessageBundle_it.properties	(working copy)
+@@ -125,7 +125,7 @@
+ 
+ # see java.text.SimpleDateFormat for format syntax
+ # Format should not be changed, English locale is used to transform this string into a real date. Letters can be translated but the user should known that java.text.SimpleDateFormat is responsible for formatting (meaning of symbols can be found at http://docs.oracle.com/javase/tutorial/i18n/format/simpleDateFormat.html).
+-Driver.DateFormat = aaaa.MM.gg
++Driver.DateFormat = yyyy.MM.dd
+ 
+ # see java.text.SimpleDateFormat for format syntax
+ # Format should not be changed, English locale is used to transform this string into a real time. Letters can be translated but the user should known that java.text.SimpleDateFormat is responsible for formatting (meaning of symbols can be found at http://docs.oracle.com/javase/tutorial/i18n/format/simpleDateFormat.html).
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
index 88027c8e070a..3ee3f4c87dbf 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild,v 1.4 2015/05/21 09:52:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild,v 1.5 2015/06/17 10:48:09 fordfrog Exp $
 
 EAPI="4"
 inherit eutils java-pkg-2 java-ant-2
@@ -47,6 +47,7 @@ src_prepare() {
 	find -name "*.class" -type f | xargs rm -vf
 
 	epatch netbeans-8.0.2-build.xml.patch
+	epatch "${FILESDIR}/italian-patch.patch"
 
 	# Support for custom patches
 	if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
diff --git a/dev-java/xmlgraphics-commons/ChangeLog b/dev-java/xmlgraphics-commons/ChangeLog
index ddee2dd36ec4..9ad759fadb25 100644
--- a/dev-java/xmlgraphics-commons/ChangeLog
+++ b/dev-java/xmlgraphics-commons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xmlgraphics-commons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.27 2015/06/16 07:18:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.28 2015/06/17 07:31:39 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xmlgraphics-commons-1.5.ebuild:
+  Stable for x86, wrt bug #543858
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xmlgraphics-commons-1.5.ebuild:
   Stable for amd64, wrt bug #543858
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 84174a8ac6a3..c42da41b153c 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -7,23 +7,23 @@ DIST xmlgraphics-commons-1.3.1-src.tar.gz 751502 SHA256 1dd2acfe892af34196d5365a
 DIST xmlgraphics-commons-1.5-src.tar.gz 2597097 SHA256 f73322f1fafdcf5391d0411a377ac6c566e17536daf64b29f1370d6e718d0867 SHA512 af120dab18972f32e1b23f8bed1a9c519d7e2bcebd9c32fa77db61394f31a5821d909ddfe0e9a27cda7fcdf44966cf2576a94fc7c9af047f66c4081b8c35f398 WHIRLPOOL 043d57d08945713e3a14c28274551ac8cd76890f09b52ff1774f6201619792dddbcd827e55680a72b8bb711060ee6d6d270056846f53e35aaee2506052a52eb4
 EBUILD xmlgraphics-commons-1.2-r1.ebuild 2269 SHA256 e45942489298bf21418fbb44aea86fb63a3b00eff0296f4d82f4c0fb1b989d79 SHA512 8076b28f256569a4ea7a5bfb2d09c6fb13de1190a2c6f8c3ecf0dd61697c2912829a45474154f50afb7749c3ba29d8b6f2aa0ed28ba7dd3a1a8eaa2a6ba57e08 WHIRLPOOL 688e660bad3e402f0235bf5ce46ae1c188618804baaadbc096068cca45fca3216014e477e91ce01b715502ed15c3ebe50ec983f94a1dff6debd10911e589928f
 EBUILD xmlgraphics-commons-1.3.1.ebuild 2177 SHA256 eee79ed5ab1368b4f59433bec6303cad2c74285fcc8781d4390099f184ceab26 SHA512 7c7381c92a2bd109fdd4e63b5c66222efef73b4079da77b2e0f88ecd1618a71fc4dcd2ed938de756d62a74f4b76bb74df87e90d82dea48b3a6be45b49f790fcc WHIRLPOOL ec4a98bb289e95122e0756c7a2069239ccf7573a6d2e4595aecec718d84eb139f6d9daa5f21c71925bb0279b7384d7bdad36ca996fb0b70378a328b1aa1cde26
-EBUILD xmlgraphics-commons-1.5.ebuild 1776 SHA256 62d439045a87884d74a777a6f4ea7f71e666fbf63f8e737e6f95977b05d248e3 SHA512 acd13826f8f67fb979331bac34346f94ac3e90920a883d95dd794c505e120940242bfd723a587be672d67e2feb41e16a943435101a0614fc0b98e8145012eb5a WHIRLPOOL eb6206184bc10947419a009a8cb4e914428c1d59b2a298f9e0df7bcbbeff111e28421e98d6c762ec3c4ac715e8c8016d7749bec9178179707f417ad5313201ea
-MISC ChangeLog 4193 SHA256 e88109ec36abd205b8ee7c82901c25bb587795fe3a7695e60248d428574dbc55 SHA512 ffe3ce146c1d548bf807dfe8e2654c28a294a6916f93958b4d370a0f17f42f093903ab30c77a14b5e85886e4cc43199506a7e5dad05a6e1f3fde59984be58544 WHIRLPOOL 5dfea75cf17e534027ed54d4f9f3c3ea4b9ee1894e13ad2d901500b814ba62970305b99ca023ed30a2843127e1f76054d9a2802fdc32a2bf8db5a35fab2686ac
+EBUILD xmlgraphics-commons-1.5.ebuild 1775 SHA256 5ddffea18b3743765ac308d5f710d9b5a9eb075b5befdda65eff4f8f89cf1e3e SHA512 fbcc71299ab6538425b0a8ea60db7a607c5a13b175e762900739ef861fb23914d584440d56132cbbe3d1800dc5eda89d1349df24c7435a01175e661846993365 WHIRLPOOL b9d0f35155e2c411fbf5e5396a3a4a0d805fe98abc8851c4f3f816e9c883aae5b574bbf7a77b110ce3e73be8fd24be3305e32776c3b246112a90398aacc4b1f6
+MISC ChangeLog 4309 SHA256 0d7fb5ff8b91cba56862fe04480721604f87c695513bfdd90a882196091665eb SHA512 3168b00321604694264be06fe700c342c20046023e96674162ffff50749861c139bbdb7d4c3964b7272a15f842b31a88ad804e33d60aff8e5912def1b91485ce WHIRLPOOL e1c17fd73e67ab96786a08c08d6a7bf0366ce8c4fee393c3a48a8b5c3f012df2536c5c19703e405aaa1abc4ee48fd1142e296edf4c6342b93731e05b9cdebf38
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf83KAAoJELp701BxlEWfO0gP/0/o6TRqlFoDW5qQ07+SSCJs
-YHF1RZ92g/oCaW4KZ4FuyR5WfB4773d6banV5gj1DMkkvv1AO/Vh9bBrdjjVtV9u
-P6dnO32Jll4JSlwQ06ZBYr+EDTVftw/gRK9vVhiEJqogc0HNB0FmhHHgUbmeVc4i
-khZ/OcSZENZDvROwyrqAArNVKdwX6UDNELE/3rvOT1CaUsFR9uPMkynju2SjvurY
-lzh+oE9EVMawLLMntlbRX2b7AwCcWYMGwyy2PvzFart8+QBAMYnUXUA8oPbTQvHI
-Omo7cvdNmu5JctddesH3gUCasxzS6h4yHOL2fUjnMbVZp3D22zcJbyzUkLKlqkFV
-1StuGvIQdPMleWkRlvUFjXyO9Wob4Cpc9zY+hH8XIhgiDekOCqH6MNGE75sAhTt3
-xZqag8Qyuy8HK+KiGwFqu/Ba4PtfzUinchhbwIneUdT/NzIkjl7WOvui0xLdH/PC
-/o3whhEcIAskO1cqGmHQJyLuTbp8q4S5tUwTL9dF5Xs3TQ2u70VVbkEM13F8E6Kj
-UMpWBP2D9rIrQBdd9//zqmYBtkLJb8IIxviVQtbbAE7uKZaY2twkNSOy7KfJxVQG
-0mimawtkNJxGMVFU4LbnxrCAdmwKcbHweoP16o03RiffhxH7PDHe/q6riS1r6VsJ
-rLiOyoP6ArtZaPw1tSVx
-=aViv
+iQIcBAEBCAAGBQJVgSJbAAoJELp701BxlEWfKaQP/jbmN+TaQelRXCvf7tFl2Uux
+1oUiRAmtIqpoCiiZfv4hqvLkIy6y6rZNcXlvXkwXWg15hwJlXKxkEI80E+YyDJ/M
+jx7tQ+19/BIuWYaaBKqV0x3SA4FBxM6PtBbC6z57140R3RttKtm2d5mqnKbwmlgH
+lS/FkfO5BkleXDIMTF2rckWNzc8H2y1okhDv/wWT7GCYte9xWcDtDx5NYqNfTxh5
+QvHzBp30zj20dJ4NcH66hdwjHomHZMgeeUi9l68hv9deh6HMyoXMeq72yibkgJg1
+T9WlMEvFtUeeB/WSPJbVBcH7ZqEq0DtlWPQov+Yac82g8eCEAk8VuAsZtNrsc38Y
+jplkg6/liP7qdtKlPAwIUU7jSpfk+6UE2WwUS5yqV+G4sTimDJ6v2LuZb2hatuQy
+NUIROPlVp9FKOk8/V4UEB2bR5ID76gqZuP6gASNUaA3mCrWhvm6H49FIcSsR6KGp
+6rpWmCU0L5esHGaNg5apu8RT94dBmjY1sMmt7jIAx5FbaQtty8/aCePjUm0zto5E
+nu8crD3LHvc++mnT+cccwjANwXd1Ct4Ix0cpsa6qg9+tK2WWzeXQ98BltS/49F1Y
+FuKW9XbJ7PoufGFkrafhklulaOzF34P5HJPJk3zh64Y994vQ7JvDNxPtZirdB0AX
+NNV6X5vhu9ERFPTYvkvC
+=c/X3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
index 40708795bc1f..344580353f02 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild,v 1.3 2015/06/16 07:18:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild,v 1.4 2015/06/17 07:31:39 ago Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.5"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 CDEPEND="dev-java/commons-io:1
 	>=dev-java/commons-logging-1:0"
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 2940024acfce..403e3d1e6dd7 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.471 2015/06/13 08:52:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.474 2015/06/17 14:37:41 keri Exp $
+
+*swi-prolog-7.3.2 (17 Jun 2015)
+
+  17 Jun 2015; <keri@gentoo.org> +swi-prolog-7.3.2.ebuild:
+  Bump 7.3 development version
+
+  17 Jun 2015; <keri@gentoo.org> -swi-prolog-7.1.36.ebuild,
+  -swi-prolog-7.1.37.ebuild:
+  Remove old 7.1 development versions
+
+*swi-prolog-7.2.0 (17 Jun 2015)
+
+  17 Jun 2015; <keri@gentoo.org> +swi-prolog-7.2.0.ebuild:
+  Add new 7.2 version
 
 *swi-prolog-7.3.1 (13 Jun 2015)
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 6ac4ed634ed6..827fb29f021b 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA256
 
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
-DIST pl-7.1.36.tar.gz 16190817 SHA256 ba55f632dde6c70d3325dfa19a77ff6419fb67b3e91c32b89524299730040f3e SHA512 81c1722d15f31df48643bbcffb687b8fc9cae3e2f4a307b9c84a9fa0570e99ad46e18be2a2e74f8ce784e3676dae8ff14dc5d16acd15092a79ae86f8ee489692 WHIRLPOOL f1aca4e98d80024c6928dbddb23ac8433ce4728e320fb978bfa13280fad673ec386b6861992961524974d7085700fd471a2266f5c036f7ca808dde46f38fa737
-DIST pl-7.1.37.tar.gz 16195382 SHA256 50ab1b6a53391d902e8ec5c84d0ca30b6b9820c819febad5fc00ef3aeb7f26c3 SHA512 ad376858070be8c94470779d96561ee7d0cdca3c75fe89ac5415ebb3e30bde4d5a3dbf619774c0827154a66344a734af9b72ea511b143742682d7b7814a2c6a8 WHIRLPOOL c5b58e0ae8e20a17972a56b1f54ad2ed0c00f095549ae6b0bb8a7995ce741f9dc3b27ce49b89bac9ac341daf6ac47ba5e4fe7f3f5cecdc34d833201f8696a52a
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.1.36-gentoo-patchset-0.tar.gz 1634 SHA256 117c05d8db456ccd888a0444fe0829289985b9aefa17a5d882ba4b55e7e8d61f SHA512 b0116038415118a8f4a3a8c3d8984d07a4f61dbb43be1d87a46bc01f39f606e95368e5ba5c9b6a2150d8237fefe12ac6d46c867fcad80da96c662bae0ce5bc16 WHIRLPOOL 8207abddb6a264dedddf110a62ef856e0c33b77c9c6e9ce00019bc9e296995645b7b29beb61079a59278d1efe08c8943c60790fedcc280907020df5624e7003b
-DIST swi-prolog-7.1.37-gentoo-patchset-0.tar.gz 1638 SHA256 a903f66bebe9cb9125ba5d038deb1af708943c812dd1b8e3b94d428ad18fefd7 SHA512 93242a468df9ed70fece4bd527124a4ba8599cb8ad99ae765cdcac42b474248becf924a20e2d830679c4f4f6aa72f6f6dfa3de8d98ec43626c06b2073615d6ce WHIRLPOOL 88368c910e51593ae8af99c3c399d49a720d25ceb3ccebd226dfcd91c2788d92c7c022e7cd37225724d74aa87a2ce1976c218c6083a54d3b7f253bcfa7c102f4
+DIST swi-prolog-7.2.0-gentoo-patchset-0.tar.gz 1629 SHA256 b41a9c416ea0976c1a5f49d6d10090fa8ac41a6fe82982410fec0f09e73e09f0 SHA512 35449b56aa671ca937b2ee0e40ab7b19cd5a1b68277084a22c06c9e00f1318ab4d6603993b4aa44e9a6d8ab1418661a4d409160b93db04b7ca6e7c199831348e WHIRLPOOL 8a46b84865a2da2f315bf877cc1e464b59abc2891a91a5ee20530af39b353127c9d5ffabc4dea076137d619354dff259524ca28f0d4407c165be08e1b5c6fd38
 DIST swi-prolog-7.3.0-gentoo-patchset-0.tar.gz 1891 SHA256 18c107c0f8f7473762254514c25e1cb0edf84b2aff5d79ef14dde5f2719d6a1a SHA512 b56e9fd33d495f83128d0f39ff31a5e783c11da2f7e0ed00e98284d7c86ccc88c22c0a6d43a5620870d14ac26aa4aee638bc0d4246bda104ce3b7d73ee2e678d WHIRLPOOL f2f5910215f355791b964d19227f16f0f296e4a129fe904c558e878368556e04ee5996be7e9d7eba66300cc3b661ad819f96842bf6f511cf9abdd24399f168d2
 DIST swi-prolog-7.3.1-gentoo-patchset-0.tar.gz 1627 SHA256 eb043742ed8d7cd0f8a0da39ed537fe7f07c6cf12130126ce2724b2b356f116e SHA512 1bdc3f3424b4f077fabab465a9f4b6dff49170664256430cc60106abb52d6d227928ff3d219c60c708c728e5cd587c37f0cc42b7ad500ce840abf7cf48eee384 WHIRLPOOL e409cc85d19c8d68f2afa35820fe3f429d49555de8607426491bf21a95083600c5465765e17eb6d6b28d9819f730780c12566b671b4a87e648c90bc43997e04e
+DIST swi-prolog-7.3.2-gentoo-patchset-0.tar.gz 1628 SHA256 0c019e7bb12d6c81aab94f5940577bc354f6283933da9975d1bedad76582ffea SHA512 66d87771af1c205e79210fe5e41a057b600d5910c0d413adf84147a10664e7f0caa18939f8707e810563785ce932423581f8b4c312f72174d12c76a7e8194d9b WHIRLPOOL 857a1f702bb26e0b1efcb8e1f5d7351216e253f1260d0a4652489074d0d4716452f3fd0b970f9c26cea3e1c9af26d0029284c644c523d081404f451d5d1e9e2b
+DIST swipl-7.2.0.tar.gz 16211509 SHA256 801423b8293d08b96b575ffa96d91cce3acf2473f04c23d58657dd668287f8cb SHA512 94c89e7f76ff545821e2e984a630d37863f305fe71f0cc79a3fd4e41e1b69f4a74f924a4f429d054480b2dd030ceba5fc65fefb75933cf19aeb18c0a03863bf6 WHIRLPOOL 815d1a900a501ad8d9cb843bd42bf1756f1d5c70d994637960c7849140b3ab414b26da06c85998870027ec27678050a68d3480bb81ed23978be9e10e7920e631
 DIST swipl-7.3.0.tar.gz 16202647 SHA256 c2b66b1ffc2ba84a63159720ec920f75e45730148f8ec0e3535e523a473a3566 SHA512 4d6b332234e425dc2f69f24440316fbbaa44cdd4160b9a5d59e2d719c6b9d7e5074d834e3beccdfa1e6c4d802f8632b03a7346919850259e612696df543c2454 WHIRLPOOL 5f6655c5924236c7bd946dc6cf66ef55f21809029c58af9e2e5866bae71a5a4f10d48f7ee3a8fef893171908f69f89c929f805e0ceba7f4d14454acb0cae06d6
 DIST swipl-7.3.1.tar.gz 16212749 SHA256 9a62b048f604af710c03a2055e3382c84c9f2c342c6fb8fa257332ede6763062 SHA512 152f1162ce8397b26387140f76e57036956f0de9841e8c543f59cefb86b50b66e2d90284f22b1249d2be6d8a0b9bedbddda96b2c54f0181ae82085ec883a39cc WHIRLPOOL 274ca1e0ab623461b07278927115707e4fca94d1246efe8d376feb735b07b0938c9c6e46745fa8cb7188fdd28f5f7e824f39f8b6f209df07bf5407079c70c29e
+DIST swipl-7.3.2.tar.gz 16172495 SHA256 8d8a503b1f36a8635afb7614219d64f4a2f43052bc589de2adbe7f995ec6cc6e SHA512 e74c3fa7e29ea2a4121a839c8d77229913c94367077affb991ae7543ec2da84feef724376a9f47c880ad131b1f43a8f7905722f382b7aab4d6f2f268056ae2c3 WHIRLPOOL 78104539d3210a8296e45ff48b13dcbf958ead19909331b4edb78722915d9ae87af959917f3ebcc62b888f44632c38dfbc59e0bae02128b7f6fa6946a3a5fe72
 EBUILD swi-prolog-6.6.6.ebuild 2902 SHA256 fe75144dde8d9ad626568cd6b11f563932ba3457e9c473ce3584f0a04fcb63c7 SHA512 3ae6cbc08524ebcec433b9e1c498b3c3d651f6ad73b64a8193b57f36d4443c804c3e3ce5a83d6be909b4ba274462a786759cd2fee32417c7a412778a107b3974 WHIRLPOOL d5640bdce0c8cf0541a996e1985cbdfbe0abcd1ae1f2df1c9bcfac84dbb9fb7f4636df184d899d2db1427f2193e1937a3cb86d1fa678a48b157e6017439146aa
-EBUILD swi-prolog-7.1.36.ebuild 3086 SHA256 29bb1fb903e9eb1af47eacf42381bdff287ea3b406f5ae150bf24dae545172d0 SHA512 acac2e798b2c0fc57aabd9ddd191b1b03d8388f388f8f82e5a8680ff3c063244e1e9311675a20bac95de5392d90cc287f14b801bbe42d4d9e42fd660450e886d WHIRLPOOL f29dd091b8e6902ca342d7462aa230a1232b7f835775ab85bb85a95c87861c40b6d81d400e3850832888323d200dc5cf69e5e7101d0f1370d7cf89dce816709e
-EBUILD swi-prolog-7.1.37.ebuild 3086 SHA256 4999284a256e533840abf02fad675fd54a35425b5991a1a5289271c67a3c118a SHA512 a63520f80e955e04769612348450c018dcaf5cf4e0b5d525409b4d5fb6ffef143109edfcdfd8a47cf38a39d2579aaa0c268752b34073c2871d4f7cefba4f4640 WHIRLPOOL 8ec6ba800312c6910d523b4922e2c95954464a54dcfaf8972f06ba79aa07cb9a61cf59e6840120e29b8ea72374ed85642eaa27054903712ae9c54145978ef7b7
+EBUILD swi-prolog-7.2.0.ebuild 3092 SHA256 b95d2c970c19fb1787a1ca44fdaac81c8854c5acf717c5be406fc50142effa20 SHA512 77693bc2c66cbd8086ca341cf22efe55afc89a13c1062b471559472a24aa5ba9ab08b92728449ddecdea96346c579a9e7eb106311d2bca2a0d52cab2d41dfd22 WHIRLPOOL 28dc7d3b4e58021e1b316fd597880b80cf2799be1a7446cca63c471d9596708c54a443ba3ed2804bb216e142ac53a318d2e1cbedbe74c7d7c7980a3d53ad3cdb
 EBUILD swi-prolog-7.3.0.ebuild 3091 SHA256 e265a7253a13fc6e3bba413e555a229ac36f55b4f29f4141c78905bf54ef5c6a SHA512 cc77773d3514caf98a4aaee6085f2f1a48f71c5f1f332f86f6ce9a75b41a8b691a8a0cd6b3b08b4ceb83b6bb4a49d74e040f50eafe261b140243e2434db69b27 WHIRLPOOL 9ea8f299c4601d5159b3f24f9a33f490c2fec4050737fe96b5e5e502d916b6ed9d31dbfb1edf6aad4fc372826dc88acbed99dca9a545255f5651c0e248c1fb61
 EBUILD swi-prolog-7.3.1.ebuild 3091 SHA256 c39cff82ef68c5999357c3ee502a5f278eb64bcee4afe2aca67ba4452916ca13 SHA512 6e137441703adc80a3fbc1454c107c7b0fa32a1cb39649031df951343697f710b6950f1978a5022030b949d3335a8e061dd97cc9f1cfe00237291f7084c54710 WHIRLPOOL 55f46094f2847675ce1385bc05d56fe67b48d768de49ede3448f1089f5a7aaae70802616893e5a949bf7ad1aa7a27151d338415f48931270cbf52ad1a2133ee7
-MISC ChangeLog 68950 SHA256 f9446cead793fa7f9dbd3bfe0d06ada4e1e354fc6f9964cca09f88ea71af97d6 SHA512 ba02766fb4af7e556815c44412714aaeb38d30f96ed66554d99b01f15518d45e030387b3ed7033a31506d23e9968294c5ece9a9e4e392c4ddeece717931dd398 WHIRLPOOL 4e8c418429ba2729836d9ca86fdbf1ce349b762557a193a23938de46fd2d8f89c149d61427651093fc11bbf3d6b85043255c3748848fe92b59231aa2ff1aa5aa
+EBUILD swi-prolog-7.3.2.ebuild 3091 SHA256 98c26c9ef52b9bfaa5be50856efe2ca99239ac8fad77b3c983b06f441b3dbaca SHA512 9bf04916a292fc12e2b874843fd86225f282bb869b4ecc0e59433f4a680f3d23693e2e3ba62ded6cc9494d75a9a7ddd505cae0ab3506c5ac38456d4153f614b3 WHIRLPOOL b3ce2c339b8ef4df71743c7a75bcfe91d10d52488b4495f1167b31413bbe7ae9e374431a044d29d280331555b5165a9b51da1c8e21fa75a33f2e9c6aa460ada1
+MISC ChangeLog 69317 SHA256 80118d295a7ecbb08a22799ba71d7a33af02213b03d64bf8ca63fc53d7a6174f SHA512 1eda4016227fc574c2cd3414cbdfcfff4bf2f4462ed0f062f7b1ca6ded0a2e977c025890acfa8cb44191189ca894c2ca2e5880fa654fbf276392d33f8fee27f6 WHIRLPOOL 0eb5ea132411b8ce49fbfb78ccb0cf22d0c1e9fae847bf95f71e291e6699c3be31fa789c7ce0846e7152e1d743e1091f50cf2cbc8a6fa4af40a15bbec5f81a4e
 MISC metadata.xml 236 SHA256 cfc0f56c64161129f17e853433bcc92a212ae64ffe70f627ae6e24fd8cc3520a SHA512 c542f8fdc8c524ba187f02788407dd31a87a37255166c6ef184409e1469288736420df4dd39f42bf57bf367532ba9607484a6228790f5e71c1ca7bfb56525194 WHIRLPOOL 472c63b815161c5e04903d12cc2b5f8d7edf56ebdbd5407581534f728b95dc063cdcf227579f75c7ff819d29bb2ba02ee3b79480f46d60aa4de17199163e1242
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV770gACgkQrwS/tqE49e29zgCgn21yW9uILNrJoAP23tlx8JEi
-914AoJLCmUJBEB0nBoaj6CAYWM58iBHE
-=QVxL
+iEYEAREIAAYFAlWBhi0ACgkQrwS/tqE49e1+lACfazcPF6FTj9bCS06SCfwFrrIY
+4EMAmwQ6wN2STAZeMksOZ8bXfdCdrxjd
+=JzPC
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.36.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
similarity index 94%
rename from dev-lang/swi-prolog/swi-prolog-7.1.36.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
index 4b9318e5e6b8..343c56b55d74 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.1.36.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.36.ebuild,v 1.1 2015/04/30 13:08:29 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild,v 1.1 2015/06/17 14:27:02 keri Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ PATCHSET_VER="0"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -25,7 +25,7 @@ RDEPEND="sys-libs/ncurses
 	readline? ( sys-libs/readline )
 	gmp? ( dev-libs/gmp )
 	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
+	java? ( >=virtual/jdk-1.5 )
 	X? (
 		virtual/jpeg
 		x11-libs/libX11
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
-S="${WORKDIR}/pl-${PV}"
+S="${WORKDIR}/swipl-${PV}"
 
 src_prepare() {
 	EPATCH_FORCE=yes
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.37.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.2.ebuild
similarity index 95%
rename from dev-lang/swi-prolog/swi-prolog-7.1.37.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.3.2.ebuild
index ee7ec2fff01f..934bc01d691c 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.1.37.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.37.ebuild,v 1.1 2015/04/30 13:08:29 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.3.2.ebuild,v 1.1 2015/06/17 14:37:41 keri Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ PATCHSET_VER="0"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
 	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
-S="${WORKDIR}/pl-${PV}"
+S="${WORKDIR}/swipl-${PV}"
 
 src_prepare() {
 	EPATCH_FORCE=yes
diff --git a/dev-libs/busybee/ChangeLog b/dev-libs/busybee/ChangeLog
index 668640f10a12..d66e6b26b918 100644
--- a/dev-libs/busybee/ChangeLog
+++ b/dev-libs/busybee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/busybee
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/ChangeLog,v 1.12 2015/05/28 09:15:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/ChangeLog,v 1.13 2015/06/18 02:59:00 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> -busybee-0.1.0.ebuild,
+  -busybee-0.4.0.ebuild, -busybee-0.4.1.ebuild, -busybee-0.5.0.ebuild,
+  -busybee-0.5.1.ebuild:
+  Remove old
 
 *busybee-0.6.0 (28 May 2015)
 
diff --git a/dev-libs/busybee/Manifest b/dev-libs/busybee/Manifest
index a23d0010afa6..c1a2da7d2eec 100644
--- a/dev-libs/busybee/Manifest
+++ b/dev-libs/busybee/Manifest
@@ -1,16 +1,6 @@
-DIST busybee-0.1.0.tar.gz 328831 SHA256 7837c9f66cba77be904cb7ab9da5d35e6acf2cfb23bac20b9c5d17d4b5201398 SHA512 0844f21c0e73f7a9843b71a7f05869b179f19b79c046909205357a95a1865d02079d8c9b3517cf32a6e1c187c91552d68b245cb23ab91782345d6a9172dd123c WHIRLPOOL af631df9047088ab59bb6176727947265514434c7287f5eaaac326d318cbedbbce3eefa9841bd0f38080267486cc91032e11e129279b72beb3e044b2773f3919
-DIST busybee-0.4.0.tar.gz 360351 SHA256 e5d307785f7ea8dff71b605d289a3439b14f0ba6d40535b34201d4b356da0f03 SHA512 8e1cd94c67aaa340a24fab81549b8f91c4882abe4141b4d8888bc3b2c8efca720a52946cf7b60f168dadcf898ef07169736d825dda0e515a27febc9fae5a25bb WHIRLPOOL 7bcf75f9b2fc72858088964ba54d56de7674eb0c191816fd9e0c370f984412e6258d35b74d544a4102b3c38853065fc534d8f314f57a36f69c0cfaf42ab83bd6
-DIST busybee-0.4.1.tar.gz 359163 SHA256 601e3146729406fd6abb17d1c98e71c79ceebd84447ac60e45d9a83367dc148a SHA512 e013b78b4b36e468de80aaa03d9214730f741a2acbfc35b33d6ba114336a10d6d5fb30c9a03567ade680121b1c56fa50e404595854bf885ec50d4e5039b71eeb WHIRLPOOL ce2e51aa9bbf811c0e5aaaeafa8b6059545c69136b101c1387a4fe879b1bfddf562a64430dc35755c4b66fe3f5bf17d3262f3b7e16ee1145231d88cc1da40f12
-DIST busybee-0.5.0.tar.gz 359613 SHA256 cb0662d04783ad2bb9facba4dd58fe7a35913f786c730dc36ebe8c00b5fe3db7 SHA512 2902a4f4db2ab1750ff95d79c820ab423f1deecb275c331822969f3fd2a2d8ca9e42b024d39d91dc00a99ef6f3097a8e4ce443cf0afe186101b657a24b026191 WHIRLPOOL f4d8c7217b39eb305c48af9a63facf13c4888d8bbdc606794fd1e629db59308df1ff7fbb953868fb61463245835eed8591bb3f94d3132bb723f04247a64f1034
-DIST busybee-0.5.1.tar.gz 359606 SHA256 3479e8fd7f7f61bf5b48ebb6de004e902c2d9adba66e06256c16b7ddd617cd7e SHA512 60aac639e05e7e271a6078a5de68a263888273d9a2766c5db768480c4713d92485ec8a81fb6e0254a611d94b4627696e9ffe10d084267e3072b9ed56c9813f61 WHIRLPOOL c3cbc68062c2d33e835dc63702f075c98da262879403ccb86660e6cbf2db841c1ff4098c0c534d280439c374b6b454ad25393bfc0f1895766d8d9ac4b0be876e
 DIST busybee-0.5.2.tar.gz 359617 SHA256 e7e5ab9faa0848d51a4bdece2951648ea9ee4667c61646e5c7ece118846f5e0f SHA512 f6eba1e6d9f78dbb048214766105829eae53d060d247ac316e931ac887454f4fcf2217c01b4b6d61108de8d837d0a6861951aeda5f8a6a93de6b145247aaeac8 WHIRLPOOL b738390055c4a3e5fe7cbfd41e73a6d3612e8ede13e12c593efdcb1f43222029fb31e6ccc46d8cdefdccccf738273fdc45947f090102ccfba53d641096ee5bc6
 DIST busybee-0.6.0.tar.gz 364241 SHA256 87ee2cdab877a5cb7641fd7e074605d2c1a42b8189b43762adcb16c8a56e01bf SHA512 3c4376d008ae5028773e43bfc9dcf651ed0ed0134370ae763799af0a91e693ab13384915d655a342009520ce346615b0b006b1cbc0cd30b898137bb2567c87af WHIRLPOOL bd80c51f82585a329834a794b2fcf4e92ff7ca84d84e1cd9d9af52aa1f12fc3f82d664fe13f2435889eaf3a725e923b108327cb077eef711959547beb053fce7
-EBUILD busybee-0.1.0.ebuild 494 SHA256 f5257e111c63d8e4157ae6deaef4e6573e67e1fbb0f453167aa2ca7c1f5c36f9 SHA512 75fe6eb4ae067d7d0c8d6c639f58904a5728617c5a8339517be16c7b0d3400124efaa03db5e0b78f8f7f3db286a77b78d6a8a2bf4d865159624c637dc1d57f5a WHIRLPOOL 36dcf88eb55f84db0e060f57d42e9ade305145fae1381daebdc4b9d7ad6366877d9a2b91f5c3daa3f05e06c584823014578df26afa7dc149c03fa65132ef5b84
-EBUILD busybee-0.4.0.ebuild 510 SHA256 9e8bf851ec8326d99eba7242b9df57756df701a0b9e2ecc975b7bfd5be67f6aa SHA512 8846a2f5d2dd282cad97e8a92cd72f47e4e616c437466fc4db159f5ea3aaa59a913d7b8a167d73e76d841404671d2f16df542573508e4626a4d6aab4228c3a6b WHIRLPOOL 6469fcaa365acf515a66024927d6493a7e051dfa7f4d8d0b330de0553726327975add5ff08ba626fb066114f9f5392bee58dc097766740a788010c85a6d089bd
-EBUILD busybee-0.4.1.ebuild 510 SHA256 86e1a07f4722263a4308a72b8e3d77d561820c78bd73b4e7c057a0e5e6bbea54 SHA512 c591d528b8e9f49eee603b68ef4fce344b22e3fe519441924ad1898627da1b94f8f44239e7f213b8b2a66429e0a1e64fc74f0791524048067069fe5b3ef844eb WHIRLPOOL c1f9d3014e78ae6a76f22166a2b4508b40b684e3fb0e2f8c00e7e235b57ea0286facf6cf9d152b2fa3097c77868f54bdca15da7f5420784c70c10da81e210303
-EBUILD busybee-0.5.0.ebuild 510 SHA256 a18d0b3d7732f4bfef04d5e24bcab1591218d4dc6a762809997cb35bfcc781c9 SHA512 1669601824f1b9786eb41b7be1138583af797d5811dc45e44f8602a95878b52499214c38f612169f4980e4d2d20ff625d30793e5dd1787de33f57878f7a34ff2 WHIRLPOOL 6c57222641d59a44202eb980a7b0ee81d6874f2cf72545cd02fa33a0d171f3c3c1b467b574923a9a873fb64674de18f0511c3b819c6fdfa0c6fed960f5abd3c2
-EBUILD busybee-0.5.1.ebuild 510 SHA256 a1c3b3d454df3a0ce4bb9350faab475f9a215b07b10a2863c025f3249166629c SHA512 e2eeb2c93d209d6af644ed6e08cd0a54d36cd5ed2b6bff543c72748007cbb68c1f4a6d1d885995464d7e286762a80472d52c99caa7b419904e6fb38a89d621d2 WHIRLPOOL e419db7d99cc17280b8beae8419cd1d152731642d85c9a3d2605d38af2b6d6aab68cf5b06aa6649c18cedc0d9342d78359cf2028c4fff59c9b281b2f6b97e004
 EBUILD busybee-0.5.2.ebuild 510 SHA256 33708ec48a5a89828859e5718a6fd0f4e7a04ba4ec05260a6d91c4c25fe56fa3 SHA512 c17c7f43dfefc354da791bd664e623a5dbda4d0aee882f6e48ff49b7af17123f22bdde2512492ccd83511b7dae6c4629f5405f595fc449cc0a937e3600baa1bf WHIRLPOOL b74c32ab8486d01dbf8fef18bd7a75d1767542eaea8f2b1135b09c607b0d412a68cdb2df316f4f84882d8a49b3864f7de5d21d94a697138018c8fdec36ebf89a
 EBUILD busybee-0.6.0.ebuild 510 SHA256 1d4b73551b3333b346d768b8d890817070ba957a02537d0eeae982935078b4c2 SHA512 45a020f5e03199ae993d46159d3aaba743e432b3868eb0243c4ab5f17889cf94b016256fb8d2a390b921afa02f1249a05c118f907d85155a9f3b0cbbdce3ece5 WHIRLPOOL cf1f5655eb91612db48276787dce12c9c0ad5c7cc3e4add298187239b10c7caa349b1dece0bc502e8df7602fdf504a059e2ec56a8d4c5767a11446a5c5057a44
-MISC ChangeLog 1636 SHA256 ad5924e257808b5313d81db2584c75b95bc1599fe8ec1f9899aa14321b2ef76b SHA512 1321054b39750d28aa4488f257714b299329d4edfd9863293b277f11a316b5079b913fff1973e8ad4b2a8d5453ee1aa99dca25cc68cf6ad7cb6119d6ebd4324b WHIRLPOOL f72d12a1c31ab6e7d371c96b938072f22b02e3e9dc8558275d4bfad047f82a003e21543882ef8c19b8aa826b5db86a524709d6983bfb775e868e30a36092f4cc
+MISC ChangeLog 1819 SHA256 93a9ff2aa15d1ba497d99885b9f0019c505c36057180709271b16cd3b9b3eac9 SHA512 3fea45bc455affdff920ff8064c26592029cf42c3f6c38a7a0fee64a95ee988b33217de38abd173ac99dec70e64f6a89d4defa3cdb3601f6b2eb2c55984164bb WHIRLPOOL 0e28486ee0e36cd987f3a596cb083db7445db1bd2e9ff6c3743dcab5d57273d0f3ab5aadc2b3b761a96a91f499aace2763d9e39ce7bf276a2314e57a57e48050
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-libs/busybee/busybee-0.1.0.ebuild b/dev-libs/busybee/busybee-0.1.0.ebuild
deleted file mode 100644
index 21e8477cb4f6..000000000000
--- a/dev-libs/busybee/busybee-0.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/busybee-0.1.0.ebuild,v 1.1 2012/08/18 14:10:23 patrick Exp $
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND="dev-libs/libpo6
-	dev-libs/libe"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.4.0.ebuild b/dev-libs/busybee/busybee-0.4.0.ebuild
deleted file mode 100644
index b73d57cf2ee1..000000000000
--- a/dev-libs/busybee/busybee-0.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/busybee-0.4.0.ebuild,v 1.1 2013/11/20 03:47:54 patrick Exp $
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.4.1.ebuild b/dev-libs/busybee/busybee-0.4.1.ebuild
deleted file mode 100644
index 6cea50a2213c..000000000000
--- a/dev-libs/busybee/busybee-0.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/busybee-0.4.1.ebuild,v 1.1 2014/02/21 02:53:14 patrick Exp $
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.5.0.ebuild b/dev-libs/busybee/busybee-0.5.0.ebuild
deleted file mode 100644
index a9683cc63623..000000000000
--- a/dev-libs/busybee/busybee-0.5.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/busybee-0.5.0.ebuild,v 1.1 2014/05/22 08:17:54 patrick Exp $
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.5.1.ebuild b/dev-libs/busybee/busybee-0.5.1.ebuild
deleted file mode 100644
index 99c113842565..000000000000
--- a/dev-libs/busybee/busybee-0.5.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/busybee/busybee-0.5.1.ebuild,v 1.1 2014/08/25 05:58:37 patrick Exp $
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/hyperleveldb/ChangeLog b/dev-libs/hyperleveldb/ChangeLog
index 3fdec46b1b0a..daa0118f0e5e 100644
--- a/dev-libs/hyperleveldb/ChangeLog
+++ b/dev-libs/hyperleveldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/hyperleveldb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyperleveldb/ChangeLog,v 1.8 2015/05/29 23:29:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyperleveldb/ChangeLog,v 1.9 2015/06/18 03:00:28 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> -hyperleveldb-1.2.0.ebuild,
+  -hyperleveldb-1.2.1.ebuild:
+  Remove old
 
   29 May 2015; Patrick Lauer <patrick@gentoo.org> -hyperleveldb-1.0.0.ebuild,
   -hyperleveldb-1.0.1.ebuild, -hyperleveldb-1.0.2.ebuild,
diff --git a/dev-libs/hyperleveldb/Manifest b/dev-libs/hyperleveldb/Manifest
index 1776c8c6bbb6..bdcfe3a4d5d2 100644
--- a/dev-libs/hyperleveldb/Manifest
+++ b/dev-libs/hyperleveldb/Manifest
@@ -1,9 +1,5 @@
 AUX snappy.patch 1092 SHA256 e9b4f95e16cb1e4a890b0b2b0bdec07de930b4cc855acc4644d0057942e6eda0 SHA512 e6cb0bbfae14637a7ff084100c5347fafdf2c87ca5bc32457be9bc65c45cc79986ac70f2d23881cf5691e987853d6934dc2e929ad008e246809c7fbc3cf2c45d WHIRLPOOL a58476ab70b1d4ad703f11f614c3f499d01edd093a40076d0b6710189c05028e9ce1d8327f08562f80f5900230de42e189efa10cc566ffd0bf9b11e25f9e34fe
-DIST hyperleveldb-1.2.0.tar.gz 584875 SHA256 2f1aace7719979ce6885703c1e1ab23492bfb844eddd4100db877facb68d468b SHA512 5e1446abf66ae84dd3232bffa7e69edf88503d54da82c4f08ef2d18e83e4adbc5929a5c77ef337fe871730a9c3300684cc94558ad474997415ec86d41715d397 WHIRLPOOL 6e00f36f3f611258059be747984262eb8d3f9872579702f90113d47b5e40fa628625ce8636ada5171f1ee767294d42753ba0de0bbf347c2bd66c6ab3eafa7f23
-DIST hyperleveldb-1.2.1.tar.gz 584889 SHA256 244559f63be8ee60fe2deac25defe23b3ba32873007f24d5a07445979ee7254f SHA512 a03eb9ce60c72391abf0f0223a10de539340937efd9f7a7d4167ad8df0fdf84b8ecdca4bce2e4a78b813a2e1430a84ed046af7e5529fb8462f3d1d74b40c3aaa WHIRLPOOL 71332fbe21c136b97660f6d9f0c1fc6210a71f07fb715554e24992513c3bc0aa46333e05460b449bcfb58c02162942798d93a7b18f68aa2207101c664a3bb177
 DIST hyperleveldb-1.2.2.tar.gz 584955 SHA256 1e03ac6ebe053128978cefe09ae3316f728ebbc186c22316d826ec185cffdf34 SHA512 6fb7a84ec237a5a1a3f5f7c90965a0b0661a6143722a159a189c4c54231d8c5746dcbb76713fbe9b8b2529467f287365d30dd7115fb5c1ef54f864686a709eb2 WHIRLPOOL a9ea63100b75a508b4cee590a6487231b20a85bfdae584d33375393e7f78e72120d6dd0fc0d96b5e22ad46a1461d5a1270c250b006187b035092ba6bad7801d5
-EBUILD hyperleveldb-1.2.0.ebuild 595 SHA256 8bd1c20bca58c990e9499e649c309121f13b618ff88ea6205d9aabdd866f9de3 SHA512 a3d06a0736628f13633faafcfaf4c239c333a3e6d322fc2e31245297e00d7d22dbf568010e530617555b5139c61e7c08640a0f9e4c3fba47d2932594fe157309 WHIRLPOOL 0c9d12bd6414ef75558985e340234b621be88b1029180c6a348ff8a76bfa8051105191425e7b4ba1d4c42a96b40c988db568360232e6db4581aa14971b5fca41
-EBUILD hyperleveldb-1.2.1.ebuild 595 SHA256 21ed28e701752138ce8bfb412e7cc8b70d9d72233f875785b9811afc2562ce34 SHA512 c254a14557d9ad9783fc2571b378d9ad0712f21a0f8136ac25c14a2adeef1548337cabc7a33429e72cc5db3cc68e298ae1c0c806328bfda26a221423e6ff9620 WHIRLPOOL eb07258fcd352ae15d2e7db76c0ceab3447869140c13bef866d08e57bab1bdd3ac4d1e31e77bb6cbcbaeb3bff584051cc81c3746a355f01de53b4cdde9caa6d8
 EBUILD hyperleveldb-1.2.2.ebuild 595 SHA256 4d706ecd725d68a645ac705a30084a59c60bcb611e4f32f113660fce6394b0f4 SHA512 90577723a6aa80b185671a634ead1fe6d9e8e7ab9a295c2dfbe1c7c62054cf85022e176f4e51f5b347c6b23affcc155988fb2917137895cee1134a8520fe9562 WHIRLPOOL 2f7a9ae90b70512f4acd4525847ede3f574762856205790b8cfaec41fbbda21d7ba7b8d9a6dcf02a54666a88c0763718e8851e0dafe1fff62e755196bc881bb6
-MISC ChangeLog 1327 SHA256 84c19e8ac28dfd2847dd2a28c715fd1da957b500bfca3cd09f624f76609473b6 SHA512 2d3d8643e24ff68e510104eb7a8b5a9d976ff2ac0d4ce81b443d7bffa1403f7abc870021e8ccad1480d0efe669452ef414d5dc68b0d4f7744de9f4655acfc526 WHIRLPOOL 6f97fbeb854501fa70e63679fe40d079dbb7f74e3c46fb3c3bfcc77da6fe852122d89c18f77a55ad5ada1caa8129cb2f71f2671a3c56ff2f28ff095c890872b6
+MISC ChangeLog 1449 SHA256 b6c6d8cde9e00991c353e760b402b92ee65f9b1d4d81cf57a9a9fa8d303252ba SHA512 ee7a5e2b5b7fba167d5525d5b8bb1ab690b31071a6ed0a644cbd1c6ad2d0ae0556bbc427c90cc9b61d9cc66dceab62e9e802cc51be8dbd1e2aab4033c45b6baf WHIRLPOOL 88816ace7659d78da0e8e7fc4742298b72dc0206d4d64f3abe5ac451f32f52af0f272b9fe92ad50696e48561294629cb83e9713dc9549031b2b0a991c1e0e1e9
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.0.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.0.ebuild
deleted file mode 100644
index 7083f65c082c..000000000000
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyperleveldb/hyperleveldb-1.2.0.ebuild,v 1.1 2014/07/29 07:10:52 patrick Exp $
-
-EAPI=5
-
-WANT_AUTOMAKE="1.11"
-
-inherit eutils autotools
-
-DESCRIPTION="Hyperdex fork/extension of leveldb"
-HOMEPAGE="http://hyperdex.org/"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/leveldb[snappy]
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/snappy.patch"
-	eautoreconf
-}
diff --git a/dev-libs/hyperleveldb/hyperleveldb-1.2.1.ebuild b/dev-libs/hyperleveldb/hyperleveldb-1.2.1.ebuild
deleted file mode 100644
index 3d221501024e..000000000000
--- a/dev-libs/hyperleveldb/hyperleveldb-1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/hyperleveldb/hyperleveldb-1.2.1.ebuild,v 1.1 2014/08/25 06:09:23 patrick Exp $
-
-EAPI=5
-
-WANT_AUTOMAKE="1.11"
-
-inherit eutils autotools
-
-DESCRIPTION="Hyperdex fork/extension of leveldb"
-HOMEPAGE="http://hyperdex.org/"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/leveldb[snappy]
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/snappy.patch"
-	eautoreconf
-}
diff --git a/dev-libs/libe/ChangeLog b/dev-libs/libe/ChangeLog
index d7940451eb26..55e940d4fc4a 100644
--- a/dev-libs/libe/ChangeLog
+++ b/dev-libs/libe/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libe
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libe/ChangeLog,v 1.19 2015/05/29 23:32:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libe/ChangeLog,v 1.21 2015/06/18 02:54:05 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> -libe-0.10.0.ebuild:
+  Remove old
+
+*libe-0.10.1 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +libe-0.10.1.ebuild:
+  Bump
 
   29 May 2015; Patrick Lauer <patrick@gentoo.org> -libe-0.4.0.ebuild,
   -libe-0.4.1.ebuild, -libe-0.5.0.ebuild, -libe-0.6.0.ebuild,
diff --git a/dev-libs/libe/Manifest b/dev-libs/libe/Manifest
index 364ff95b0d33..31222777cf24 100644
--- a/dev-libs/libe/Manifest
+++ b/dev-libs/libe/Manifest
@@ -1,7 +1,7 @@
 AUX libe-getpid.patch 807 SHA256 8695351fdbfe76d573f7e0bff0d2b4c2e5b80bb7024f117cae5f4b2bb6928148 SHA512 e255295f660e3bc0d9f1436369186590c12edcf45e167230deb7a06adf30661a7a749166d53e191c51fbb2061f044f29626052dda8de5667fea6bec0772d8eb8 WHIRLPOOL 606b386b28d40adcddc8be75568844bd42a45707e3785614edff9f146319f944067c771025feedadd0e2de7a191cf32ad6466a1d50098982dbc4960f1ca4e656
-DIST libe-0.10.0.tar.gz 412609 SHA256 6ccec630ea0d15d7aaae12c2730d722503b7f11e08154afbcfedac19e2203abd SHA512 74d72c8ce223e1a208cbec6ec6cadd876ea33fb9ba453d3f5ecbf896a3ee0ce7bbe1a48559c20dbdfc91772b9e7bbf096bcff91a2f7594dffe7e7a6d63ed0831 WHIRLPOOL c794444d2a58b11d92b48073e484657b871601d26f5b614bb1158636f64612bf72a7dfc04e8deccb4f9c98c434c5e5ec94bddd367f6e9c97311359ec67ae7b36
+DIST libe-0.10.1.tar.gz 412727 SHA256 821f955e2eefce78218764a5830f04ead09107c6ec764ae0399c4b0f6c7e34ac SHA512 aa81d6740e46accd7bfc26fcf5b53c6cc43556b897f2692cff1db563c7a5869797c540669d3bc8b4a0aee9442a7b92ef6690fa8384bb3ef38aed40f065a5ab5f WHIRLPOOL b1faacfc4a392de136c8d2841b82404fc8e37a60333f1ac95c0d98496f2108b0b984ef7d91b420d460b28408143fc4bf9e37ff9d7a6940b004b899082e38f358
 DIST libe-0.9.0.tar.gz 411601 SHA256 c1b92dcfeee694038a8d16d43923bc7725a995d42f53f1da1efbad0e4ab479e3 SHA512 711097a59814b0dac9ca26dcbc30678060dd05d05e8f1a311b3f8b0dc67ef7d4e5d2b4150f51bd881acd4dfea067c79d37841d182881f1393a73cbc7beddc492 WHIRLPOOL 6fca4f4e5fc844b031a680f8cb224400a69b58a966cdf71cd060c408ec343beee39a8d4fc47851d961de98be032a03f9e4e9043a17ca30ac6afe147a1406d18c
-EBUILD libe-0.10.0.ebuild 636 SHA256 eb81f77b27d02b83286a012669a6cf52e1ae604132bc57984a056733dbe4cd7a SHA512 7a94c19db578a0123c94eb4a2df4d072d64b46b054fffcd34285d078d1dd4e728719b22e1e49f73b83125083dea6c5b39006d044d2727d03ae7b83b8854fdd04 WHIRLPOOL 4b2370ef777c80b9f13dd0521f08f7c5dd7ac24128fe98be49c5642a344b97dd000ff2875334ac7af3da3e163a0a9eaaf5b0729231410315cc63a18e36d4782b
+EBUILD libe-0.10.1.ebuild 636 SHA256 44ca92dca3926db58b82751a392cdb4eb9e2a557e6bf1821ca7e34364928103f SHA512 911168f61699f93d5b987a358645960a3ab7a9db4b8b13ebe962e592d95326791ce8818905119ccd69935e8143f26f92bfcd8cea7ffe924f1cd5ab9182afb8d5 WHIRLPOOL 37312f75e61fd7d0077dea9a0592e1d78328b6243c8670ceaf7fd07ccee154ead021a7dd27fa42af16635da6772f05132aa49568229c739b48c7b36c90797577
 EBUILD libe-0.9.0.ebuild 635 SHA256 20841032b4fc84fce60273ea3df65fe11a1e6afce783feeff4535ddd2b081c9f SHA512 f8d675eca6f9a1b750bce0b9e9dd636ecf7596d653d8e1581cc6409efbe0cc73704093bb90eaa2574651f8219d709b59829361f415305bd7f75ac30bacf36297 WHIRLPOOL 0c693e0bfcbc2b92ff9e7710f5d4f6e1d1b6444fa9d48b0de0bfc156f9200d8c7d1cadd1e84d74d9e2ccea68807d0560839fa8238bcdbc5e6955393bd1225bf6
-MISC ChangeLog 2433 SHA256 4e8616dc62363606ee04780101929b4cb4b49e681cb6f7bbeb4c79647ab797d4 SHA512 63d8e4189072d6b76922d6c607d6da9dbc8b9037d862a093cf677fa6f148a576548942ce5dab60dc05940468b52aa5338b18a7cdbf4c2763eb7dc0b5f3a76994 WHIRLPOOL 039fefc952d2d2832f8b3489a46ee465460d5b96bf991a8339bee90920fa86cfa78c6ea63a4a9691641564feddad407fa2ec562bdb15650cc76ba192f122eb51
+MISC ChangeLog 2625 SHA256 76c97c2f99467bef1ba77af05f22437674bdf8c2c5990db0f76ab2b80279d45f SHA512 6cce4e526cb152115ed3ba13bad4b7d35b38bb1099430252af88057f028822045ca4653c815b856eb4f809ed141e17bd9ab992e440e25a512d1f5fe54f325844 WHIRLPOOL 2071dc119928311ae000c55e31910f5d79ed9f23cdebcfd5f1d59e00f923eec5f4c8a50ab819a8a3a71a2ff278524c7e7585f320c569eb995aade1214d8b8443
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-libs/libe/libe-0.10.0.ebuild b/dev-libs/libe/libe-0.10.1.ebuild
similarity index 83%
rename from dev-libs/libe/libe-0.10.0.ebuild
rename to dev-libs/libe/libe-0.10.1.ebuild
index f2a7c1ff9fac..25696360ae90 100644
--- a/dev-libs/libe/libe-0.10.0.ebuild
+++ b/dev-libs/libe/libe-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libe/libe-0.10.0.ebuild,v 1.2 2015/05/29 23:23:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libe/libe-0.10.1.ebuild,v 1.1 2015/06/18 02:51:44 patrick Exp $
 EAPI=4
 
 inherit eutils
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 7aefd143e36a..0a60604992a3 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.665 2015/06/15 12:38:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.667 2015/06/17 19:09:39 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> openssl-0.9.8z_p7.ebuild,
+  openssl-1.0.1o.ebuild:
+  ia64 stable wrt bug #551832
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> openssl-0.9.8z_p7.ebuild,
+  openssl-1.0.1o.ebuild:
+  Stable for sparc, wrt bug #551832
 
   15 Jun 2015; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8z_p7.ebuild,
   openssl-1.0.1o.ebuild:
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5949c748bb6c..a5a8fa3cca0d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gentoo.config-0.9.8 4246 SHA256 a38f4a9af890303d764b04eab64dd618b60599762d3ab3286b667c1ee38d2b75 SHA512 04ca7a9cb42762060216cf2696003d1087b1504e7f79278b0509b6a03da0bba0a13cdbe9fd713754379e09dc6bf0e7354fc1bcbaf8a7d75f4a400fe6c8868ab7 WHIRLPOOL 3d5524dda714eec5236b7d15e36c0633d75c750ba5555df2c5da59781cd6d0005f5810dad001758635def1894f27f83fde45e80f51c5467603c54a2b1389e22a
 AUX gentoo.config-1.0.0 4748 SHA256 67ae024ebb87a8236a358a081f2d9b038eef2d0f432705d05063274e7af28b4e SHA512 c68b7eb3d07a3b619f6c3e5f508e594efe2991aef91d8904019f967c20a7e9e9604d8fce1271b5bc247856411e81a800eed7710da46645b9d5d9e5cb184ab99b WHIRLPOOL a849c1ea7d7d0dfeac675636e801dd050c66866f6327e6619f233ede0fc0e59f5f2f554f7812a0c33bd40d76a7ba85ca3aab0a00f964e971de97f5af11a527bc
 AUX gentoo.config-1.0.1 4980 SHA256 e7dd01bc76f0262c91b0a3a56bbf0675feedd6d5c6e61f8dcb5e3c538b113424 SHA512 1900cf603954dc4213d84d2f1f10fb74310dd8134f9c1bcf5f633a45e2ab27398f51656ac2f4165f86be78b19283374689766e3a5d7b43e16afeff884f31a1a0 WHIRLPOOL 2fd9eb3e46a262509f46f5ee6cef963e0bf32ff2c2dc3acb2fdf890326b4db801c0c90814df6f206fc6bc8aaf1184eb68289beb33e36dcebd890bb9e2855545a
@@ -47,15 +50,24 @@ DIST openssl-1.0.2c.tar.gz 5280670 SHA256 0038ba37f35a6367c58f17a7a7f687953ef8ce
 DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
 EBUILD openssl-0.9.8z_p5-r1.ebuild 5108 SHA256 d32cbde07bf210f2c8cd049400aac1a4b978f65b329869f0b21a0a09d80707b3 SHA512 fd5c39321e7999791d5e077b2298f3fe6f14378f5f5883491528684eabd69a522e4c16fbf832284258d24a8ba90d2747320adc040b87f2a30e439cf63a9d2388 WHIRLPOOL c8e2a914555839ae67e2111812110969a4dd627a79643c242d9762ba8d6648d3a52edba546089f61b7cf7f0f0b5e228cf6000cb949a6989614f879133191cd3c
 EBUILD openssl-0.9.8z_p6.ebuild 5050 SHA256 74e5cb01471dee2b835c355534aaf027e3618b818e07137bfc4f85f43e2edd5d SHA512 bc50b8f71b79c8f6f70d0ccbf0ae54dc7fc8823c1b02b543942c623e028681791a3cbdc8519b54665548f44d03ea761510bac546b74708b028da05173f951c93 WHIRLPOOL 762699f9704f4a75caf72ee9f842900a34645e3483dd438b47f892ddb6b7d75faf8c4eb945ad53aa11f26b5bfd59e4505e4252596b65220ae381ce3b9e80468c
-EBUILD openssl-0.9.8z_p7.ebuild 5046 SHA256 c03e4b4c48cb682f07a52ddb7598471f490679a5983ad3dded81058821efe517 SHA512 3a49b75273c75da6106e5f51738f9ab4d0382daaf06254b73a3f85320d1992ca27060428356125449be2e4c9b008040fc79b793802e57e64f6c48d6d6db0f61d WHIRLPOOL b02bc6bb9b480f933e69f844dd9c30e0ac0dd563a67bdac40c8156385233354e41f673328b8e3a4dfa71ada108302dad77d9c000ff6756d712c8d9ddd7e4ca2f
+EBUILD openssl-0.9.8z_p7.ebuild 5045 SHA256 3a51e2c10d47f29c43b1c680833e0d4ca25a664f5d08bad03815e1df54b4588a SHA512 071f1cb6847cf8f65da396d4ba8091fe0f835af212b8c13aacda0dfd84974db733379c72f655c2ef6fc308f48e838eabf7bfa738942d3e2a38985b6cc57e7c1d WHIRLPOOL 10a9787772a852482f28c6a58fbb9b5da6fede2b667f05851ab1f5c6d10eab7f5dc5b8b08af8e31c3a7528045da566bab7b2034ad1655826f7e7f18ce71f4d55
 EBUILD openssl-1.0.0r.ebuild 7105 SHA256 9a73119cf74c7e219a4a25edfb3b8510f46a97b5d54524dcf2e4bd10d1a80483 SHA512 5f55cba93417efd5a3d034d3f45df087fe3301ab87d5e0c9fcc601f2f3e7ed22f83dace214c131275f440702936523b84abe0b7c3845513800444a3762ad831e WHIRLPOOL bdeb464e6ad334878fb01a41ce2ef5ca1b293aba8a06ba5e693ad5f7ac7b0d483c75024a8cc9523b08d0ad2ddad2e8a0092a9d38b1a7c688ee607dfc2db7fef2
 EBUILD openssl-1.0.1l-r1.ebuild 8880 SHA256 eed2ddde72a8e8d33027839ea595c1cac8ce93168db7aaa11ec909de1c89f6a4 SHA512 95983b1fbc937baa686b4265abf80b41c804946a8db15b1b1e7e282b408d61ab0d7c69c1970763b34a45876a4c822a662fafa47e976df797930d75ac458f7330 WHIRLPOOL 11d26c49e525bc162cadf7ab7ea068f480b21e9fe7e5b61eb8552c050d34371f5d4cf23257cf07c42b152dfdca0efbf78441f9942480bedf4b2ba032ac074903
 EBUILD openssl-1.0.1m.ebuild 8818 SHA256 f5daed0b724e5a73fcdaaa9def311b64475006ba55d87628a6c8e693d0a5dfe7 SHA512 3deac87033d029a4fa55e8b42ac29603efc5272c788652adaaf0de17c45d6998720a8303a2ec54efa25e0f9ff8e08bf6c5f168deebc15ae76eb10e43cd8f4aa1 WHIRLPOOL c5c3a221063521f6707a786918247f12d1bcc6b421da0e55d836e38756191b812b8353775d95cb12520bbe8c457aa7ef1bf861c09019247b3a61c237995c056e
 EBUILD openssl-1.0.1n.ebuild 8762 SHA256 51bc3205eef93b527e42e3968f0bc047733a72bc6bc57cc12a0eceec5045424a SHA512 2ca15f7219cf16882432b26454566cea07f9a62f8d2aa0dfd798b052d6bb0825599742e26be2cbfa30c09f498cd1b84ad68856b80badea51e797f55b714f9a41 WHIRLPOOL 0890622e0c385fd4cabc5f300e56a4c8cda121a7d5fbeb34aac966d943726191b7f2a58d8f813923af3d6e159563a6bdf26522cfdc8a5f27e7ba64d624afa54a
-EBUILD openssl-1.0.1o.ebuild 8752 SHA256 ccc5d7221f8f792382fb3699cb7ef4aa7a74b82782b108a40810e82102d21cca SHA512 c18a23b7081fcb40c560f03cafec21ce084039d1b4c6f2c721142e7c37de85ab8440bd216b0774386b88c2a695b4f6310b81e700fcc0c29055292c4e9e1e59f1 WHIRLPOOL 2527c76f205dcc773431505c2b9b7ebbe8c4fd4874a84aa0ace0316c4681a41faa2da1d9710b877ebbb5b359c2964669e58d4ba21889c843a077279bba54c85e
+EBUILD openssl-1.0.1o.ebuild 8751 SHA256 34e0c260c8b2c42018e5429f0fa5f777654c55964df0be46cf4f2d606654b18e SHA512 7aeb96193d2102b975fe7da1a63d36dbbf334c655e5d523375d455ee327623c67fab261f3f6186304e6869d5f36fbfa6c5540054ce2945b97129a37540b76153 WHIRLPOOL 7efb1cab99361f9d9886c6a8ef377fcf4c47e37fc6dd433af5ae8ac26d29fbaf8d3daa7dad05bb4fef4c7778bab285e37cf7e087823049ca98d506860d43f786
 EBUILD openssl-1.0.2-r3.ebuild 8925 SHA256 16b32e6b3a83e270e067558d29a80578576e23adca0f35a5a4176492c32170cf SHA512 25ca31b089457de899b1c2ba409041f4b1b866830aa27ac5b62e344f6141e4587d54d5c1d7e5530c3df36e6093613c8d34a0d7e96553f3427f5c374e498621dd WHIRLPOOL 38cf25a45265d8f01973f982c5c7bb16df6bd5e7ac4721f5aa84e8c95a066284ed538c688489bb06af7067b07bb1590ddcfee5be31a82aeca82f46bd25c04219
 EBUILD openssl-1.0.2a.ebuild 9081 SHA256 a19ab518fdf35f21e2c8e57c57dc641784ba367741a17358a4645c7659822ce5 SHA512 fbe27fdf9f9c9160b4687f83f6836f0c4f43cedc0e0a70797fa33c803c6e9cd6cc6260dc406c0449b9bcd977e0175df836abf9498a33a8192040e0bb5275d15d WHIRLPOOL 98c4cedc4eefbf809bf2eb8fc885ea09315ed38b0aa9816d942afd78f4c6497b3114cb21f8d5d6746b95ec3c8f61625eda1b00abb0ebd7877e8014f8b01c1dff
 EBUILD openssl-1.0.2b.ebuild 8962 SHA256 d5f36d48b98cf1680d3c221e387eda1150d85d5479464804ffa0d821ff765e7b SHA512 dcd83b5fbf3b411cea86bb4b40a27e3e836b01bfbce5ba71a923526f720e0a1155af5f5e42c540210e3d1b55783897cb8327b62086254903e954631143eaca38 WHIRLPOOL 8ada7f8cf76f95b64f2388659e2fc4d2f0dd759445769324f4ffbbb68874d093631f776ee9e300e8a1ab4a5dd2387ef6594caf6b2e7b921d009a8a45b69a0a78
 EBUILD openssl-1.0.2c.ebuild 8962 SHA256 7fac06c39a2d187c647d71e178ef635a33654bdf1ac90a4b87cd0575d7c0db57 SHA512 0d9bd3558ad0b4a69ec836dfce6e3021dc301de3bbe1bb56f0f30d647bf3e4734160d11183da23be0249b8a4d8db13c116792eee16520c11a8e8c7cdb1c37bde WHIRLPOOL 68a81b58fa53b479c56b4a227933631212d674bfa8639c5d968702df12dbc74b912c8c679946ec146293e1226ce89afc51ba36ddc49c026c0570535ff4a261b2
-MISC ChangeLog 102895 SHA256 a2e5e10eba521e9e24d5349ff161747ccc8c3d38c16989c5242f439f2f839c69 SHA512 947190a1083aed7c132ea32616a4983e204972984a3cf8a012012383e74acfad3f6af3c173f0d34afa954a7d25ccda916ad16ad37f6151017dfdb76e284d6dcc WHIRLPOOL 9756c0987679d21b13b34a400bf80b5b5c3e4fba53bf9a60a57de7d31af21c369833f66786992e62b0d6b0cd700d8ee7724b110c7b46cb170fd8360d6ccea549
+MISC ChangeLog 103165 SHA256 a138e2da40ff6bc43e2829c0fcb86f4ad81cc98092ae2540fedc3282632396b1 SHA512 c9174014ef69b2d016e6696a8f74d71b21a7084fbe59a9b54b7d25c758b91b7b3bb0f5913e37879fb22ade6a2636389b96701c670ab263255b9f3bcf6f1ec0c9 WHIRLPOOL deb3b2f72666cdb8c2cda92cba06a3d94b8edc0c181fd49b5afc137869edede48a486e8e239a25b4dd5281fba03c1b890553aa51e3f3f6dc807d24af43fa77a4
 MISC metadata.xml 730 SHA256 229ceddc7f42d44d7cee107774dc210810cfcf866040306eb95e1c09da0279fc SHA512 31e307f60d08e38d39892f13f8d7bff9b530bf99d489983d224c9a0d061593448732f2a60beb70abc560672b49347567e20ea5692892274882bf4e955cbd52cd WHIRLPOOL edbcd6c8010d6282a798faf68279bb5a74420588f339ee2c59d110546a61d2911b30071bac8f7e2b60b33711d4d13b5226c6b5a195aa458ab8502fa1fe520c90
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iJwEAQEIAAYFAlWBxXEACgkQG9wOWsQutdYySwQAlwv/O/0B9z1Jq2/wf1EaPscg
+H8vY/W2PzcctsAv2ZsnsqNg2DD1KfyhVGDR4fJ020sp5h4+cKwQln5sBPWwWWIKF
+BN8MVw7/ndmgu/XZV2BXp8OjPfjisF49bHzRFRQJ5P9s6+3eowOCvZE0/laV1hKt
+//jrPHc7dg3iBnlhe3s=
+=zWvC
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
index 09d1bc21c455..7472c3f074a3 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p7.ebuild,v 1.6 2015/06/15 12:38:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p7.ebuild,v 1.8 2015/06/17 19:09:39 zlogene Exp $
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.1o.ebuild b/dev-libs/openssl/openssl-1.0.1o.ebuild
index b8061573c392..cd0df4bc3484 100644
--- a/dev-libs/openssl/openssl-1.0.1o.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1o.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1o.ebuild,v 1.7 2015/06/15 12:38:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1o.ebuild,v 1.9 2015/06/17 19:09:39 zlogene Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/replicant/ChangeLog b/dev-libs/replicant/ChangeLog
index 5bf061a819b5..849cdc59c2f4 100644
--- a/dev-libs/replicant/ChangeLog
+++ b/dev-libs/replicant/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/replicant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/ChangeLog,v 1.15 2015/05/28 09:38:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/ChangeLog,v 1.17 2015/06/18 02:56:59 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> -replicant-0.3.1.ebuild,
+  -replicant-0.4.0.ebuild, -replicant-0.5.0.ebuild, -replicant-0.6.0.ebuild,
+  -replicant-0.6.1.ebuild, -replicant-0.6.2.ebuild, -replicant-0.6.3.ebuild,
+  -replicant-0.7.0.ebuild:
+  Remove old
+
+*replicant-0.7.1 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +replicant-0.7.1.ebuild:
+  Bump
 
 *replicant-0.7.0 (28 May 2015)
 
diff --git a/dev-libs/replicant/Manifest b/dev-libs/replicant/Manifest
index 09e37fe417f2..a1cf8cf05082 100644
--- a/dev-libs/replicant/Manifest
+++ b/dev-libs/replicant/Manifest
@@ -1,20 +1,6 @@
-DIST replicant-0.3.1.tar.gz 413031 SHA256 714d153084245af4987ab11df29fd615a137c36aff7c98e9f655933ea6d26998 SHA512 67cf56d19be209439b034844f65847bc58052d1871fad2c90f1191f6293b461fb313b9a0021737ed16f892ec06df464243ce24b905ca3469765d99c96831383b WHIRLPOOL 3e99aa9bda37d4ca624e25517512670b6ae4cdc965d084f83d1ef216c40cbc07ed7e3dc35b35a3894e59a83e395fbc6bce6b106560ed889b5106f531e599c838
-DIST replicant-0.4.0.tar.gz 418441 SHA256 8e6d5d6eb270f09929df2148eb8857ddad373c3682e3144f87cf99fc2832ca8b SHA512 83ff77e7eadf9149bfb962374f8ff2734b824280cba76b8948af93a5fc5c538c172906975b0b5211a5fda01967f9640b9cdd99881db63b8c8430b14dd9375a6c WHIRLPOOL 04867cf5bbc777ff03845c7b053e3e270c8dd2c5944bfa4ebd04e9fc00f8012341767863e230edf5bbaa698d085c9f3e7a8b79c8a48fc074514a718c88695974
-DIST replicant-0.5.0.tar.gz 418446 SHA256 92879df15b0472e2d926bab52863b86330ff074eeeed06ac6f10ec73cf565205 SHA512 4c6b79c79468fc5eac82e9e13ad53ac9dfa4b46ade405243dff9e92f4554d011d24c6255cd67175cb3b669813823873ddec7a4691db90587eecabd28e18e9756 WHIRLPOOL affceb2d7c0566b4ae6c90b449d523875fdb7b940558a802e8fca31ccadf253992cbc73cbf130145658e04158fd7f7743c086bad3054be0ce91303e4a311f286
-DIST replicant-0.6.0.tar.gz 419243 SHA256 716562c4e0df51a1b527f7a1118dd45d99ed9be624dd312f20608f42fdb96d6d SHA512 d1d3cdfa7335664c926c310676cf0bd3a4272de6afdd6a8fe5ebb0d571ea46085ec2af9fc793aaefa75c9684c59f53847a7aea9ea22866100165bb23a189c8a2 WHIRLPOOL b25da937fbf83599e32e50d863c1eb3cdf9b1b58e5c859caa789c7397ebdacfa507a6e3a089a755ef01588685659197ec9bc8595c09e83bab7e328863d27aad3
-DIST replicant-0.6.1.tar.gz 420351 SHA256 ab6b211cd8a83bd204a9193bf699d243b5ae11f7246a467251c91db1deaee0e3 SHA512 2ba588642ef4cab3cb37d3755463adb8047ee22cf8191b485d5792e33b6aeb51fcc5734354e618639cbdd8e49e7f84961a9b8cf2e3d7ae51c26e5aae3068cace WHIRLPOOL bbae65826f4f07d755c1d072ce0e51217a382440fe617858d80120b3d0824f191563d51416431560ef0cd86e3e5f5eaa95740cfd128e1fb13d66af7ad29df8e9
-DIST replicant-0.6.2.tar.gz 420290 SHA256 f3e23f2ca4f483d2d18152a3914f96a1d6937d3be0088e185fce2983d37e5198 SHA512 8117308897be5ca537186b17ef62c3df7a1562e54847b11db21379d79add352509087e3fdc6f2e3654d2304f747a16c65c0a210b5a3df71f7749ea38a1cb5324 WHIRLPOOL ba1ce2ad31b1d7caed1715b930209227505b01d3d3cf64a2d5a8aa8778fff4ea3a4e71039a366782b2a1025b48d6dac5f6cf7257b7d682f7c6b3437aeed5eedf
-DIST replicant-0.6.3.tar.gz 423832 SHA256 8daf0a30745eb29e2dfaf9fbec7db98eb8f7304192dc799a5d30559e30895d92 SHA512 1e4595e7fc2a569b4a9d164e9c33a4e9ee166fb6abb51d002849d1919a9f3b2b14225d543c3a18b5897b20babe3560adb1147c8587d669efb27b08d04078e427 WHIRLPOOL 99824ae07d13d88d6b07bfe4e73208ef0694485ff76253ec0720b7f4bae966ab3401fe3cb0c3da70baf5318126c6d15c5195f914fb4caf3e4481b6d22dc548db
 DIST replicant-0.6.4.tar.gz 423835 SHA256 8aae61ad9dc0949a81b23d40a5ebcbb0223c73353b883eba35f81a05918b7e4d SHA512 a4b82a2ba4f00807e999511e7549cb1e490cbef6e9b69b735e760c2d505a76e8dffc5338a7a2b2224c9a9518f2259eeb24dae340529d6004a26b7929a90a2c1f WHIRLPOOL dbfdefbb5bd7c57b3643c9e03e24685ed947e5c9e903a4b474589a63b9daf70ad9939f54e5a36bcbcce5e011880049a6c881d03722926181569f3a0d46e1389f
-DIST replicant-0.7.0.tar.gz 442992 SHA256 518de5a194e8e41279e8e52b3e606ce1f9e49ac4c7f0c06dad219b3dc7dd57a2 SHA512 5af5dd748e47314e0372c7fbeb8b345bffb40acd9d323735403f25b29b2adb15d16818e793b2f2d0d1a126e96a433dfa67124ee2ea627b7b8684b941da4e1201 WHIRLPOOL 58a305c5c440fc72730ec8de390a5fb8fd195ecceb4f590e4d1fe77aacf6e18ef04c016ba82e079e98dd95474d094a1b88f0856d4a498c6daddcc2acf3f9452d
-EBUILD replicant-0.3.1.ebuild 543 SHA256 529568cc2db7428253a4654c321ef9fb5cd9b3443556d5b3c685b9d2c5dda61c SHA512 d4ca72dc845ca5f7ce4311e77e9a7d521279a7af63ea7afb78fead696ada9e9d51d2a888a008f8cdeb44e38e97e1e3bedd4501e2c4188b2bfbceb86fdb474cd4 WHIRLPOOL 8e0e14da6c121c5a1ffb84526042812360e4c7a2501611399da07e3cedba80bee134697935a5f28a93a0d58197a374f94bd07dcd8f9a8b2992189400d352b871
-EBUILD replicant-0.4.0.ebuild 563 SHA256 98245216c895a10a8f6190a1bf42e68d4b76d1ae74b6bf211633ee7e249340ea SHA512 281687a93947752db6b449a6bc49454d9a49fa4489b96e6136993ba8d00c56a04b69c23a02874368edf5c56c890e7bd3ab03bf64482ce6429746123925a15d37 WHIRLPOOL 3cea2e7cf0c9f17de583d2e1e80302219d309604d0efff41f609dedfac08e44c4d1379ae61cfc7ba83a486c2e238f88c210f04bb21cbf5eac13cba73744119c8
-EBUILD replicant-0.5.0.ebuild 563 SHA256 59bfb5a862e985540c1ad48110ff5b242daf44ea40737b159809398307aff5bc SHA512 266927b9dc2bafadaf85eac86f51d22fcb0d80c960c1e1c27f581640aa55267b39df6036d221329d280c23bca255afc4dd15644ae6830fb7697ed304f348f5f3 WHIRLPOOL 14d855a2330b85571c5b1d6275bd6f35a6e6eedd229484fefbfc636ebbd7c62cba38913f063d7a6758717cffe426a2c04523abf5f2ceceb7066ea9ed7dcef41c
-EBUILD replicant-0.6.0.ebuild 563 SHA256 9e91f57fdfa27e2ad328e1fd77d04f755411fe7e2c6857081419fba2f6afce63 SHA512 bc1e3d28104d914bc5c71317f9ee28f6c332715cfa469c7ee60e65595334dd45b60a2c0db2e52f2ab37133c765537b2ffe73560a1fba96da783c7455f6809096 WHIRLPOOL c6da12acdfb3f4b6517938b6228436a4c41b91007a2d17be9c1891a3827d2d146d5dd4a9fc086bea36ae43bb7a8126eb9edf6c2df63a6f47fd649a3bd473f47a
-EBUILD replicant-0.6.1.ebuild 563 SHA256 90b6f7f2eb27f9fdbd7d021dc45eee658dd05af9b2b149bbb40e4322bb50cb95 SHA512 6f9b107320351bec0adcd2268d06175a44cb4e82ee4a60d8d947b428c01d8091a4a2290689526ee4c2b3ad8bdac19346acaabd36fd46207b6a052754c86a4e9f WHIRLPOOL 64b8223bb8387f5effa25170d9fed5074f2055734a65c3168e515eda08ee56b760e46117b31ff4d9e79da5e7bd2876df51b44a516c1bd1ebb90e7b5aae3b3465
-EBUILD replicant-0.6.2.ebuild 563 SHA256 54c1f2d17c7f4cbed412ec1cf191c4eedf7e8b544256b2a240dcf3519b114e5d SHA512 f268d09579a412125b5a4f8ccd3aab6d53cf11e7919b11e2fe3394f9861441a7ee165044e029e923c5ce594030dc64d709e2203ab282ddfae7b664e1fbe4781c WHIRLPOOL c2ee98152b563744e32c17cec9473e07e2855e7be3178d08de95b9ce47b62555c28516e43c768a9dcae2888011f16de9ae1577c3fbfb868c6675ce4beb06933c
-EBUILD replicant-0.6.3.ebuild 563 SHA256 010a21c089c88beeaa33a6c0b5d8c3ab06c0bacca3833cd954b95df5bbbf00a3 SHA512 b1221426931adce217112d0f2da605f9719ed526091517594878191f411036b45c1af7f1b774ae60c19c53b7e3fbb7ebaed6535671ef48afc621110ebb8d5aec WHIRLPOOL 5f130543162c0a330787816eca17d5d4bb62fa09160a38fa995d1f6238175d35caf158399d727b1e34cf3db123ad271594201acf86d1a0633c0aae3998df674c
+DIST replicant-0.7.1.tar.gz 443142 SHA256 cd2a4734e3b7bbbb174424f9935ce46238e414eef134b012957559472db9b657 SHA512 d1eaae7b36e3738a39adebf9eeca92dbf83a8075bb8fc69c4a8b291d35d3df89dbbaf8a546f97464cea3431609e19b5f8252e67c82cf8fc20bd5f3447c0761a7 WHIRLPOOL b9147ca875e2b4a9a0cdb00afad98ea96b0542f1fce4638f6fefbb66a4e8d1bcfeab03bee1504482e16afd16a1f8234e1e437c0016bf8f3c8b3baeaa6c45bd7b
 EBUILD replicant-0.6.4.ebuild 563 SHA256 c4bf0a19f2b4eed04a10c344f809b1faba808142937132305a7e1bc6ef588ca9 SHA512 2ae8ea6fb81dbe5241e86b0bb312e680577d5ab74308b2ce2d4fedf69eeb965c89f94924469d48e4dbd49f14c3a1de65b63c9591fe184c6f8e09750f71a6028f WHIRLPOOL fe47fa11f664d430aabf560dcec6ebc8d6c1fc310e62d8be9a813a51ce6c607902365392303cc5a4c578e7c328217fa1030f8bad38c00e13b8af511cb669d521
-EBUILD replicant-0.7.0.ebuild 563 SHA256 a98d7296e33d77240abab56f16c14f5b383c4d1ae1426ea2edbae4affa52b13a SHA512 eabc2871bf43a32368564e718cabae57335da5eaf983f1b6459a7f987b307dc70094a8748f50ae2600d0adbdd5ed3ea814f47036aedcc9b4b22303997c51f45c WHIRLPOOL e78c17951f1ba7dc9e2f12125f27506eb9321a0c856c95d627a4207f815b13a9c0c26293ec42f40b3008ac54d688541364c02d800f5ee4ed7c69380bf6940e9b
-MISC ChangeLog 2054 SHA256 44abefbcdef616c2680822925960794578d9222cff388d3366073ea85e689bd7 SHA512 2c0921b54d21671ab1ce6146c00498912dc3e303ea93284a13926e14ae2c829cb3362305a68cfb68138aa6b412f164d3f7e15e5f1de915b190a46d405356d2b8 WHIRLPOOL 02bf6cbddee5ebb9f611ab654c8eebb88c1cf79363f873da7574d154c58c44ad424d65c9491701c862d86ecde5235166588f47fd4284da5cd3b60453b8e9ae27
+EBUILD replicant-0.7.1.ebuild 563 SHA256 5a55dc3a232906083f2a28008cf6a9d0ab992124764d784caac8c8ba458a3d15 SHA512 2c3e7c4f3c2bc51649188e55614516a3df59cf5adf52ef958259dd3d548b3e66d6f4c794a4fcf6cb68549e472d1ac51466030bf39b1b4b5835da6024152c2140 WHIRLPOOL 682586c86434654f1c5922c1107f071ffb5c5b2fdb01c9abf45b3b878ecaeb6d8235d5f3c30af8d572db70219e367d62e896970be7ea8b7f6560cea94537bff8
+MISC ChangeLog 2439 SHA256 0ab91dfb030e91b0c65337cc4eb2d7e6affbb86357b5f23327b1aa579726aa91 SHA512 98ed3599d6e3128d87f6020fd5129c1348cdfca94cbc9412610067b8893e6b0168610fcf840f57fb4f987e3fde7c3cd20b481028ba411394ff8dea092444f3c3 WHIRLPOOL 1abe890801db66763c5461fc32947514beace41c3b49af230df2d60e3e1c62cf9c0e2b60478c6fe66cbfece9ae752e992a1c762f0a626dd82dcca6402cdfa4d6
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
diff --git a/dev-libs/replicant/replicant-0.3.1.ebuild b/dev-libs/replicant/replicant-0.3.1.ebuild
deleted file mode 100644
index 3b59805515d3..000000000000
--- a/dev-libs/replicant/replicant-0.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.3.1.ebuild,v 1.1 2013/12/11 03:44:56 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.4.0.ebuild b/dev-libs/replicant/replicant-0.4.0.ebuild
deleted file mode 100644
index dacd095fa48d..000000000000
--- a/dev-libs/replicant/replicant-0.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.4.0.ebuild,v 1.1 2014/02/21 03:25:41 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.5.0.ebuild b/dev-libs/replicant/replicant-0.5.0.ebuild
deleted file mode 100644
index 8b893ebf8e0a..000000000000
--- a/dev-libs/replicant/replicant-0.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.5.0.ebuild,v 1.1 2014/04/30 09:28:39 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.6.0.ebuild b/dev-libs/replicant/replicant-0.6.0.ebuild
deleted file mode 100644
index ef829f5bba99..000000000000
--- a/dev-libs/replicant/replicant-0.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.6.0.ebuild,v 1.1 2014/05/22 08:22:59 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.6.1.ebuild b/dev-libs/replicant/replicant-0.6.1.ebuild
deleted file mode 100644
index a7da05baa5e8..000000000000
--- a/dev-libs/replicant/replicant-0.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.6.1.ebuild,v 1.1 2014/07/11 02:37:45 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.6.2.ebuild b/dev-libs/replicant/replicant-0.6.2.ebuild
deleted file mode 100644
index b9feeb670554..000000000000
--- a/dev-libs/replicant/replicant-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.6.2.ebuild,v 1.1 2014/07/29 06:32:00 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.6.3.ebuild b/dev-libs/replicant/replicant-0.6.3.ebuild
deleted file mode 100644
index 99c60308d1f6..000000000000
--- a/dev-libs/replicant/replicant-0.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.6.3.ebuild,v 1.1 2014/08/25 06:10:27 patrick Exp $
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.7.0.ebuild b/dev-libs/replicant/replicant-0.7.1.ebuild
similarity index 90%
rename from dev-libs/replicant/replicant-0.7.0.ebuild
rename to dev-libs/replicant/replicant-0.7.1.ebuild
index b166c6af7174..e53fae48d9fd 100644
--- a/dev-libs/replicant/replicant-0.7.0.ebuild
+++ b/dev-libs/replicant/replicant-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.7.0.ebuild,v 1.1 2015/05/28 09:38:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/replicant/replicant-0.7.1.ebuild,v 1.1 2015/06/18 02:44:40 patrick Exp $
 EAPI=4
 
 DESCRIPTION="Hyperdex replicant support library"
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index e20383ea424e..0f0b43fa7af3 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.166 2015/04/14 18:03:37 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.167 2015/06/17 18:09:00 grknight Exp $
+
+  17 Jun 2015; Brian Evans <grknight@gentoo.org> PEAR-PEAR-1.9.4.ebuild,
+  PEAR-PEAR-1.9.5.ebuild:
+  Drop depend.php.eclass and has_php function; Historical reference with no
+  meaning today
 
   14 Apr 2015; Brian Evans <grknight@gentoo.org> PEAR-PEAR-1.9.5.ebuild:
   Fix repoman warning wrt slot operator
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index a350f6e05854..dccbbbede38f 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -8,26 +8,26 @@ AUX pear.conf-r1 379 SHA256 43e78396b7b91cf16a3d33d36c19096c9e7281b7f771c379f383
 AUX pear.conf-r2 379 SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be WHIRLPOOL 23a9d300340b463064a4f26489386d786c151394d763a9bcdbb6d5fd6ef72536849c375edd48c57f7c58e63a80650a975fdb7d6cbb368f59471789da4c65ae9a
 DIST PEAR-1.9.4.tgz 296332 SHA256 80c329264a0363c6222b2f750e1646015161c9787bb4041f5ab41d95160bb93c SHA512 f4c8c6f24039940254cf774e51087a12e6b17f7cbd7308c814f8b43f1342ae68db6b2d94626a4d7ed05e8b537816da08459e2939689f15aef725504683657f47 WHIRLPOOL a640fa5dff5eda2801698094b3d99c7c63d9028727f323634dc6c17942d4cbf4fe76ddd35b89a11a8187de068201b875642bf90ea705544801d4ffaac3325828
 DIST PEAR-1.9.5.tgz 290006 SHA256 d4c27d7321f76527222eae3972c6ffb62412cc729105c858ae0bb0861d699bdb SHA512 73c5ef84c4ededa7bca81b1d94944e80ddf9dc40101c0727c5975d4ddb72f66a28aecafcefb7af8d1cc3b6fa7e488e704559a7efbebe860adfb8e9796cdf4933 WHIRLPOOL ea42f63e73d680985857f3e8e318e1f7d001edc843d12b94c9b7d3969c0793c0a9709d2dc8940b339be2f9e854cb2a3acb8c0e5cdef7ddc3cd06c9df97a3ee37
-EBUILD PEAR-PEAR-1.9.4.ebuild 3900 SHA256 56c29a9e85844ddff329cbd5414260e10217287cc8074db7ee58aa90788f94e3 SHA512 986062aa7bd96f8e8f276bc9afad26966c3629ce6a2eadee23f4a08fd9ef9f3f9264e11415f91cafbe2952fe8aeaa9dff95c346647e2dcba4899d5b7f7769e51 WHIRLPOOL 2f69227a3ae9822db0d71edf25500a98f010318f61e4eb96044614ac89105a30625a2f4ef9d27839261d3ea5449b98c83901b6700debd68f6524cf500c9b4ac3
-EBUILD PEAR-PEAR-1.9.5.ebuild 3881 SHA256 77428d8021b90a6dd62dcedf7ed6c625a10c7f491988e1bed0ec3dc3444ccdc4 SHA512 20f702a40856203e7d85e1af5c587500a4862d9f12e5c4aa39eeef0dd47028edf122d7a792d0a8e829afb9df6545c23d23ae0abdb169e984426a0b4bc7d8cd63 WHIRLPOOL eb222b3640e9118f3bbabc58f95ff024a0e980e46ba9f332659c7fa252e301d8b28550c4c9a72e2f3e0d6fb2b8ff36331a93a897f560aec9e59bb8fe3bab14a0
-MISC ChangeLog 23021 SHA256 afa7890b178fd446fef974749d760ddd3b0c66dd9cf2addeb3ec6e25966c5feb SHA512 f70b2818a203aa071a49c732d9b5e4da4038be666e95687b4253b62fa5e74085a601b20eec5466e2000da97d00b9a0b9744537c0c8494848a3b2ebd57a8b05c7 WHIRLPOOL 09f66583f49c2318ba9ed23c603dec98c33ccaa630b6f67b318f21c336c32bcf46c599ff052c76002ef403f0211874607d1dd5e19caa4b60af9f5081fc8c3524
+EBUILD PEAR-PEAR-1.9.4.ebuild 3879 SHA256 2132c07c23b97cc4ea9679f4a68719b0fd536bfb2d5b71797010fe0c5589cb0a SHA512 767c83169365e40abff6f590842c5cd1c52536af08b9e482b22569e2507698a9f155bd0c62492842293d6ab1d31cb0822cec01323911bdc6357c2ce9e0588e07 WHIRLPOOL e0949e5579ab4bc3cb23258901f877334b9eafe2ee2261b1d61493c84c6a96d938819326c7fb8ebc7482f02dbef98bc7dc4efa012463f4266a5ff2f8ebcf2a0e
+EBUILD PEAR-PEAR-1.9.5.ebuild 3860 SHA256 26c5a6b1b176ba72475ba3a24a0cf90526fbd606d605fb9689361b9c4600311b SHA512 fd20718653d403c88b39b4288ff006b31ae96f1e87d7659ca750893481f8b35b663cb1170b6ff6df51b9f69455317c11f6c2ca58a6c176e3561d0b9a168a92fc WHIRLPOOL 170d0f5fe14709dd3bc2583d61041a19b5d5c034858d3632d5a38c30a9549bfa4bedff70be6d003c8cef15cac1c174e6af20e5925ecda5011bcd72085117f357
+MISC ChangeLog 23213 SHA256 d764ce928a6df94c55474dfbda8643bf640233ebf0e486aca3e0ff6eae9526b0 SHA512 e3cba6a170207110b1e162b91c70c38f1dfe3841f2a63c1b7f924e7ab9ea5ee637d8d4cbc6cb284d4806546d751ac2aa5a4bd0e08c86213c5d19ae53ff6a2d56 WHIRLPOOL 9bdcb6737bee37275a1e3367fe85b4befd54d64ca7de96e057c2b73d7fd3f0d49637616c03ff12c8293f987d13f6b0e0f524369243dcf92044c1c544c5a0558d
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVLVaGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVgbg6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2ggUP/39D86vKUxb1EeoSzQnyR74W
-Ebuzg7C64/rFRslEOk4TZSMjTmjXk6KzVuJfri+yVjUp9v8L3oJaMthufHPFI83I
-tiaIErfM/xDIiMUrSJW/yLkhTXmn1D33Xmx0gX/vQmLxGRF/X4hc3P5xs03RGf3l
-h2ScEgqPzX12CnNzjOOA83Xs0tVxskYZciBpBb8U8sOO/qGjNH1JJCOUy6OHrdjY
-94EZF/dRbD1weevzwCqYnkb+GmnPIHMoU++3WmkIJJMOQepZL8pGoji+EnjSfjC/
-zvLkMslft9vnc1ti8E1WfCbn1sevBFlfjX660EOvc7Ty3XEr3oBYQxd6HPIQhYFm
-8bkIRkZ91Qy1fJ4nhH5T6TewEMLLKLDNiJjojqY4As4KDQvno93D7YseVcAQZ+YR
-fBOpfb/afOAOBqPxORK32cybVyAzmEQPrcUTrWtN6gV0LdmTfjsS1yO0QvRgjbhH
-d2LRwLv1V9hePgXptjYoA0GWSv+bkqC3mwuCyq03Q7rBC8bFW+mvg0IY/BZv+qkg
-22Phv3hXM0LKgfyaIg0PLzTFkMeZO3dga/DWx+CLwU0WFMjykgM5LMja0PKtMxyt
-WsbeSHl25T3E7TgwnUZeR0EX0uVhU0/tDBUlKlfakj/DsbjvzJWFiVkTUmsZbLUV
-jsNneirPu+t5H+mGbPCi
-=O6Qu
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2EAcP/3I0nKMrY8UCS4P6TRDlWoJ3
+0Tne5aXJAnGwx+4abXoAov01eqqu5+BVh5XKqoDWvWxJZguk9uJGoHr6ewJdv2d2
+QJXiAgWMMXxcmF5Zcig8lSmgcxRG/mLCC5e3IZGlRgqdaEG7d6TmN5HgzaYl97NN
+S4pp9CtWyVtjY1DykjvREt7HP5x+xvFrUds41TS+VEdO2wIyscZ9fMK2HG6oLS+b
+V19hJc/8fBjtvDskZ10so7tTiWhFURlXHzVDRlCl2yVXlT8LQ0JTesimy6HyaunB
+PhsmsSfhxQjwm/JegOC32L1U3dWxEzrRoa41a2WBdcGJSETFILwExCLgpnE96mFt
+gMwreljNe2x3A24wdkX8zDBWoQmjkZrM+YMn01wbOpNpB30lMaGyDfJaB0eRTkOD
+b9vFYEcgm59pdb1Z2YecA+zzKIcaifbzA4HzO4VUQGsUa0ArFTsuTXkMNVSOrRsk
+2lR6clfmaVaNMJyqF9YO+lJ6K+ePVfU2LcJfcEVbEEzjifYqh4zh1cch1ya5/mea
+1EkDYWO2m13iP0zqbMY5gro9O05mmC1pcIZT6KJmuR5yQuqQMLUqYSq5E1qVifaD
+tcotoPsrqL8CdKloQImiJF6ZQvhGzzEXO+A81FjEORkODezny0IgsGtu2GMXiDVq
+lZWujtyiwdCDtkHY2GPa
+=ePX/
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
index 787d463e7229..4c5d007be187 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild,v 1.12 2014/10/10 16:59:08 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild,v 1.13 2015/06/17 18:08:59 grknight Exp $
 
 EAPI="4"
 
-inherit depend.php eutils
+inherit eutils
 
 PEAR="${PV}"
 
@@ -27,8 +27,6 @@ PDEPEND="dev-php/pear"
 S="${WORKDIR}"
 
 pkg_setup() {
-	has_php
-
 	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
 	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
 	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild
index 9cf0983dada8..01d0d4aec753 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild,v 1.2 2015/04/14 18:03:37 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild,v 1.3 2015/06/17 18:08:59 grknight Exp $
 
 EAPI="5"
 
-inherit depend.php eutils
+inherit eutils
 
 PEAR="${PV}"
 
@@ -26,8 +26,6 @@ PDEPEND="dev-php/pear"
 S="${WORKDIR}"
 
 pkg_setup() {
-	has_php
-
 	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
 	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
 	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
diff --git a/dev-php/adodb/ChangeLog b/dev-php/adodb/ChangeLog
index bcd6ba928fea..4577694b1c03 100644
--- a/dev-php/adodb/ChangeLog
+++ b/dev-php/adodb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/adodb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.141 2015/06/09 15:00:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/ChangeLog,v 1.142 2015/06/17 18:24:09 grknight Exp $
+
+  17 Jun 2015; Brian Evans <grknight@gentoo.org> -adodb-5.17-r1.ebuild:
+  Drop old
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 1525f1157534..5b889f28fe93 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST adodb517.zip 736170 SHA256 6ff1025b67d7daf4d5468544db78476d7a0b777c53724e00aee43f5804acfbe5 SHA512 ef901727b463a98cff62d7aec1addc6ba64d8e59c9f13d2f9c2fcec79a215a8792b69dc2a59275e9b4a6f11b81dffd8f6d74cf2a4595b8a848edbbc739deb7cd WHIRLPOOL 21b5e6b56a9bfe3190df8bd532190c5f1b5dfa4dd071fd19fae6067817652ef3b2b9344a378bfbe2ca5c1af5ec6ffec32018581e8609933324c6db0eddee8e22
 DIST adodb518a.tgz 544455 SHA256 3814dbd776ec5416f9a03eb4eecb081844b0166240dd539439cf27c79efb4d5e SHA512 d561a5143e903195a2c87e637b33c9767f62148d7466fa6cb84d3bc86e5b303c0bf0f04cf370db4b81d9ac7ef8b3f2f28af9e5f28d0956706f59a74367898c53 WHIRLPOOL 3c972f937afd76f5a4595bcee7cb3355a52a2d596615c2f7c3232d472e3b838b72547a4d5216c489f62d02fd3d96b6672b7d044aa2c39fa707f940469ea35554
-EBUILD adodb-5.17-r1.ebuild 1109 SHA256 2c43f4263f882937b02224f5d782666b97e69386195e76fa6f6a39d3737bba25 SHA512 9d9ed345d57f94a5109cf9874cc75c02bda64ff01db6dbf85295b0141a51ee27e469d88f02df72ea85f437f45ee99cae1742047504a10c2b1883ff00381af1d8 WHIRLPOOL 9d318d298c804f56a60b01ecddb20692bc1bbfcb9781120338deb19b7dd4b8293649c90541510a9eabd88067d8274debc3f4fb59e859d5ff4bd6e0aa0adcd91b
 EBUILD adodb-5.18.ebuild 1056 SHA256 9b819aa8a024bfe55dd9d01cad9c896ed398dcc95a77d6b5347377c93fd4d945 SHA512 9f429e4e552cfa129ae18f310650b7fdda1d953fd05ac4829fe226edb6731d7e2cbcc697459f9672cd0e25b1a29a2a3c1a5b717e1e0da72d1f72114a97167ac7 WHIRLPOOL 7a9aa11f54d256f0251ca8d5d7e735a9727a0504eaa5fe88e41a0f62504d7cc174927ca9c661ac416cb8f393bd5de2a44e4cfd14255618099c9bc8a8e780838b
-MISC ChangeLog 16593 SHA256 a5bb487f1e72b861e57f1cf99b78e3fa93c58086b1c7df26d0b8fc68366807b3 SHA512 92aee753941be22e26d3fad6b77db415d6254f38a6d294f98d1f62922a200e6f1344f0b0b4566f71544903a304e8e4b0a69be1a36a6118d5772257d204117c0d WHIRLPOOL 299fab33c7105d61fc15c2aa3bde5173171936b886bebe159938ac5d0f058ebb72a4ffb7122043384b3529984eaec13dd5b9649b9cc9039fe9557eb2bc392244
+MISC ChangeLog 16681 SHA256 0f9f0ce5ce750f6d09cf9856694938ce53341a9e82422dab8e9577e800266039 SHA512 a3462d5a93bb55dbe6444f919c3871917c7ef4f24b360e4c6e4deaa65e1c26da664c4331146b2edecc9b930880af8fd8a9100d04a18c6140c02eabfd0eac2f43 WHIRLPOOL 34026be861e2a5e02b3134db66d4a64070ec6b0eb26333f462f94e1cdc7801734fe4c832606d7b39d7fb3f0fb368f5d8aad22d307d4ea0c83d1e462cb24f597b
 MISC metadata.xml 232 SHA256 b869553d76d6300e5c7b7a534bb07639b49f3d27134f2317b9b73ecbdc9cd636 SHA512 211079ad7efd75444b4f364e22a83c2725216e0105f4950fea3462e15e0f388bfae7167844c8c3b3ad928b7037f428c818b78f58c0b872cee3199a4dd8e7227e WHIRLPOOL 49e42a65307f056d1081e16da6b80795a192f992ded20cf91a092da38ca9dd2e667b11e7f5b7b41163b2c5c00b56c6d79cc5f1b2080eb85a0eb4b16f1668df1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVdv98XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiP78P+wU8465O76mdHtPMth5n5n0/
-wgJWx7Ve0ZADeYVSbTv/BnIprSCvjbSKxYY7VDJ1wMKBMIUIBpCFSE7ogH4Zi9Ln
-n0zTa3sYEumle0J6WPud5DxaM1DIM/poEl+xojK328jNJ6B4R4mOlIxvWqbw/+Rm
-WYCdQCCn9YM9arnoiG6fRM/Xstx+f0tgolSbP7NLS5FlWp9hekfK1TRTmm8i6CXk
-jqtfWhlA++afzK2dsDp4MsY23kHF9L2gev6VY8Z0rPJqzT23xeEGoPW1qQF59izL
-e7dsvBboBSbinTZcq8TnT1ty7HF9DhAIsE3goiOvSpMjDRU6cJcf2ucV9jIZf/LD
-3gZMzPpCSu/OtcI4XS8yJ3DCe3N7UgF2O4Jmt5OoEBLScN+p4RvCnWIP5xlKTD81
-k9tk0UQMFi01cgtgqVY/Ja2brH5k3Ro9FMrbxq8FtvnU/ZVs4Jq1nAPsozn8fLRN
-lcPRzGpBpq5Jupt/72KQPhlbGjPnWl7kZcDKBxuDd9Ze4KLb4QyRrBAwcyuHZ0Gf
-sGOzUOVjWZqs2GDIcMBsAIc4zEdyTDTo0taxR/EIVn4tXaXtaV0TgmwYQR5OX5qr
-o73XoD4773TxGTUgdlBHWqzBjqqVnF9ZMW/2bpSCR3JMcZNHVzD/hdg9OP5eDpai
-W0UDRtfpDb4g9fNVGgUy
-=CLuW
+iQJ8BAEBCABmBQJVgbvHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2lfQP/2JiB3GTfsTMr643LiwB3peu
+Y90UK617VTyBL0CXS7BBKIaakhumGmBRMxyWnpSEvebyhgbQBNqUAw5M5nsyYHB5
+LG0NDE6a+0r+Wc4i9VRHk6osf9fkFVO9X4X99gbva+2cv0q3gmzzMQ0CewpXSHmq
+mdOJH4hsrGpI4hETIIs0WEeq+CFiPIAnSOi37TgLrkQ7Vvc11XYfwCg/4daIWMEJ
+haDubzEwGU1/03wkdsO64g1uRj9Ewwv3lTdGFGPd78jXkJaXAVS5Pmm1BHP0gyDO
+CG7s6JpPhDqJkkkpXb9LZYLwHYmMhaoQuMSlTdQ3OKyXoSFk6jE2yqSv64S40372
+J59RO2Epa4OTxc8tVLh43hsAZj/O+nhP97umtgtvNBZ+Evu8XI+zNv/H9zUgpfiG
+MdGqgNo693/4hkSJPMH0a7UqRSIc4wJ3E451pb3eKHGDPTsmX5wHts1dIxVoBoaQ
+ndFvUJa0GrA+Pk4ASOeQRecLEuaYIqEAHhoJoAeMkRLUdBaV0WaclIzazEBNnnc2
+gzJXLd6WmWSq+wMgd7mYyBqPEIJB7TRO+3suSW7w9u1Hw1YKkAYIhDOcRxVxsDrK
+VeHhx55t3oPiYdoshDVr2fdYxv4P8jvTOYPMq9OPzXNrbnD4MFq695b9Kn4LI01d
+hCRqG0bHUArNCi3Yo14s
+=Xuuq
 -----END PGP SIGNATURE-----
diff --git a/dev-php/adodb/adodb-5.17-r1.ebuild b/dev-php/adodb/adodb-5.17-r1.ebuild
deleted file mode 100644
index b592dc876c87..000000000000
--- a/dev-php/adodb/adodb-5.17-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb/adodb-5.17-r1.ebuild,v 1.10 2014/08/10 20:59:07 slyfox Exp $
-
-EAPI=4
-
-inherit php-lib-r1 versionator
-
-MY_PV=$(delete_all_version_separators "${PV}" )
-DESCRIPTION="Active Data Objects Data Base library for PHP"
-HOMEPAGE="http://adodb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/adodb/${PN}${MY_PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"$(get_major_version)
-DOCS="license.txt readme.txt xmlschema.dtd session/adodb-sess.txt pear/readme.Auth.txt docs/*htm"
-need_php5
-
-pkg_setup() {
-	ewarn "ADODB requires some form of SQL or ODBC support in your PHP."
-}
-
-src_install() {
-	# install php files
-	php-lib-r1_src_install . $(find . -name '*.php' -print)
-
-	# install xsl files
-	php-lib-r1_src_install . xsl/*.xsl
-
-	# install documentation
-	dodoc-php *.txt xmlschema.dtd session/adodb-sess.txt pear/readme.Auth.txt
-	dohtml-php docs/*.htm
-}
diff --git a/dev-php/suhosin/ChangeLog b/dev-php/suhosin/ChangeLog
index 129486f27613..c80016058aff 100644
--- a/dev-php/suhosin/ChangeLog
+++ b/dev-php/suhosin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/suhosin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.30 2015/06/11 07:17:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/ChangeLog,v 1.31 2015/06/17 08:50:51 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> suhosin-0.9.38.ebuild:
+  Stable for sparc, wrt bug #550770
 
   11 Jun 2015; Agostino Sarubbo <ago@gentoo.org> suhosin-0.9.38.ebuild:
   Stable for x86, wrt bug #550770
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
index 2ea1183de77d..cad680164ebc 100644
--- a/dev-php/suhosin/Manifest
+++ b/dev-php/suhosin/Manifest
@@ -6,23 +6,23 @@ AUX suhosin-0.9.38-libcrypt.patch 590 SHA256 9b78548c47ab4bca789935b98a66ade831f
 DIST suhosin-0.9.37.1.tar.gz 134207 SHA256 322ba104a17196bae63d39404da103fd011b09fde0f02484dc44366511c586ba SHA512 4ef02b0ac95d6fa6aea5bec8622bfad1bcb3c7a9077765bf2af6b4ee94d2107df9e52214cba16d7d99c7490c79e3757dcef3844e3615b379313d25f04d8f836a WHIRLPOOL ee0b05cafa26209ae3531890b0e77e057f24da74c33421c39caa52d2ccf358604a88922d26e4bd7878319eb249febbe630020c752bb652581dd5d1ea5a9496c0
 DIST suhosin-0.9.38.tar.gz 122800 SHA256 c02d76c4e7ce777910a37c18181cb67fd9e90efe0107feab3de3131b5f89bcea SHA512 cc4eb38b5d6673cc3f2dc395e5a8b5461d3221019ac9849b747b6d5bae423cd5bd01a75b9432414dc7c26c78bab9f2381a5414712a6906a999f3ec9dc77ebc45 WHIRLPOOL db10d0cda4d161440c8dd53f5bbfdcb7da5bdf7e294975a0a3b6f6b69575e16eb43d7fc0aaf3bd9497a8065282b8403e480bc699ee9100574bc212f47f763933
 EBUILD suhosin-0.9.37.1.ebuild 1399 SHA256 415e81bfc1679f259cdff197fa7bd413e467711cebad2ce51f45d67a4b66e68c SHA512 cc842fc24da0c510dab36e0e05aaed6a769a896c4f3d999fb7a29c8fbd9acb8f878d752da647aacff616d957c709bd76cbbeea47eb4b80b80df6b8049238be1c WHIRLPOOL 103ce4b66f6c35a35d054a11a8edb2a90f5302bbf00da407bec67cd41e48c7d3e6ba966f766024d88edabe73ab28917a7ebda8e1a557cf02c80708db64d3fe57
-EBUILD suhosin-0.9.38.ebuild 1550 SHA256 62ec850934a565a35fe3e186f122788ad3306abfc068c021254c86af71bb7310 SHA512 1adbe9f23e3dae05e72e3c691ff16c9de567c55e9016e466e47fb83c6acb644908163dbe55f7831734935d19bba35bb5e8adf1d84a1479a878a0a134569d45bd WHIRLPOOL 4d3a332df5a1c29bcd30209bb6bd29a35a644c6f77013946f8ca6f644c108b712d07ea20f452ac893ddf8532eb0e95be3aad8dea75453ebfb052b7922b5321d9
-MISC ChangeLog 12123 SHA256 cde52b516f4b812ca145ad36cab51eb746a52786dd6f76f5e547398ddaa49940 SHA512 23b478ad569811a7477a9db7bc9cf7bb88d05396fcbd0dbcc5bd425d8b88913378f32bf9037680d6701487fbf716b7dd573829ca1a3487b0cd02d0b38614dc12 WHIRLPOOL 6b8d69c40ce6a09f059b957b68f8d6a058c058129f881ff9b63092d71520c6cc9e017bde3c4c3cc14d64b54ce67dba7eb594f8f2bfde976f230cab14a1cb7eb6
+EBUILD suhosin-0.9.38.ebuild 1549 SHA256 412e9d4c287a442fd3a7d6554868813a23bfc462f3d5b67b7422ee16b4234cc9 SHA512 8774f848181bc992bc768545a698748592f38878bc1f7da773c443844515adf05b19dd73c11c9ff7dd00419c0db38cbcbd1b72649257759d37122c41a14b35ad WHIRLPOOL ed3142503bdd183466a431703424aa4569769de0e4d4a6887a4442bcd60c1104be474be30df36becf134650664b4c831ad0d9b0f97c41e3c8440b68a6071b0c6
+MISC ChangeLog 12232 SHA256 79aa0a19c7a4cd9d5559bc44b0c76becb7549ed141dc28cbcf1d4926e6354ee2 SHA512 3ba4c7c5cd16c61b2c2fe63136ef066f4a0cadd07de3bf475bd441434c720b6b036b991018e3e485f23195cd33224896f523dbb8dd6552bd5d52fa20d07261d6 WHIRLPOOL fcc578b9ee398c101981917e3df024c1f742b9805519080cdebc3d89ac2646197773efb8c83e458c563e412d779fd5979f216010945b38f969d83cd3d0c792f5
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVeTYRAAoJELp701BxlEWfHm0P/1JIPLeHRiXcd6WL990UgGnF
-iDa3g0DovuZSPd6cN42iXO4KWTOCuTUGhLkEmriN91Mvt4Nmm/FrMxEoMx/If523
-j3mVo9OjCf/+ETU0ezzPifkzZ94OEB1bXxGO9y0+GSDpcA5CDDDN+RkkhWlG0fMq
-YTY2zV97O94sIbnJcZT1egJ/Y0gFvM1sDcRgcQFJ0G20E/jlFy2AWnlv8s7ZvA3u
-CPOyB8pvpzcxzKkVgfCxzOchEch++Wz0dV4Sl8P/yjFjqDgZai/QNAFS1gPY1qbj
-zFt+LuG1S7hfeE9beouH1ILQtZpYrWKgnDu1/JAnqwP93/ChBzfgOt+tsfu7oEKn
-GHov1zS3lLuvWdja5yqmk/gm3IARVgR2BiacxEvxzODZINjiBd5v3t6LvvwrKL3D
-G6YxCR9M3mEN1j28dNklnZIfjiNvHqBaBIYAcCtz4SBxdCBGB/ofvaGuHUqmh7TM
-CTPBkTPpmY3IkgdneYcWQJBEyAWH5tOWiKnrUGJ9ybn5yQmbTaJzxhpPnKNCyfXF
-R/5f6kDr6WEl9ynrKC0VKI4I2/pUyHD+Ctf/hIKKYI4oB9UvKme6mB8gE44aLUmB
-gPn5Pgbb+HDmhBRQx4I92aRoPT0zNpA2M9Fu6MGsWZTiklK1DWJIgNWt7xKhZijb
-OQimw2j+WbGRjcbsL1VM
-=ogfm
+iQIcBAEBCAAGBQJVgTTsAAoJELp701BxlEWfAgQP/RnTlw5oHuQ4FdQdB9E6CMxh
+zqYMgzci7cOeimZV+1UsMEAUj6WGwkOVmyu7b0WjSCXFXvHsvninG22NJE0kAO63
+4GpsNNonQa3gXfOdVm7PiHIU/UgPuqvv08IwPfnAsSQqlmGfKsRlKmDvpCBGAAUh
+y9Mtuj7z0Fjm1MaJZXzThzZ6oxNFSwU+Os4g+TkmMTQdpu4sIqH4IRYN3RkcJv0e
+hJSnZ3J3ODrVMag+Lb1rQdZVwfWlW6F4gyyOE32w/vn3+9cRn1n+xn3m5dMF0Nis
+EnfBH/dGAmvGp1utSZbwyo7G8cXeFMUOydtjuvHpbxkB+kX9YR1hk1opAzLuCM90
+dfhdQpMg8UaHbKemflie1jVc4LVM8DiKOctL5eDzv1huXGblBi6DyNgt5l0XhbWv
+zf6exSsCSasIZ2Qk9l2T91HCKsfVllHJ1UkvaKciwYHN6Nj1Q5aE/oncyUfch4gG
+VccW+3nmolS6bJt5gdsYZWUlUas+9jDZY/KWrAHnCncvIAiOff+pHl29uXG21rJ8
+A3MxLHNAFM6gtq3xqY8tZbgRZwYSdrs292q0dkvYzaUPP/2sUm6XQ8c5PHrUJvz2
+cgChDUrEQp0qK2SKyintagpmsiK6D9srRRFUzmIL4nZPcdIFkjiveiYCMBhGa320
+Rvi+KZxKQjhvgBAM5/Vs
+=W5+g
 -----END PGP SIGNATURE-----
diff --git a/dev-php/suhosin/suhosin-0.9.38.ebuild b/dev-php/suhosin/suhosin-0.9.38.ebuild
index 2fdd8b8bbd28..47b5111ad574 100644
--- a/dev-php/suhosin/suhosin-0.9.38.ebuild
+++ b/dev-php/suhosin/suhosin-0.9.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.38.ebuild,v 1.4 2015/06/11 07:17:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/suhosin/suhosin-0.9.38.ebuild,v 1.5 2015/06/17 08:50:51 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-source-r2
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh sparc x86"
 
 DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
 HOMEPAGE="http://www.suhosin.org/"
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 1a92044d314f..af22a4dd9839 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.290 2015/06/14 14:07:15 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.291 2015/06/17 17:25:08 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.11.3.ebuild:
+  Drop version that is not going to get stabilized.
 
   14 Jun 2015; Davide Pesavento <pesa@gentoo.org> PyQt4-4.11.4.ebuild:
   Use the new --no-python-dbus configure option.
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index a424afa9abc4..d35ede3afaeb 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -5,30 +5,28 @@ AUX PyQt4-4.11.2-phonon.patch 897 SHA256 0e0f5ff891fce64e9d8b6e743e2807c62292145
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
 DIST PyQt-x11-gpl-4.11.1.tar.gz 11118850 SHA256 df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 SHA512 3851d4e61d9c6a0c62cbfd2a08153972fa3446c1982fc925796eb1d4c6524e7054cdb14ed2f4566386727e9e0cf67246765de19fab79152b0834477452681113 WHIRLPOOL 17e23997afcf06b99028d0d2115bc9328848acaaa1b6bcd8ec7397409ab2001d5fa29ca08bf42e0cef6dcd0441d0cff04e349fa8913a2b0fc86da878b79b5a5d
-DIST PyQt-x11-gpl-4.11.3.tar.gz 11120237 SHA256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 SHA512 48264bed71a0c9662c2903a7cf1ed0263f18b3b69e5b9639b6a006f3cf72bc9766e786788c46046546d1676b221ed2ab29d2ec7fe57057ea9b84cede5ee7622c WHIRLPOOL 1c0f7ecd9f845ec1887ebd0c5b4473bc9be19c074aa8d0c3203c7ccdc0fbd16c4f247f80ba81ab491ef06cefaae704adb1da5da99d658826e941db398c920570
 DIST PyQt-x11-gpl-4.11.4.tar.gz 11317088 SHA256 fc1fe77495432ba3b0d74ff5cb164d375a97f5dddb728256330f615a7cdcf407 SHA512 58d0c5e30b0480c1b6ce1a3cc3ef0a1841bb15631830fb937d1f17f5d3d8cbe66a5e2adcfb2c3990fae38db66dd430668bd25413e254e72064a38c48f689f170 WHIRLPOOL cf635d6399bd04def2648eee65e038d720f06dddfac70f3df6f87deb7483e023ee1a4aa07285a5075adc19dc91bca4500b82f65b342e07a8845023cf98bb6233
 EBUILD PyQt4-4.10.3-r2.ebuild 5665 SHA256 f2f891ab292d6b8eb2f5aeabc90fe00a55f5d83ba0c22ee3244c1e4d5330fdba SHA512 c7f055d602701b59371e2b3556b9c573270bd219f8ac93bf782ff54b912bf9f934395806a5d462feb02bdcb1a487cc6d1a70251982328923b0a123b49006fba8 WHIRLPOOL 32da50c552e287b1e72a5d4554c979a4d07fcf7e12c98bda9d11083184dbf662867484f7756aa2c5c7e7c0b895948a2c6242f782cd7a5da07bdafaea189e7b99
 EBUILD PyQt4-4.11.1.ebuild 5618 SHA256 bc1ac653f6624393d43e83e90b8a70b05ef61012208f22bd9de023ec7c915a97 SHA512 6d96e08efd0d902d6b5e8a95bcd6c99f36bf383574e18f73ed5c943621fb2721fddd6039b3bb74a3e25799e0afaa183da5a2eee0bb98910a2a87166dbf8a28d2 WHIRLPOOL 92f65a5b010835ba2855deee05f5ba63d5fec3fbf330fe90fb3421a8e0a6d60aa2e6484deff02ea88996a2b78c4d81cf0303ddde098a465e07df7984fa7f532d
-EBUILD PyQt4-4.11.3.ebuild 4141 SHA256 b448002e9c9c0b5c80342108891e6e5957c6ff1bb66dc300d954fc4898c07a68 SHA512 d20de36cede1b28cdacdc39997e80f95dcf4a5fb8fbadecc57250b913e9bb1da07883584d2c4d9137dc0395922a2457d791e36b501802c91112ad9baa353f537 WHIRLPOOL 2669d827a1bf408a7cd2db3b8042e80bf839f50eceabaf3b1034634e9e9c1a3e404a9bd3fb50198864e3effba92a51216978ef95eccd6914d512fbf662a36fcc
 EBUILD PyQt4-4.11.4.ebuild 4117 SHA256 bcc772f8fcaf6da227fde40cc8484b9ad99b21264ad4a11e712b62df387fda37 SHA512 c2252213ec812d147f4f6da31ffa2694030a1a425db037a9799eb4f0413442299066d20a8a104887e564ddacc02c0da90a02b71c0290c0888d7f6ef74a947bd6 WHIRLPOOL 5dea2ddab2f18dd7fa62acbb926b1a0915e59a7b02b4a7e56fa24fa6eae39d43f14e2875df12f1e25a10bf58aad2da5d2e3e6269f0b1a7d8156ebcfd7710f3bf
-MISC ChangeLog 39872 SHA256 ebbd0fd4f43eed224f48cbc0c61adadf4ab34df8727ae45eb14ed54c781d552a SHA512 57d955c4b8d6bb032f99c31f53812fdcc7c5f8aeed4c7e2a5961ccd87014363c7a3a9c571cce4b84d7b4dcbb26b3ef4cd6e559ee852e3bb8b77ba2a53a3e1818 WHIRLPOOL 9f03a0327964a833e5baddb42dfe8d88c095b1b270ee4f526240693a667ba4241e2dce2a833b4e78589580d1e4d9e6c0ce99ba459424a27026372429c878ebd8
+MISC ChangeLog 39997 SHA256 66a31074112ba95663adf42bd52ec6e5632e2eba5d336039dfe084bdba2b8d6a SHA512 227bf3d393957b00e8908773964e4439da84ee4a45d4ba081ebe6c730ef239cfe463e7d25c4caba529c7f10f1a466d81adf792df8b9689c6609c1982038939ea WHIRLPOOL 5852c2e671866e25ac19d04fd24fb1f873a8aadfa1d2be157b79c11a219d7f0d27afe0714f7bb0604b7033831622c8a12dfdb599831f6a1ee58cd7f55fff4a78
 MISC metadata.xml 1626 SHA256 d8691750d6e81c13a1060f959fae78d139513e6da88790c4ade75feaaffe94a6 SHA512 9bc4b5572a5dac32ea672c767736fd3a6bd21274b6719815c34ef26cd3cff87776b232f17cc6e388054d35b02cced7520288d17eeaee65279f842991e697ba22 WHIRLPOOL 99b14c42f223e56e754de79ef4478f9569eb04b72cb0affb5a400cceee548b8701a60744f8eda18c191fc498a072434c2e00de9d4e1a1ca1d24e6c424eb437a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVfYqUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVga12XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9zPwP/136aRQpotrzqOFbIJb1cZdy
-G6So64EB7DbzewVpbElp8MlbZbVynLTBt07hPbx4aiymRxDMoAx2ok2SWxCrhW4y
-O6hlHdgZwOyltb/t32DoaV+tIpXNB4E4Ni2Cf+2XBGt24p0j8ASYhVWEml9SMEGB
-g9BXKjOKBAvilO/945hprrmk51JQb95f7Bh0I1lvBrfsyjOkA3L+WNqKZ/WBe3pX
-uCN82fSJabjbZAdGpSy3+1UAb4zT+P98m5xI0SqsllQri6XYHjsHEzrBWMMPkr1d
-xoofs6qaFiCPTyp5LtulOBy8HDzZYtRtxrrQg2k0qrRSRm7YhRJx4b1SqtcHlcJw
-Z7s2RB3WwqMCHS1copsYUaLBWg04UzTRmnsDZ0ZpbJy29eWQavz7aikzVaT6u674
-novnQwEbwDQjAHJ6/jQGnPnY2noKnLnRjtkLB1V5KnQ6sEZl5g6Bb5TNfZpq2V7a
-YM1xolZo5UwvlkBGsizph7yFTx/nPDW8sjpF6GtvwtI9CJWfpyD6jjQRnuo3nN/7
-aPCP/vJ1GklADOU4y/XmG+yHatwsOlzTjZUO4ApqK5EsZ7AcD/C08S3FuP/hlhtA
-cNBZvFhWqZkvfqsxGL00z0gTKCF/Fkf7RBA2tzm9AFQG+2vAcO0+Lcf/PWl3bXWq
-yAdaS8xLrBJsMc9Urr73
-=xuXU
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Kx4P/iyBegPfqNukm1C7Mw0w5bus
+4hDfD8jhyV9LviCf3pfghodj5rXUdIlGmK9MVh8RIxrGZVuWCUk45PIK0OpBygjF
+YtdY9+QF3kg4fnBEEgU7Ywqqrr8OeP/6UcymSnG+4UZOPBNlYdD/1PDD54jyUuks
+wGc7pyyxAAuCiANc+edAZlWzpwTA3lBN4O1xEJo6MuE5k/ZYE2s7y26E1D4wJtyx
+zysvYHkmwWmLnLKZMIaqzHm6cASCcZHJ50f7L1vMfGHAt20GOTMP9G2OrLU1rHAD
+Rm+dNbWh48Mf+DzRuUgTukV4s89+yX0nN5n0QcyOS5uBZ4b6utVY+smIc5vL5kb+
+U8tR6pKtI7AaqRMK7+hz7wOLzEOgN8HZx7hdb0T4cyrDnJJ75Q7sQZzl3+5sd1ao
+NYyvGHn11GHGVvH0ET3u86mj6MDXVVhjYgYgyiQnt9NBPImyqPaF/hkL+Zmt4Buh
+dF1obOXxsRBuytJS4KHjly+7lUOykcyj75R289tUqlNHN0Z7BBOXarA5K4ONzolV
++CUO7LEqdoiidmmHNc7dDOqetnW0+EjXcKrPlRja86oGbe+lh8xVsCwPKypecYFh
+6XDNcD+t2NPBlcmJyVDJIgpp7EPLzzga+0jEcO5BL6OLblqZf6h1ZMnfQNpPodFB
+OXXc1Kz7z7QEcXCK3Ta+
+=vCP6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.11.3.ebuild b/dev-python/PyQt4/PyQt4-4.11.3.ebuild
deleted file mode 100644
index 08eb1bddd6c5..000000000000
--- a/dev-python/PyQt4/PyQt4-4.11.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.3.ebuild,v 1.3 2015/05/11 18:00:13 pesa Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils multibuild multilib python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"
-
-MY_PN="PyQt-x11-gpl"
-if [[ ${PV} == *_pre* ]]; then
-	MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION}
-	SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
-else
-	MY_P=${MY_PN}-${PV}
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="X dbus debug declarative designer doc examples help kde multimedia
-	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sql? ( X )
-	testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.16.6:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? ( >=dev-qt/qtgui-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? (
-		kde? ( >=media-libs/phonon-4.7[qt4] )
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) )
-	)
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Allow building against KDE's phonon (bug 525354).
-	epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch"
-
-	# Avoid automagic dependency.
-	use dbus || rm -fr dbus
-}
-
-pyqt_use_enable() {
-	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure-ng.py
-			$(use debug && echo --debug --trace)
-			--verbose
-			--confirm-license
-			--qmake="$(qt4_get_bindir)"/qmake
-			--destdir="$(python_get_sitedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt_use_enable X QtGui)
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable multimedia)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable phonon phonon)
-			$(pyqt_use_enable script)
-			$(pyqt_use_enable scripttools QtScriptTools)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webkit QtWebKit)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		eqmake4 -recursive ${PN}.pro
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		local tmp_root=${D%/}/tmp
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
-		if python_is_python3; then
-			rm -r "${uic_dir}"/port_v2 || die
-		else
-			rm -r "${uic_dir}"/port_v3 || die
-		fi
-
-		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
-		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/alabaster/ChangeLog b/dev-python/alabaster/ChangeLog
index ab84b0a9a844..ea3a554b5506 100644
--- a/dev-python/alabaster/ChangeLog
+++ b/dev-python/alabaster/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/alabaster
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/alabaster/ChangeLog,v 1.11 2015/06/06 19:55:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alabaster/ChangeLog,v 1.12 2015/06/17 11:20:14 jlec Exp $
+
+*alabaster-0.7.5 (17 Jun 2015)
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> +alabaster-0.7.5.ebuild:
+  Version Bump
 
   06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 2e9a7101c666..4deec33fcd6e 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -5,28 +5,30 @@ DIST alabaster-0.6.0.tar.gz 11086 SHA256 86423a9d10cff61524df31cba430e9beff4829d
 DIST alabaster-0.6.3.tar.gz 11749 SHA256 30d72e732d61f3ac74bb8bd6a2b063ec7b0522b00bfef979dce4435f7982439e SHA512 c9d102884eca20063da8929dbbd030faa3e86c7f8aeb4e72f9f7dcccbf94334efe2de0143939d8fcb8e79afbbfe6922cedc9621332242d0a482ab4f61b365c0f WHIRLPOOL 15eee45a1e868f765257c6655e33adb1c4da807875b704a76f08d760c4b688ffc26567fd8e00315f6cabbf45e7d82d7d968ccdef83d21e1b1339ed8f5e0ac4e7
 DIST alabaster-0.7.2.tar.gz 15024 SHA256 f8f436a350e37607a3a3d333b6c2d9baf3320cd661e72e95ee0e3037ac7a3157 SHA512 1a1b2c7f76b2c93042044c869e376512bda975765497186908520cba314129bb3ad34d39ab365105331d696b54eeae3094e320c2cb6429ebbd30a2019157b5e3 WHIRLPOOL 532da1cee88e9eedbb53acc263031ecbc796d90ea11075fc02108329b416c6a516ae7681b5ce7970d6e094dc836ed40f050bc75c8966b4e611b50f9af015d1b1
 DIST alabaster-0.7.4.tar.gz 15183 SHA256 ce77e2fdbaabaae393ffce2a6252a0a666e3977c6c2fa1c48c4ded0569785951 SHA512 42d7939b49b843611f6fe8be8b8c5f02cda9a3bb81b27a60c7764ff894d40a4a74deeadf183b3a23631100e925c76ce2cb3f8b479ce9c17ae279d5f720cf26af WHIRLPOOL e07b8cb114421463c105f9ec8eb4a6ffe6cdd1bd27eccdb36348e22f61fafb18d9b00eb5db1e4238897e8aec328840ec8a4ca259dce9f3fe2a1bb5ea2a9fb4fd
+DIST alabaster-0.7.5.tar.gz 16204 SHA256 8022f269eba3aefd390b927ac740ab1da7af15838e1c90caed0e66370eef8fd3 SHA512 abe51a04224163cd834609dd3a07710f12ec7c52e0859f25327e8067db27a460d723d340c25f8f2440f92c9ba2a968e021993a07bb8faef093d6af0a6209a4c8 WHIRLPOOL 1838aa91704b5c533847127052170731c2aad786c791c31a53d675fe95bc80fa764c595b272d9e4a3a01e646f533752320d2029057f794b3368ac1242e9aac89
 EBUILD alabaster-0.6.0.ebuild 573 SHA256 e1bdafea431b0213e505ec19e734791112495c7097d0a6ef79cf08a1a9af4708 SHA512 aa6ce00a04b416447155edb24f45ad14a624751e74cf040c9c7424d8f3d20cc7eea59bc7a845b3522733d799e5666160bd66b92a3630c5f52de3833bb4f3bb4f WHIRLPOOL 32cfdc3babcbef367fa019558dd067b63e98946c4e6c226ffb96126a442d9f7bd7d543a160fe969f5221293f396c46d917c87cfa42ee1afb98ba6e788feba65e
 EBUILD alabaster-0.6.3.ebuild 577 SHA256 941f6d99728ee6cdb6dd30c84042676c2814c0fc2a8a687c9b9a3b41a99713e2 SHA512 0607066a2ed9d3013c15ef0c2f65c7895e4818feb29192f02a3b6c0ed4f8bcb9cc150efd35e3aa8d77bcb37f4fb2f0ab6a10ad96aeb67d1862db4a616b7de555 WHIRLPOOL 2cd6e94ec4a6097b786ab8c3b45a56e38dff9bbe5116241515e09497228c4d455cb40de238981a0fca32d8dd9528c96e88caaf0ed82fa05288abfe7ee0d08a24
 EBUILD alabaster-0.7.2.ebuild 593 SHA256 35efaa77e5779ba9b43ce0691424449d05b0614d790648dbe9666939d1cff177 SHA512 e593e500965d1b0f9d190c0b4fe90318208a6ac7c2deb177cf4b1074d9c1eda533582914dbb5b082a136ad4b91542e41f1964e9d4d62de6b8456e97b9184fd58 WHIRLPOOL ad84f71c1c69ca153b93051475e29117af3c9027a8f5aa5aba873e0d6bc39339fd098800cd50e9876c799519484d389654ca413f43f2ca61d5616fb2b2ec9c2e
 EBUILD alabaster-0.7.4.ebuild 599 SHA256 4c39fca0c1fb738eb8f79ca61c3db7145f47ac50cb35d13c0a86df8dab3dbadd SHA512 2da04b258e613f543d7d807db6aaf308ae7bd14d2723f83faf6c8694f85773a68f2f7dca40fbe96be4c270ee63a2f2a8b30381b61d1329c74d6e241f59962afc WHIRLPOOL 6f8cbd21784132e5cdd4afa78fdee255e2c0fe2728cf4b7265ea7bdc7552969d1a029dc6aba3b71df0bd420e89c964e9995a4ea28dd1cbed888f929788d49f46
-MISC ChangeLog 1483 SHA256 c628ef675949292ee534dadecf6c96e0032f733c9c36f99c183ebc9aaca129cb SHA512 cd77594a3de5bb3c0c4d3aa9b2cd2bbaf83f0798fcc2e666abf610b41998e952cde5d77601eecc0f5c995c2411abd21f0ebeaf7738c826cbab391b403c0a8f4d WHIRLPOOL b5982b6586c80e2cb7b4c0fbddb38fdf48c84043a251b03c2a6a3bc3542b41401443c45329f6f09de3ce850025ca6e04f03b2dd88ac457d39ee91ea1b905352b
+EBUILD alabaster-0.7.5.ebuild 599 SHA256 d32df38eb5603df0f76842f43bd31140539fd637bf3e3128c6160351c5ef3aae SHA512 a77edca58b00f3c9b5532458ce67421d77b493d87751b1b89573597230c55f2f9c55515c6f1eb0b93209580f8d95b5b53ed4766774b97393343168dd4fe91dd3 WHIRLPOOL ad37807b08b523c4da461be54aebb59b565bcf9505a8eb78732f9058e71b445f95ddb2c8ed7cd0706ac8de1445d477423d7e577dc6a5ad5686a257f9a7006d58
+MISC ChangeLog 1603 SHA256 34d2f9ae322528139ad238dbdbcbd907341999b89e2d6a651d62206693790fe9 SHA512 6df7e5310dee0a021383106e75888713e5fcbeb430e5b8bd0302cbe442e4de6b7fb0112e7a189964206ec830f226f8ecf465e25dc0b430cfd37285d5fd86cd56 WHIRLPOOL 73ce4e7209dced7b3f57b0adaabdd405be79d5b9289d4ea56b3e5442556c839ef39e168b02e984fb6ec7e1b324c1cb453e7769f95a2af9655051ff322950e107
 MISC metadata.xml 299 SHA256 917ef5794d2da43651476532b395acede1e3a3e01fb801944ba8520a59b5bad5 SHA512 4e8fa4ec92dfca21cb78cc2badd0bb1c5656069b538cca8a235628f11772f4ccfb40964016579e4742f62e5f04b95ea77fa273982929b350862a89f47880acb6 WHIRLPOOL 74801b4716217145a3aa1ce823b39d51359e1d7b0d4c2a7b798fe7eb9ea9c6480330073e7974001d0243f16515bf804d61cf87bfaced33744a030d03e7fa0c38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVc1A+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVgVfwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQd0P/2sQUULw2uQjNH7tcAuQuQ4/
-Job3kuWZbPlljjvw/0fLRy6/jVFWgOXtUYHdRuvjh2MKP9dLtxKLzt/uHBTJ1BZi
-pILc92HNh8OCLd1F2P08k8HHgq/Q+rVhPBOWdxkVuw4+K/MIrCf5ZagKOoOA55rc
-+O7kGhBPsZNU16yHKYrYd3Cim+ReQQo9+r/SsUnr4ZWfL4QKD5H0vXOxiV7oLbwH
-1eJoR6JTiUB8raEyMho19j/j/eTlzapwvxNWp2dRkwB9g8l1Z0ms2cJWvlbjPHGy
-j2zYNwCw2m3jYy0FbSFDqNo2qAueB1UenuyWVbV1yk+7cX7KWk66GFszYgkLHaWg
-4varCWlnIzeFYTXi+pj2G8D1z/GDvoi5nKF7Gth8OV6Y9rFAcDvuL1hFEalyDS2O
-haSmuHb1DTlV4vuy6P/gqvA6kmnWOeKiCsbQnhn67Y1uMpSdCDIur1W3l6JFzBqd
-VsaGQDCEkt9RdihlLgIthAH8Zlv/zN08E5AqY2ZJyVHZgvirTqNwjYhWuwYVSAR/
-0jf4fB8Oc/D/yVf35k5wK9IZBXshGm/DyeOckBtwTu8HErEdIbgJ5+B7CgYBU1JU
-HJYarZQmnHqCPEOuV6LviUxwam2ZqlVBP9xAk0um6rqLGP1uWLsbDelFPtLuibBg
-zEXeuu9OkbNTVRr8lgjo
-=jhTY
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4UMP/2SIj06vfPdEUPSoy/5juOLh
+OKy9VguotZk1mxsF+qT5G6rdzCl9SbiIwiYHfkPkG15FeGIDD5xjieHf5VHs0kIP
+SH5zSL78DzJ0Csy74mmX7t4O4Q4dLwS+CXaP7RGzgdz3XA6jV6rcoiPTIo5qd7+2
+irbf6ITcA8+uqFvD5kgs4C6TYNuqxUbKEurPL1/2C8X4AjCpJ14YnzXo84WhtNdF
+GULs3VH9fpY9XDDye5wkD/RiMKN87zY3v9P2QTDh6IFQ1n4DsDBCdRGAGjL2qnSW
+rcgF2koWNIx3JvSg0HVaI8J1Ba601NqGjGNjVuiaz1X5lqlsogChocIs2FHHg+z6
+RB4GOOemWLk0rDV0DwIc14t2+8wA7rb4PJIn8iWJszRnTy1ZYbjfMjA9fy7tFEIp
+X3vjXAHgfyWSK6GNnNYJkSEwjgL4FtQMs6l5XgKXDF4+aBaIvJcj2lbmWGg8ftHM
+leyyow68SqqHx+ab2nK74mTiVWn4Nz3MSvDRBQ1jSHRgjYNf0/4M8QwoPjwq2Itr
+vy/whf9uY72w4k583OOttCFdmK7wqdUva3vuH73FkhRpjDrEKtl9cKBUC5b+WWP9
+cX0y5hpBXLQVjRNPZbLlN6rAe6FfnwKyXm5bAWryye9zTakYwhPLZoZStEU9QOkb
+6PEBjnkhDbKC8Sf/7380
+=ZU+g
 -----END PGP SIGNATURE-----
diff --git a/dev-python/alabaster/alabaster-0.7.5.ebuild b/dev-python/alabaster/alabaster-0.7.5.ebuild
new file mode 100644
index 000000000000..6d5fec450eb6
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/alabaster/alabaster-0.7.5.ebuild,v 1.1 2015/06/17 11:20:14 jlec Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/bokeh/ChangeLog b/dev-python/bokeh/ChangeLog
index 0e781e965cdc..20f6d470fe77 100644
--- a/dev-python/bokeh/ChangeLog
+++ b/dev-python/bokeh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/bokeh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/ChangeLog,v 1.16 2015/06/07 09:43:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/ChangeLog,v 1.18 2015/06/17 13:27:04 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> -files/0.5.0-setup.patch,
+  -files/bokeh-0.4.4-fix_test_object.patch, metadata.xml:
+  Drop obsolete patches and local USE
+
+  17 Jun 2015; Ian Delaney <idella4@gentoo.org> -bokeh-0.4.1.ebuild,
+  -bokeh-0.4.2.ebuild, -bokeh-0.4.4.ebuild, -bokeh-0.4.ebuild,
+  -bokeh-0.5.0.ebuild:
+  rm old
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-python/bokeh/Manifest b/dev-python/bokeh/Manifest
index 3fc32aa2c3fb..d8950bb23634 100644
--- a/dev-python/bokeh/Manifest
+++ b/dev-python/bokeh/Manifest
@@ -1,39 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 0.5.0-setup.patch 744 SHA256 063f0c627ac2cf1e1fc458bfa74f52b6549a7d08b2ed5c8053ad902887058781 SHA512 49a90d915c8daa20318db9abf9d81fd7a633f4a78187bfe5787f4282c1791cdfc2e09d9ad204f294ce91a7a868b45427495bb4c810b8ea2cc968ab3759ebba16 WHIRLPOOL fb01167829cd8f4dc14e09ae3c22809783a839a2cbabe3a94e22dd638979f4e0a52cf5d44a9c444d4122fed6b1723005af4d86f35ebd0f7497810e97096d54a0
-AUX bokeh-0.4.4-fix_test_object.patch 1176 SHA256 0491d4a8e4337089a7a3fa44f1c8b410de87d526b335f5a8ada8c13f8526ab3f SHA512 e5858598adf8d6da79b0fa5c1c7f7410cf60e29b850ebca6df15988c28b83ea51a0375e91d15d292ee955a1467fbe2a61f67957d4bac5ad2154aea3237268cd7 WHIRLPOOL b2cfe9bcca0bccb52a2df6bb06636f0647a0de6fd55318568fe4fad0c55d67f7e1fdd60c39142db2022d16f3125f5819520d68461681c72bfe73bafacc61ba69
 AUX bokeh-0.7.1-setup.patch 461 SHA256 43596a37c6b25019a2f691808265949487a286b104fc3ba8a1fd40e38fc74357 SHA512 2d0930c1a44de8860ba447b456e7899750f3a65dbdeb497e1a757efad8a82fa5e52e46678d6f3d7fd342502e58a6ef1143fbc5d45c894265963b7563d56ad5b8 WHIRLPOOL 8cbfe9becdcb88429705db865381fd77b130fee8c35feec432737d222b7435283ea268585748fe10610c404f9e946536084b31e4810ae1be0cf49a214b34a3d3
-DIST bokeh-0.4.1.tar.gz 27784552 SHA256 141a1c3266f25b4761f78950cd14b7f982414b3bac9dc9e4698b4d7fd163d346 SHA512 5d4b3c89ebb2c7b56eee0cddf9be605d537403943a2c02ca1997d9e8012cce9a7c1f4118114f30e146174f200bc4f9814e3bd97ba52abe0a4db0b0b44c314bcc WHIRLPOOL c4eae45296f6ede8262c508f0b31180a7a6d0d584d6f7160d447dd0fe2089887ad6fa50e4624a5b1744c9994b77d590d6925b8bb6b565e0624b25077db4344d9
-DIST bokeh-0.4.2.tar.gz 21640415 SHA256 663d2a32cd17a2f9bcec43d63a05f148b551c17856e859fef2a12ddffbd7da5a SHA512 0cb6fd38d17a1067cb6941c44cde6b7c8782124be3f4baa66f51db066da1454461f338c8e342dc803a5c41163f810dfb9ecf422e26674acbf7447b899c3b7175 WHIRLPOOL da954d5e3be5014c1961cfddd11c220970c3e4ac829285dab9492e692b74f99811cb7b49fd02f40e585190c9616eb4e501e62f8d2d56715d4b314f3f6a66ce4f
-DIST bokeh-0.4.4.tar.gz 40315677 SHA256 ca989c9d554d07bface516ad9eccda39cf999c244c85ca52881b10fea0466417 SHA512 46dfe615a53996158b9e17e1f5cb46b401d017e18638457905f283cb3bb1d734207b370f3b3d78850e8e75ccfbe47736beba8b5730296f5db2677d5eb92423e9 WHIRLPOOL b0c56b43091d171b7b85ccec66f0986bf747479f8fbb20a4758a9e788533f34578c5ce6f87f704c34e27030a58890733003bee23ad85d9cf6ac8a68e6d80bf2c
-DIST bokeh-0.4.tar.gz 29824351 SHA256 cc95ebbac25f00929f0d7d58d8d5f4ced6d1fc541f16d2b37e410613671447e6 SHA512 8627f689fdfa7eec226d80db887f7a9fabd12770adab8a679bac188d0f5965a0d4d832a247e77b3bbfc959126cf57bddefc03b1b2e56aed60c8ab8d38efb9657 WHIRLPOOL ea3bf7b3d16c456be2cb21f1d3ce9c6d40cb46cb37e1c6b689b5889ffaa2b468d68218a4ac65ba7f0b8cf1637acb6052a09e3efe22a937a071d0cc73a2673bff
-DIST bokeh-0.5.0.tar.gz 39851142 SHA256 d9b5a0df8c8bb7b3903ccab9190e8fdf7dbfe74908be0ce2319a3f8137e0d938 SHA512 e3ceac8f780e27bd3fd1e8c5a628faeebfad105b68d977d570ca1dacb04ef1d9ba3b79a00ed0c47eb2e1e5ae163c02858181742a989b2e977f7e7d809a5cd7b7 WHIRLPOOL 9b65ab92e80957b07913021ec000e6947f602fc060e3490a4f8607f6f0d1d747bea11c3ece97aee77182977d6e5ffe0dcf9798a11703301e7461e8eedfb9fc29
 DIST bokeh-0.7.1.tar.gz 30039486 SHA256 167125e07df2ea1f65b1b6dfed140b7b6ed7452a1182ad4cb0be2580af537f73 SHA512 cf2ee6457cab7ca0a98c2cf19a7814e081245b30cf6f4f4670f8fc60b216bb39f14d3cdf52c92f85635cbf6419db00c0c01adb2e1a6eeaa019cdc767c642c160 WHIRLPOOL 23e66370f1cab2d3a3c40b0713e5cdb50afa7aeec1c2d1172a1d9a5598c004dd351509973ac84f24ebb30dbc5a86de455e1dfcbe00daf6a1d12c3e336122a2b8
-EBUILD bokeh-0.4.1.ebuild 1996 SHA256 4080712f7d2b48b74ef5ba369c66e540bc0a8fcc12d9de5f8f57026d45298c03 SHA512 d4b0a85eca1775201c7bfcf870281d611dfc054ab5d30878cdb6bf47b9ebf8a2f1f9919420fc195a54769db76f3d82ed9dbe0cb90b2bbb959ec2e79e50d66d06 WHIRLPOOL 71bbf5e74e9ec69fe1bb97f28d6efa84718b18cff60f6d61b193267fff2ca7b5a761712a3ebbe3b30e18a955cad41bb8f5c132578cf1cff673e239469d5013a3
-EBUILD bokeh-0.4.2.ebuild 1991 SHA256 c0ad528c22d21cc8325cfd5be6d8d1e057b8c122a4fb6142d136a06de767f2df SHA512 9d3fb7ad6b717f5799159815b46ccc893152536c412f5bee353effe9ce1f5a6167ee13a9a008c9d751861fc3ff17358806df10938ab2379ac9a974b66a7a2a65 WHIRLPOOL e03fda5eb5e76487714eaba96d789231559c2331f7e668e50361b53c3e1e873bcad2b07959950d413c46f0beabe01d2a4d4d6fa675ff2a5b5e8cd27bde8e36b8
-EBUILD bokeh-0.4.4.ebuild 3070 SHA256 1184c7181e2a38e7664d9d7c778030c6f886616d6544108528555f3f010857d3 SHA512 7f9755ffd5e81d180477377ec12f4b2b3df9bf929e4fdf2fdcd7501360c80022e155ecf1c223745e84798ca9923962b9c6f14bbb28cf342b9d08dd28c5ff7c92 WHIRLPOOL 69619d575531c2764b68b2a43028640d0a706168120d63ed3c2b00c7714f1b508b0001376663ba2fc4c3e3949555e237ffc73ab4821ee5678eb98d182b499995
-EBUILD bokeh-0.4.ebuild 1963 SHA256 c4cf0680e9c8ad1986980abd9373d73f137063fd91407e613df8ccd361e2bc8f SHA512 2b917f2bbd7dbcece4f2600284e98867e4cb6db6d6eec5d8fa1f5ebd51bfec4e8669e35c54085074759115d8129b2360713761504b4235617eb58b9a98a05c2d WHIRLPOOL d7d56f8449db3ae73dd7a6387ce3b666d9743a48f6968dd688e4e5e29dc2c7e81fdee9fb0e2917d64781fb2f5ade89cdb5df23adb60480855558fa05dfa080d8
-EBUILD bokeh-0.5.0.ebuild 3150 SHA256 3c73d66541abb22ed9c118e81feb43106e0d02787be692904819c41c28455458 SHA512 474fe9898c351148505cf9cca42e6a3e5036e8db7d58509bd4e5465959ce08463607a9d40ef0db0c0357f61910c9caad17ee90f239c73c634631e5980d0cd59b WHIRLPOOL 94c0e9339f2b73a8335e62d89441e4927ca72d0c467f123b781515ee65501287298c4e8235563a5fdbf276aa5170bfc738b031ce9b0768ae656d5929b4933e89
 EBUILD bokeh-0.7.1.ebuild 2962 SHA256 ef3d389af6cba8d71a71840a5e47f43a7ac9723deda60590716cba9305c6f444 SHA512 28e48833679004853fac509b6e88fdda525391bd1ad13593bb064832c6cdeeeef8d44b4bd77b8eb09724e42aa9e711a600528ddb7faedac2793faf25dbe2eb1e WHIRLPOOL 23dab27cab2b09d1d98930481ac12220b82ccd70eac232c1a8f1bd5df69e91bd9f69f2366adb94faa46dccae3d5096cab09669b7b48195c73586afc58432550f
-MISC ChangeLog 2286 SHA256 b9cbed3363d1027998ef4af0dbd8af6dd56b119583ec89539ada826c52e879f8 SHA512 426644c7579c52a6a1735727b554937875bcd476f70c05d5c1500feb2bdd4d2878ab7f07885e3caa11e6c2e10cbf424b878153611a1e6d34f511dd43ef099b45 WHIRLPOOL 89313c95f181d5e9e8a07c096f58662bdf29aae04968d40c1c7503e9c8bbe869858ddc65f42257979bd403e6f5a0964b2f1ad5f9873654fc14bdb43755313af9
-MISC metadata.xml 777 SHA256 7947d464b69f31bb0f1f13f0606abaac117500ae43673ad9ad68ff7c3c9fcaf9 SHA512 08ba119c368fb5f7273bcffdb917ce57a0c18f2215c04684d752d069ec638a54bb2a9252aaa84bcfd17674c0d49d98257e7785349f2611c2403fcac70d3350c5 WHIRLPOOL 35dab13c2f2ec9ee1cba1de72177670ae8df0e97217bcb2cebe8c27abe1008a38c316a93ae33595fb7340a95081fc16fe5b79621ca7191401e5a624218e849ff
+MISC ChangeLog 2621 SHA256 332fff3552d5e8a44f74af28f5c8202cddb95853bc160b4f6293a6cccde0c276 SHA512 79d191034ead75e66bb0fa8dda0cfcd030a716c887e5488c37e1e1ce514c3f84a12d57b7f2483fe8de364cbc83ab046bde2186f0f41ce7c7ecb034889250b262 WHIRLPOOL 5ea2d7be10429b769fe52b77d7477555fb3c6c1650e8c455753f29a6b064ab3c583095ce2cf055b0c3e37a0c4d0835f0199dd00ec9e8db102ea8c76aaca47785
+MISC metadata.xml 648 SHA256 244d3beaf474f33c3fc0a00e4f7c0186176a04e71b81a48a3a5408c5280fd299 SHA512 196d84a4111fcf6c2cd3bb175b66e75fa7339aeaf2f63b6c7c4a2a1cb8acd2d439ee231499b2c01f4708633b0d24e761a4d789bf5bf38d0cd11915a772b551a1 WHIRLPOOL f4527eada44649d48e6af5019ac242e4ffef5ca64b3316452133a0dcf2412686340622e9b0d1cc7d91d1de7f925d3422cf99b431d0cef992614ebfb895eb2bbf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVdBJbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVgXWpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAJAP/09J/DyCD2MiTDzi9U0h5PZG
-0KS7RS6HteRQ5sLEtPrY+dq57B/uJmPIG1AtBQOAyeetxQZ8UL0J2W4XrloOBQTB
-IkwvBWZTVtp22hGpvp9QPy7GbPd0CAPJK/lYC4dKJKhFMa9TvjB+fgwNP7EGqLBj
-F7WMiKkV2mdWk+ZL8bQWkWrVW10s3MPmEYMdTQPSBTCO170/9WeGY4BA/ZXiOqW+
-KYl5B/Eonc9qkLxh+wJF7UL0CBJyoKjsJCgMGuCDSpe9Gt8s80i+qb4JvvPJdIY6
-4IBSZfldZEt31TpEfKYFbtth99Bz/gf+eQ5gMpXlOwjpm/w0kN+swMrj4We34khj
-tppHfyOiIPCriott/xGSxu081VV7qVBpKrEw/+CXEA6RCiyRFyVCJN1CGqUgmxjk
-YcsmH3Mx7Nb2D3CGcw9zvysp/lc3uobh53Teq20XKNfmOp4dWzPGpQmdloKcJU85
-gor8TYTuIF5YPBy5F0M9uKbocfIQC8bgZS8NYy8oDOEtvjwKp8kOZyUaZdm7pNEh
-JkkpGJZAkY9CfNu1jqtO3Yg8z0oJQzOvOnBtT3kowJ+bhYDt9TuEoS19E7LtzeUN
-xnFS0tTsZounGu0o6aI+tNl5n1ATmutZzZDXOiiGup25bzjrqcO/SOE4dtbpyQcc
-u69XRQ958B9qZTkwxEbL
-=Fi1r
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisTQQAIJ/FcJP1YF5osJLIqbXH3/H
+ChOOfWJPopjHgWbk5fwzzP0kuwpWy5Ze9CoobhGugNDLKsnAXqhUvDiJvLntxFD6
++5I3+fjh4KBF3ktmYlUAxp6vGGs/87a5zKseGeSBjmRJGYJ885EIWI6u049JQlUJ
+Qpx+PLl/YukZnj5SJQlmhHo55K6bHEfmEs2yIUz83w/QjbP+ep3qPs6Y8OBIWnnu
+SwEYC++1uEjgA7v1KcLnwSkObtNI5S3GLS18+Z3hI1Cs4nTJ30/glrHJ6eZhT2Zx
+N1BddfOjnUiKzs8Rgby5MKNsnQ/SKyNCap6Q6Ms+eZvSiJRdZJ7tZ2KHVndHnAwD
+NGwJHnLWIBFGyUzPrSMuq6PAzLcXrVy2OIT1vCtb/znvFwwOzg4i99lHgG67Dadv
+kEQ7fX3VgCHIfGanR4Uo4rWE4u43qDsvebSbvmN0ne0Rn2e7oo8gKoYLFU6BP9OH
+RP5fpMzYJ+lf+UlVvJnz4b2nmeQXHF+eL87V8fTr7rH+309Y+0cMq0jLd3FJ1on1
+aiQrUAg3Q65V/6DU0N4RSrc//l0mjytsFUQTbo4tpcFGZKcKit98GTyApKGiPh/A
+dy9xJv5DFr587awCl8PufdV4w7bsn5aVmeh5pw6cnZg6wMSL2/2hm33zU9EITwVR
+6SIbG6xkLlQcV4GPjM2k
+=CaQO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bokeh/bokeh-0.4.1.ebuild b/dev-python/bokeh/bokeh-0.4.1.ebuild
deleted file mode 100644
index 2b5a27a5aa08..000000000000
--- a/dev-python/bokeh/bokeh-0.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.4.1.ebuild,v 1.3 2014/07/06 12:40:22 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/chaco-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/gevent-0.13.8[$(python_gen_usedep 'python2_7')]
-	>=dev-python/gevent-websocket-0.3.6[$(python_gen_usedep 'python2_7')]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/traits-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-"
-
-# testing server: needs websocket not in portage yet
-#			>=dev-python/websocket[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}
-	test? (
-			>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-			>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-		  )
-"
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# exclude server tests for now
-	nosetests -v \
-		-e multiuser_auth_test \
-		-e wsmanager_test \
-		-e usermodel_test \
-		|| die
-}
diff --git a/dev-python/bokeh/bokeh-0.4.2.ebuild b/dev-python/bokeh/bokeh-0.4.2.ebuild
deleted file mode 100644
index b27a54d005c7..000000000000
--- a/dev-python/bokeh/bokeh-0.4.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.4.2.ebuild,v 1.2 2014/07/06 12:40:22 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/chaco-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/gevent-0.13.8[$(python_gen_usedep 'python2_7')]
-	>=dev-python/gevent-websocket-0.3.6[$(python_gen_usedep 'python2_7')]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/traits-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-"
-
-# testing server: needs websocket not in portage yet
-#			>=dev-python/websocket[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-	)
-"
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# exclude server tests for now
-	nosetests -v \
-		-e multiuser_auth_test \
-		-e wsmanager_test \
-		-e usermodel_test \
-		|| die
-}
diff --git a/dev-python/bokeh/bokeh-0.4.4.ebuild b/dev-python/bokeh/bokeh-0.4.4.ebuild
deleted file mode 100644
index 9aa56d1a936c..000000000000
--- a/dev-python/bokeh/bokeh-0.4.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.4.4.ebuild,v 1.2 2014/07/07 07:56:48 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test chaco"
-# docs require napoleon sphinx extension which will be included in next sphinx release
-
-RDEPEND="
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/gevent-1.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/gevent-websocket-0.9.2[${PYTHON_USEDEP}]' python2_7)
-	chaco? (
-		$(python_gen_cond_dep '>=dev-python/traits-4.4[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep '>=dev-python/chaco-4.4[${PYTHON_USEDEP}]' python2_7)
-	)
-
-"
-# testing server: needs websocket not in portage yet
-#			>=dev-python/websocket[${PYTHON_USEDEP}]
-# hdf5 backend: needs array management not in portage yet
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-	)
-"
-DOCS=( CHANGELOG QUICKSTART.md README.md )
-
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_prepare_all() {
-	# Fix test_references_by_ref_by_value from test_object.py
-	local PATCHES=( "${FILESDIR}"/${P}-fix_test_object.patch )
-	# Remove broken test case
-	sed -i -e "s:MetaTest:_&:" bokeh/tests/test_bokeh_init.py || die
-
-	if ! use chaco; then
-		sed -i -e "/'bokeh.chaco_gg'/d" setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# exclude server tests for now
-	nosetests -v \
-		-e multiuser_auth_test \
-		-e usermodel_test \
-		|| die
-}
-
-pkg_postinst() {
-	elog "websockets work only with python2_7"
-	local chaco_msg="chaco useflag doesn't affect python targets other than python2_7"
-	if use chaco; then
-		if use python_targets_python2_7; then
-			elog "${chaco_msg}"
-		else
-			ewarn "${chaco_msg}"
-		fi
-	fi
-}
diff --git a/dev-python/bokeh/bokeh-0.4.ebuild b/dev-python/bokeh/bokeh-0.4.ebuild
deleted file mode 100644
index 7d5438783cd5..000000000000
--- a/dev-python/bokeh/bokeh-0.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.4.ebuild,v 1.3 2014/07/06 12:40:22 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/chaco-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/gevent-0.13.8[$(python_gen_usedep 'python2_7')]
-	>=dev-python/gevent-websocket-0.3.6[$(python_gen_usedep 'python2_7')]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.23[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/traits-4.4[$(python_gen_usedep 'python2_7')]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-"
-
-# testing server: needs websocket not in portage yet
-#			>=dev-python/websocket[${PYTHON_USEDEP}]
-DEPEND="${RDEPEND}
-	test? (
-			>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-			>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}]
-		  )
-"
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# exclude server tests for now
-	nosetests -v \
-		-e multiuser_auth_test \
-		-e wsmanager_test \
-		-e usermodel_test \
-		|| die
-}
diff --git a/dev-python/bokeh/bokeh-0.5.0.ebuild b/dev-python/bokeh/bokeh-0.5.0.ebuild
deleted file mode 100644
index 9cdee2fe89ce..000000000000
--- a/dev-python/bokeh/bokeh-0.5.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bokeh/bokeh-0.5.0.ebuild,v 1.2 2014/10/30 10:59:05 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical and interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test chaco"
-
-# A doc build requires napoleon sphinx extension which will be included in sphinx release 1.3
-# Therefore refraining from adding the doc build for now
-RDEPEND="
-	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.18[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pystache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013b[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.7.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.9.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/gevent-1.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/gevent-websocket-0.9.2[${PYTHON_USEDEP}]' python2_7)
-	chaco? (
-		$(python_gen_cond_dep '>=dev-python/traits-4.4[${PYTHON_USEDEP}]' python2_7)
-		$(python_gen_cond_dep '>=dev-python/chaco-4.4[${PYTHON_USEDEP}]' python2_7) )
-	"
-# testing server: needs websocket not in portage yet
-# websocket is in pypi for the adding
-# hdf5 backend: needs array management not in portage yet
-DEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/colorama-0.2.7[${PYTHON_USEDEP}] )
-	"
-DOCS=( CHANGELOG QUICKSTART.md README.md )
-
-PATCHES=( "${FILESDIR}"/${PV}-setup.patch )
-
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_prepare_all() {
-	# https://github.com/bokeh/bokeh/issues/1352
-	sed -e "s:        'bokeh.mplexporter',:&\n        'bokeh.mplexporter.renderers',:" \
-		-i setup.py || die
-
-	if ! use chaco; then
-		sed -i -e "/'bokeh.chaco_gg'/d" setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	# exclude server tests for now
-	nosetests -v \
-		-e multiuser_auth_test \
-		-e usermodel_test \
-		|| die
-}
-
-pkg_postinst() {
-	elog "websockets work only with python2_7"
-	local chaco_msg="chaco useflag doesn't affect python targets other than python2_7"
-	if use chaco; then
-		if use python_targets_python2_7; then
-			elog "${chaco_msg}"
-		else
-			ewarn "${chaco_msg}"
-		fi
-	fi
-}
diff --git a/dev-python/bokeh/files/0.5.0-setup.patch b/dev-python/bokeh/files/0.5.0-setup.patch
deleted file mode 100644
index 695822c4aa86..000000000000
--- a/dev-python/bokeh/files/0.5.0-setup.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove inappropriate check for a previous install. See Bug #527336
-diff -u bokeh-0.5.0.orig/setup.py bokeh-0.5.0/setup.py
---- setup.py	2014-07-09 02:56:57.000000000 +0800
-+++ setup.py	2014-10-30 18:31:42.075161454 +0800
-@@ -253,12 +253,6 @@
-     site_packages = getsitepackages()[0]
- 
- bokeh_path = join(site_packages, "bokeh")
--if exists(bokeh_path) and isdir(bokeh_path):
--    val = raw_input("found existing bokeh install, remove it?[y|N]")
--    if val == "y":
--        print ("removing old bokeh install")
--        shutil.rmtree(bokeh_path)
--    print ("not removing old bokeh install")
- 
- path_file = join(site_packages, "bokeh.pth")
- path = abspath(dirname(__file__))
-Common subdirectories: bokeh-0.5.0.orig/sphinx and bokeh-0.5.0/sphinx
diff --git a/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch b/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch
deleted file mode 100644
index 24183d8313d1..000000000000
--- a/dev-python/bokeh/files/bokeh-0.4.4-fix_test_object.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 9606ae037dbd9ee888f9763a1bd9c6d7fc3b5824
-Author: Bryan Van de Ven <bryanv@continuum.io>
-Date:   Sat Apr 19 10:05:35 2014 -0500
-
-    fix #548
-
-diff --git a/bokeh/plotobject.py b/bokeh/plotobject.py
-index 7485d27..92ae2dd 100644
---- a/bokeh/plotobject.py
-+++ b/bokeh/plotobject.py
-@@ -220,7 +220,7 @@ class PlotObject(HasProps):
- 
-     def references(self):
-         """Returns all ``PlotObjects`` that this object has references to. """
--        return self.collect_plot_objects(self)
-+        return set(self.collect_plot_objects(self))
- 
-     #---------------------------------------------------------------------
-     # View Model connection methods
-diff --git a/bokeh/tests/test_objects.py b/bokeh/tests/test_objects.py
-index 1a17f69..75d5678 100644
---- a/bokeh/tests/test_objects.py
-+++ b/bokeh/tests/test_objects.py
-@@ -242,7 +242,7 @@ class TestPlotObject(unittest.TestCase):
-         x2 = X2(y=y, z2=z2)
- 
-         # TODO: self.assertEqual(x1.references(), [t1, y, t2,     x1])
--        self.assertEqual(x2.references(), [t1, y, t2, z2, x2])
-+        self.assertEqual(x2.references(), set([t1, y, t2, z2, x2]))
- 
- if __name__ == "__main__":
-     unittest.main()
diff --git a/dev-python/bokeh/metadata.xml b/dev-python/bokeh/metadata.xml
index 7b2939e15493..e88bff661521 100644
--- a/dev-python/bokeh/metadata.xml
+++ b/dev-python/bokeh/metadata.xml
@@ -9,9 +9,6 @@
   style of Protovis/D3, while delivering high-performance
   interactivity over large data to thin clients.
 </longdescription>
-  <use>
-    <flag name="chaco">Enable interface for implementing qplot and ggplot like functionality using chaco</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">bokeh</remote-id>
     <remote-id type="github">ContinuumIO/bokeh</remote-id>
diff --git a/dev-python/eyeD3/ChangeLog b/dev-python/eyeD3/ChangeLog
index a13a5b2f359a..fd45ed3f0a1b 100644
--- a/dev-python/eyeD3/ChangeLog
+++ b/dev-python/eyeD3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/eyeD3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.87 2015/06/13 11:04:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.88 2015/06/17 08:50:26 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> eyeD3-0.7.5.ebuild:
+  Stable for sparc, wrt bug #500960
 
   13 Jun 2015; Jeroen Roovers <jer@gentoo.org> eyeD3-0.7.5.ebuild:
   Stable for HPPA PPC64 (bug #500960).
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 7d088a7bfb86..f985b8bce095 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -4,13 +4,23 @@ Hash: SHA256
 DIST eyeD3-0.7.4.tgz 207001 SHA256 a138e6e1fd5b8c2b7947a2d22868167ede16bb96e8e02a067951388bf1fb3000 SHA512 4e74daea9283890e3189ef03a68ce6ccd063ce21d86201e2a1d8e7d769fa2d532e8cdbcfbd02b3f04a1914bceafca8dbef6e89ba60499ebd436d57807ebd067b WHIRLPOOL 7c0c77813368dffde589c65c9049253f50b72dcbe10947ab785c5322f766af9b6c839a78769c8a19cf26a259f21230624a9b0d328931dd8fa847d4252f3ad9dc
 DIST eyeD3-0.7.5.tgz 221685 SHA256 6a60f6dff7c8b74fee11eb378447b3bbbd2433ca5f7a00846840b0b2ddec9222 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5 WHIRLPOOL 08c8e3771d263548e8f3213653f6846ee0d55ebd56816cddf03d80dd6d6b7d7906ef85045d13f599137e74ce0d59a76a4862a2ff5ae5d3e1637df7794a6cccbf
 EBUILD eyeD3-0.7.4-r2.ebuild 1232 SHA256 894450806d7ff52cbea67b80f81e26c42c4d449ec2382e5da84a775b51814e3d SHA512 2cfb5e4d268613b7e92f89e26fd0ac4b72586be011c04c753b8bb070f3e4044b58e87bbed37f497930934da6fddc2c97e2b6e09fc77912322de7e5e7113db4f0 WHIRLPOOL beb27427514d6b39f5e0cd3cbf9362de8a9e79570a3a86c302e14f5f761d21556ef3ea1a97b447982647503d7ac2b438ab826e66cf0bf7e3210054cfeb46cbae
-EBUILD eyeD3-0.7.5.ebuild 1134 SHA256 531cb2698ffb9bc3814fe9b0a8456ce1101c5b0eeecaca4ef1b31939de55116e SHA512 fbaed158d192b62c044a72e3017cb523692db010642fb9bf52ff835669bdb108b46aa35b4988542509b47209914ef72b9fb4682cc991d8f525a039c11c9ddca5 WHIRLPOOL 6354739694ec688a5be4d2261614807db52a13f26ba6c9502975da3c5a0926a6353c28000b0e7c391e0fc4b200670897b0f82c8d8caf0ee543a26c9a65df327a
-MISC ChangeLog 10811 SHA256 23130fb57ab6b18021329626fcfc488150e7628224eaf708446fc0b369e77f29 SHA512 fc76a134eb6810ff0ace9d9d7eac5322c9b4326299b5a39f9cb2a128ea61712306c4b46ebdc9387b47a6b063f0f041c75bfec02f3f96debcee23d9e3c0a35304 WHIRLPOOL ac6ff027d38ae62fbaddeae910c935a24c3150a51ffdce9f94b4919ad377609812b74b6bf3f4b2136e87a6f5f3b5f04773703c27baa3a285d74b4c60b34a359b
+EBUILD eyeD3-0.7.5.ebuild 1133 SHA256 4986d71da7845a561dd5457557263e5ec2e10eb09b5184b3710bf153b2201366 SHA512 18488167151e79952207e5966e7a3ba858de0928ef9919537fa58218a3d94cc9c5f3d3b9b23f2c910179053fb3f1aa6681086ac3470afc12402e7724fd0250c4 WHIRLPOOL 6bf097ddf33c114ebb1db7d661004b693a23b5af0ace171cf990b6733765842cd4c29eaae17790da5843a2c6dc649a4b51e5dff37750af8c2e902cffc6e63858
+MISC ChangeLog 10917 SHA256 b714b9ede834490741ec52da3a1f065fdd97f52abb9079b628e6f80384204ede SHA512 d7bf596df100afbfd2eded889e3952dd41cea8484e17979277d7f285e3a8ca8c2a493fbd50d4185641e2745d0b7d7cc0333a3dd10f292a28c87b5b9a46353a49 WHIRLPOOL 8371da5bc051472a00b614e8600723b108803be8fa7932c4343325eb90e2ad46585659b6831ef01106d3517632a187dc8fdb36c768a5453c8906bed86a85b61d
 MISC metadata.xml 180 SHA256 cc06a12ae2dbcff1975aaa40f4b1e52c85cc3522a2a306f8ec0e386025e5ec15 SHA512 741a8e3f9dfadab3abb90022147a515e34026d4604e4d7655a3173e728c93400dda1ad251faba402e31667c9644cb9d0a74aa6b5a178f7d20295ab5ec9fb2cc7 WHIRLPOOL c32378f2b4a23a9f2d13edd2d6492a7ed0a1a34edf681c637fccbbe674f66fbea4401b728958f616b4bcc595e169399e14fa883ac13b1d0a3d0bdd1a92cbd16d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV8DlcACgkQVWmRsqeSphP+uwCfYcXMq8sEBbti+XkeZnjix+j8
-JHYAniQeIGY7/OP6KyM6jHoU2kpNdwaF
-=gQeo
+iQIcBAEBCAAGBQJVgTTSAAoJELp701BxlEWfdNUP/ipdmQ3U0tfhnlhgR5+oaYkx
+a6l1T4R+v3YsdVJdAZD0BjFhqD0aur2izYqeCpKbclg6q6u6pyZoN+LKwlkYYJZN
+dAoVByF9ML9nKSphLt4nvjQ3nnqKQQ5T91MIV1Ep0yK89wB3sjHI9/OB7V6PO5VH
+Q51NP3p7XiyvcveesWg7H3g2qR34QCW76/ikvXnFCf1tZwdXn09gOxggfAZ2QXJY
++1bgSiE8o1h17EP+uhnaWkLrO0mtHXCqcyZgt5wDtUhJMaxr+NANGLngQ9PY5uET
+ES0mIR8H054ADMn1xDDmqeDvzeKuBaHKMJf1EA0AQqikKLsn0BGOHQciCBwJZbQh
+T3p5qfZr+fzn4M6HZjWiJfpdgz2Iow+B+getui3xuWiZZDboqnMwR0YTbwNIUTBB
+xHixNuijZNop+T9dyohInb+BA7OtLL6RyJ7yxo1iFgVtNfj+utSIVg1X9jVWVaxg
+QZWSmVOQgIsYj/mwM8X8D71ftJUj8QbkFapIJiRUhsQT2hfdNO5OdFZVoTbVlJoa
+Fp9NbC3P8mQvpRTD4KttLX1UFtcicKodfAs30EWS6s1GfUzTPG0aSCCdMbMJlw7p
+OIudIlqsSEzdJ/zXjJMonaAOPYYEMnmA29Xpd459sWsQDIzJMcyXWU2PT5AMoZIJ
+UUoRjL0R9bitHefM/83q
+=XJMo
 -----END PGP SIGNATURE-----
diff --git a/dev-python/eyeD3/eyeD3-0.7.5.ebuild b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
index 44bc21c990f3..4772564a9dfc 100644
--- a/dev-python/eyeD3/eyeD3-0.7.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.5.ebuild,v 1.5 2015/06/13 11:04:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.5.ebuild,v 1.6 2015/06/17 08:50:26 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://eyed3.nicfit.net/releases/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN}-0.6.18-r1:0"
diff --git a/dev-python/flask-admin/ChangeLog b/dev-python/flask-admin/ChangeLog
index 70fbb7b8a967..1bb9943a3301 100644
--- a/dev-python/flask-admin/ChangeLog
+++ b/dev-python/flask-admin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/flask-admin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/ChangeLog,v 1.6 2015/06/14 15:41:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/ChangeLog,v 1.7 2015/06/17 08:40:36 patrick Exp $
+
+*flask-admin-1.2.0 (17 Jun 2015)
+
+  17 Jun 2015; Patrick Lauer <patrick@gentoo.org> +flask-admin-1.2.0.ebuild:
+  Bump
 
 *flask-admin-1.1.0 (14 Jun 2015)
 
diff --git a/dev-python/flask-admin/Manifest b/dev-python/flask-admin/Manifest
index b4fdb07b4ffa..5677a3e08c2c 100644
--- a/dev-python/flask-admin/Manifest
+++ b/dev-python/flask-admin/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST Flask-Admin-1.0.6.tar.gz 235842 SHA256 c16d1bb1b6c2b6ac8db8486b9a5e1919d1a073252e3fb0c0c226406470113a54 SHA512 a30e2678a063d45d55ccf41cfec07fd16973cc8c770b1e7f16d11b9aba693049b1d9d4cff81d8ae8f2548d019f977f0906728e98d23d229d76bf135a079abc8f WHIRLPOOL 9851b8f7e59c5b7bf99e2e58a0ad72076578f12564146a282b9e3e0e79bd31bec7a1fd394dc807b8152165fce617c6a7b025cfaa987680a649412a3d1c3f8e8c
 DIST Flask-Admin-1.1.0.tar.gz 735408 SHA256 28380393143a9b209e22c256494ba3ab1b6aea86f183962451896e26e75a8609 SHA512 35e21cda38ba8658940356240df7b3feec7619a5ab7c31c70c8a962b385d391d78d6440716c7dfce00fb48bf1243799de2a3d53b3cd0b7eee45137e2ebd3273d WHIRLPOOL d2790169dd3711864ee190c328bc5502622706af6a3c306b7d8c00459a0859af4b527b0dec449a824459361f4602fd1c1f7a96212e2585c3d46df3beb48197ec
+DIST Flask-Admin-1.2.0.tar.gz 790881 SHA256 beb4b3edc25319e8848889ff2460f489cf85a457a46d1f1cbc09f332452d0260 SHA512 77be8cabfde74ccaef4818e914d792583b54dcdeedb15f89bcc89e074e18333a9a40d9ea03bef6c3409c24a18cd9ede06fbf9f3a7529c63ef28affd705a2d42a WHIRLPOOL abf61615f724586a3074b3ca546be96d9d332c8ffb1cf15111b9c837c7c2b9495a6664eb7cdc6ba9b4cbda6694ea2219547e302b621aa170a1d6c6355191d6aa
 EBUILD flask-admin-1.0.6.ebuild 1114 SHA256 1e0848a0893bc87b6db9d213213e85e0499151ceaf7f0b4d359836c96045a570 SHA512 10a5df72978a7c338d6edacb57986143e04860f89a940aff6f7fd4e7c3ddf1ce5af7db403db424269d7d4f643865eb502789b2504903bf5de7736cfa2b867fa4 WHIRLPOOL fe1085993713dec947dd5ea16c305246fe2ae77a086da992e17262e12d918474128c86247794c4ccfb5bb7058ad3e6447734e9efc9d9a6673b28b84e20370138
 EBUILD flask-admin-1.1.0.ebuild 1276 SHA256 54a0113b31ace227ae44f0f9c33c01afafda18f22763abef8ccdd90ca1a0876e SHA512 b2b249fa70f28ff5bc08c59f278cbfec8d8eb5dd3eadada34d062f2cf3e45380ca222be563c759ce23413229656882c7d08fedc0f180f85e7e42ccfb9b76bcf7 WHIRLPOOL f41e99cfb038751204bf35bb3606cce360a62c3d16858a878f07ca423d7bef74266ae4a20b1780f875609f91e465cff226af4545f6ed01f9395a98c6391b3e71
-MISC ChangeLog 963 SHA256 cb022f4a155a7c9193d242690b1cedc30f40cde708b55498982f9c5ec442dc53 SHA512 846ea792199fe91796ea9435d5085a302f10a682c8d20fbbd19dedb2eeab91cf6d95ef7a6600297a80e07ae4ff82a89dfeb1c5c07c1d8e52ae24c784a3871d8b WHIRLPOOL c3546c610500300a971b4a54c54264d3044d225f7c93f65aafaeccc99041aa36710469d1f760f2d22e5c13d4afeacb4c1dabc316a4f2ed9c9c6ddf094217b8fc
+EBUILD flask-admin-1.2.0.ebuild 1314 SHA256 3024e36659044a6b54e189117613a50b60e562db8268d315be5c46de5c331021 SHA512 237241eab271dfc4b607922462012c633815c88ca866a9f18377bb4a178b6becae6830bba0c4a27b7e7e133bdd97fa07d97337568160c5b21ed1b73bbadece3d WHIRLPOOL 93ec4e2d3cfed5db87b476e3999d78d1adc6aa9d5a83e06f8b02c41d7d9b1aeb4dbc9df76919b2d5af1cef4067a7059fe511413cd3c192536fe5e27ecff7eaca
+MISC ChangeLog 1082 SHA256 876ab1d59c511f0eabc337a26ad2b7e9ff99ec1ba63ed8b31d51fbb144af016c SHA512 bea0db507a9ebc0bfc44619a92624f191046869137319d803d3fc314069800fe7c4da81e6336d1eb331649b9807b6970ab9e0246b3782ab9f2637a3e674aca3e WHIRLPOOL 48dd7d58bbe0a99e6559773da18cb6a9845fe96ad6b7972de8e46584bba23103d1493697cf6b2fd4a4771e57383c4c2cd9f9469841f0002c86ffde2f48a36115
 MISC metadata.xml 239 SHA256 87595ba8ce2b73aaaded81977dc357bf118fc26c114767bb2232ef83741b5e0e SHA512 29a9c9b774df7aae361406d0ed3512d73f204a4f97c94352b30379c9aef0d94b33253d6ef2ecae003ef831c07dc2fda049b491f71864b47b901aad9bc8414e36 WHIRLPOOL 9ba320bbedf615c244d50a2eac805cb23373ba97cc76739ce2d7a573d3a1ef02303e4d0b4dd8c695b141464dd02c946d3bf90170b684458ab87497189974e94a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
-
-iKYEAREIAGYFAlV9oMFfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
-OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw30fQCg0rC47wG3xdxsG5qfrSV7Ys9C
-FzcAnArJnxlew/W0LvncUMkBZA/1ih/+
-=7X84
------END PGP SIGNATURE-----
diff --git a/dev-python/flask-admin/flask-admin-1.2.0.ebuild b/dev-python/flask-admin/flask-admin-1.2.0.ebuild
new file mode 100644
index 000000000000..5f2707dedf78
--- /dev/null
+++ b/dev-python/flask-admin/flask-admin-1.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-admin/flask-admin-1.2.0.ebuild,v 1.1 2015/06/17 08:40:36 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+#RESTRICT="test" # we're still missing some of the dependencies
+
+MY_PN="Flask-Admin"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple and extensible admin interface framework for Flask"
+HOMEPAGE="https://pypi.python.org/pypi/Flask-Admin"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
+		dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flask-wtf[${PYTHON_USEDEP}]
+		dev-python/flask-pymongo[${PYTHON_USEDEP}]
+		dev-python/flask-peewee[${PYTHON_USEDEP}]
+		dev-python/flask-mongoengine[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gevent-websocket/ChangeLog b/dev-python/gevent-websocket/ChangeLog
index 8f55a46a7881..5ef99cc99573 100644
--- a/dev-python/gevent-websocket/ChangeLog
+++ b/dev-python/gevent-websocket/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/gevent-websocket
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/ChangeLog,v 1.7 2015/04/08 08:05:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/ChangeLog,v 1.8 2015/06/17 07:17:37 idella4 Exp $
+
+*gevent-websocket-0.9.5 (17 Jun 2015)
+
+  17 Jun 2015; Ian Delaney <idella4@gentoo.org> +gevent-websocket-0.9.5.ebuild,
+  -gevent-websocket-0.9.2.ebuild:
+  bump; rm old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gevent-websocket-0.9.2.ebuild,
   gevent-websocket-0.9.3.ebuild:
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 8a8b964742f6..4da41aa197fb 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gevent-websocket-0.9.2.tar.gz 16404 SHA256 091f7fdf3c288d353f381d5660efbf14586099ef3a17f3579370905ce4ff0b13 SHA512 8d564eb73148571508c916823e2e25ed4a264613acfd70e5d810195be9572366badee85fe652f486c5841d4231944ff9ed0b233687085df9eb86a83ef3a27985 WHIRLPOOL 504aee80abf6493a30616bdaae4d8aceefc1d0bdf67eda9bad78dbb683b5df132738164cc64410c8cec2c2269e78f078e68ae3e01dc902d5df2357db8401d73c
 DIST gevent-websocket-0.9.3.tar.gz 16463 SHA256 6475220340f9f8895a0f51bd2b9df3511bc7765dc055f49e997584bdaee3381f SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73 WHIRLPOOL 27f84f0452b5be4cc0da03fb5e38710ce7fa3be052c1e41c4b9bc87a7aef40a13c714c24444a681b755eaeaa91e614aff92cb95b49fb03e004f8d44751a5737c
-EBUILD gevent-websocket-0.9.2.ebuild 665 SHA256 91e0242409f923c91bfb9c262034144ab47f295cd03c32444d6325cdc290344e SHA512 24314101849c17c782f5f5b07f28b7a16be3bec3a605b4752e5eed6ccf695d1f435c23c592436ae1272a5679eed4fe7669918bd913d7b2978bfa10f376881589 WHIRLPOOL 9281250f9060b54029bae3f93f2579606661a78fea31cd9f41b44732324975775c07d3f95740fca42071f2b5fee62b34d140dbe01492697b568af25fc2622f9b
+DIST gevent-websocket-0.9.5.tar.gz 16970 SHA256 0091d6e6aa7298510cadcccb8068e1097a50d4e19090d0c055a93068d4530056 SHA512 fdaa8c704e1d0869700cf67c3a1c04246bfd816f98beac9c755b723a2074aa26344991c924ebdd7de5661065cde48ad412685014c53fdb92df12401cad3c358c WHIRLPOOL f566ec09f2d7739b0f70600c684471b768756c4b94b0462979ba770c5a17bc984b47e2ceb7ca1c0cf2ad26fa9fd9284326294450f013cd43fa243e7140aa7285
 EBUILD gevent-websocket-0.9.3.ebuild 649 SHA256 e36710588bfae81546eee2c93bf921b1c8adc3acb15ba854bbafef1d6ff62baa SHA512 99c341515a7359b4fe953f1d89f852c4e94b0141593d32124a47baf8e22cc3fb248c0a490164e334b2e1d879b83a31488e39ff35163970893a5080ca5d9b93f6 WHIRLPOOL 484eef87ed73eeb55c30d92d1c01861fbca2e68881104c67358c4aafc9a2cf000ae8f74a4c7be1460d796e9261dbe150c4a3a6231cb8e4b4bca4b5f1a903ed94
-MISC ChangeLog 1254 SHA256 6e8662743a897b1e33dbb9adda20cfebcb330afb37d5f373be90ed8db35adc12 SHA512 e286884ee3a5c73036802b870d4276640898d30ff762590f445f829178ebd0b9a6da2e03e0f4867c2ebbfe30e1703f43375ac1baf3a8da8b875087163dddc62f WHIRLPOOL 160d15d91fce750ca57a8b245d15ceeb68938b9255d2e018471c8da2d8e96fd3f4899b66c69e17698968ad8e39e16760cf9da1f36d2f170d8de91bdb0ced15d6
+EBUILD gevent-websocket-0.9.5.ebuild 652 SHA256 66be30cd29a8e6ade8904ef07acf50ce229d6e1936d80c5fb0ad335c8fcf99ae SHA512 b94fb6e9c1ce19e887a00ebdcc9a50e867097c002aba76d02a7b68ede3c823497c6cd3500d8dba88ab397a8c0cf32f26a0dab6865b1bea76c3bf2a80b3819a33 WHIRLPOOL feba6bd57605447f4fdd0baf242fdcecfb5113093c19b28a264d78cab73fa5e6da3f43ff1b25eb5ec795aa8a40d8e2d80fad1776856947d97db07df6f73ae918
+MISC ChangeLog 1424 SHA256 9cb2e5224d23b2a0c7d4199e07dece4e8b14615c051b728dae529e3675af9f5d SHA512 66afa3aef95dc8593776bea644fb31ce70fa172851ac688e0ba171e1496cd1304d020a2c1654510f18b0a9b759c6651b0c4cea721984ef0bb9844d4188d42577 WHIRLPOOL b55a37d2e60f921d3fae203dcf85c466b99eb6fee3aed1edd4fedc9d73a7ca9530e9fd3653710c44abd7e4532e62120b60224548e0d09c8ca0badeed1ed5e8d8
 MISC metadata.xml 629 SHA256 5f6fa799c47deab71efff93ac12d28b12b803bcc62da23e1d97843420c9d70ef SHA512 5835758257898ae53d3902fcb6c8385561253c8386c63e17a63b88ab609d461623899ec3cdb73afb81c06a3caac695e7094ae57ea9b8149d2ef677236c59b0c5 WHIRLPOOL 2e1326036f0ed0cb0f49ee580d0145e7275fdcb014e2dd9ddcd77ffb9b0af3f63876e1f28910a48a0177130ecdebfeb9ed40c7c906d8bf69efeccdb34d4382b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVJOJxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKoUQAIFY9fCNCCavOpZHwPJbc0zg
-vHV4orVIb3mUx83HY6SBOV03aKUuN1gBc3XpoRejtSnNbPG18iPvs4e02IL8msV/
-5Y2ewcWy+1daAIbsYP+flrFbnoE9fQx8uArUHIa4RDn/C6dAv31a4ySdcYYfQboz
-tw8nivjV6Hl/DdVJP3yZa3n9XTO4ci+NRLy8ztjLGmgugX3y4gYfndop9yVyerCA
-hWHjWA2kASCNA3YZ0y4znidTprZ1mfTYMhQ9iWZAyj/9zoiCznn0U6iRG0Y+vcTi
-lrlQn98sFH7AapaiPEdgbkVnwayksxMJ5VRgzbFzQMEVKnNvfPEPyLbwqLi6YSah
-Ullqi+YaKsH6LS493rghBjSB+WpabKgnNv1DKa6FY5JsKiJEhurSTclD6upi5BJp
-wqdx3P3fEEOFi5jLcq9g3BKuxXOnd1LFrshkhoq7+sm3WG1TdphAn40H8FK+Yehd
-nwkKLEfXO4do45AgH7aH108Q/rV//n2rvT9qaR89QQ8RdHnioSn1jJQvduyr7piM
-nSsqZa94Z1Z7ljOOhHB91Uisf0ma9iMhT/YUMPT+V30qBXSjlF3DIK9mRSVAbCIn
-6SzYcSp2lZjW8g7u92qlEMNiQWiWH/N28sN0AiJLkJ4/KWLirHLTnwCxdavR+iTh
-Jyjhyi+LpkuvLIXnIt9f
-=uqH9
+iKYEAREIAGYFAlWBHxJfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3diACgqSc52/wJm2///rsncbNDJFxB
+cgAAn33b9xR8uxfIStQ4HLpPVC224XTx
+=SiAw
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
similarity index 73%
rename from dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild
rename to dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
index 29410704f9ba..38d06b33787d 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild,v 1.2 2015/04/08 08:05:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild,v 1.1 2015/06/17 07:17:37 idella4 Exp $
 
 EAPI=5
 
@@ -17,7 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hgtools/ChangeLog b/dev-python/hgtools/ChangeLog
index 5ad372c93c28..177fa4bdfc4b 100644
--- a/dev-python/hgtools/ChangeLog
+++ b/dev-python/hgtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/hgtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.16 2015/06/07 19:29:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/ChangeLog,v 1.17 2015/06/17 08:15:01 idella4 Exp $
+
+*hgtools-6.3 (17 Jun 2015)
+
+  17 Jun 2015; Ian Delaney <idella4@gentoo.org> +hgtools-6.3.ebuild,
+  -hgtools-2.0.2-r1.ebuild, -hgtools-2.0.2.ebuild, -hgtools-3.0.2.ebuild,
+  -hgtools-4.0.ebuild:
+  bump; rm old
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add bitbucket to remote-id in metadata.xml
diff --git a/dev-python/hgtools/Manifest b/dev-python/hgtools/Manifest
index ed363e276951..c9372ed6b1fc 100644
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@@ -1,34 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX hgtools-doctest-2.0.2.patch 369 SHA256 12f94e24f5ec403569b7b371a88e2ccfe99c8679c65bf6f5b195da02ca40ec74 SHA512 eb8225b2cc279034a86d1d15519c9591660d913b79f7f9a09f35cc97a91c859c6b527b9dba659875442a592a34292a2fda0f4b66ed2769070f437fe10485b00a WHIRLPOOL c5fc8aae521a732ef3b8d3917c64d8bc767072d60335ba40e3c6e80439508b4ec648b9f553bf4a0291065068d56e546cdfb4fff88ac7ede7c7388868966ec062
-DIST hgtools-2.0.2.zip 30635 SHA256 bfa82ccfea56b178c9f28cb719cb97853710880b207e0a32801ba1077757da07 SHA512 5173ff7e0e42657058731cdb3cf9c2fe7cbd378d026321be62e937c57da637fb79bbdc6b2c91df06f1c93854c253f77621c0a5b91a7df451d68ea72da6f25266 WHIRLPOOL 5f33ab464b72165948e8e568f3b3e2f5b364b14bc65ff9311906d0aafced74505d974f28af1241b963b6772cf770f544c77df2e6665376da86a41f83db9b349b
-DIST hgtools-3.0.2.zip 39191 SHA256 c07d775c12653767a6677cb81eea40952f1795b1da9dba4d3e42ffe7f6df8657 SHA512 0160c6ac2361371359d96012dbdd191d99f9f9b3161ac97308c0479a810847c2c233f6598ee50f94538e34ddeb418f70830f58280a1a3526b59e6a36dc163587 WHIRLPOOL 127efcd18069932dcc4e5a0676adf5c1e0ffb60aaca41be31190ec1a031075cd4abf3a35e52b9e22abd34b7625a89651ec810249e222334d8a7d34ca18c4dab7
-DIST hgtools-4.0.zip 39223 SHA256 159390941e10e2fad56c47460ed9e58abf7ec01f1f072ce9c5743352279ed8c5 SHA512 a8e328d3ca77421a24b4e9596d25b449263cb251943953ee5e05ef5abbff67c58dfe6213ca94f027eef8ed6cd57e78a076320d74aa767e8a98e2344b7a9cb271 WHIRLPOOL 88aa310e71d728fcdcfec391ea84c92babab2d320e33e96a8551d2c5aa5af5b466b4aeea176a4785d390ae76a727df53bebebcbc3d4b7b9cd9b4ea62027642b7
 DIST hgtools-6.0.zip 37542 SHA256 14f3f4d94827c2d45e5a05ffd6efbe2484f662354a3dce2d8d1a29df1b05dd5a SHA512 86443caa03ff5c8fe3b2f5d503c8d28ddc8e29f4818fb7d3b51233b79eb4977c98bd83ccdba0612c3c17ecddacd6d7c7b283dc6ffc935eeb7a5b1a099324e9af WHIRLPOOL d8517f2b6a769201246a5072c971880b4ae52cdfc8aec2f619cd642337eb3cfdf5abee06aa91792a8380c0d81f9a68949a9efa3f44a29a3218b8d9bea8601802
-EBUILD hgtools-2.0.2-r1.ebuild 836 SHA256 31e5883b38e8048e337554e1c7a0dc3ec44b0c81b8e4e0e6c07fed614b317fb6 SHA512 dccef71cbd0fa681725db7f295c5c9c823f84997103d2fd849a4c7d4ac3ef4cdca2098668a31278f0a34fb0bebd1a4c0f7921d7905c78d7aa128ebae2a3e6a13 WHIRLPOOL 04d454cb6e2a376b80de550b0392d9d1e664c9235ab3bc5f09c4df6c84ffd6fb566d1bcc5e74cca327f4562a4f8bfc0ab86e4ab13e48b4af7f2c56d4456d9f2b
-EBUILD hgtools-2.0.2.ebuild 757 SHA256 0c64cdbdfece03db5d40466abdf735fe5c3c91242ec4506d3984e1817b65112a SHA512 122cb38bb4801cf8f3f71d42770ae2c5d468cf5084c68f666e34eb3df7a02aba492912eeeea36456775ba736d72ae4389563bdfb905bf210a293e159c47eb362 WHIRLPOOL 21e384ddd5b94c8801e32b1522028b4aa6d1025ae0c7db400ec172b58f35557bab19689e7df23ff1b0c1c1999714ae945f2398151d35672d66225bd6843e8a96
-EBUILD hgtools-3.0.2.ebuild 890 SHA256 24da762c2c5a9fba63c42de2079f3866bd2c1b7c1599f89ce87d886c32634139 SHA512 111749822f1a07c69bd55ad629210e5475f41b01c81b459e1f993d223721962a64c3d4cb3a5f184633994aa015e959fe1e880d9f42251ce53029f7ceae45c52d WHIRLPOOL 1d6b6a28e7b9a8b471cbe97d5154ec6359c111bb4f6a8323235cae4f36dd6b8f748534af3cc9502fd58c4d6189437abe81cb7f796e628403f654895a32ef7fdc
-EBUILD hgtools-4.0.ebuild 774 SHA256 de4a2ca91f8403d331d83db47b16f0f26044ab169e03f35700c57e2d95eb75e9 SHA512 a715ad3b9a225388a5d6439816bc970521fd5d56e98c2623f40a82ece548556478703f39a0ce3c00acd3e79acd4c61fa5ef2e61432546e53534ecfb658f3e446 WHIRLPOOL fde44699ba474094287df9f06ecc48b448ec5737c194efbf2cd47bb9e31facb438d020f4820fdabe505b8749adfde12e02ebfa154350884bac624c52af708335
+DIST hgtools-6.3.zip 39805 SHA256 1d0ef6ceaba1673e6923b17d7f09c5ae2f4394d16ef80562812987a27e7836ff SHA512 b5654194f6fbaf37c2a63523b02371ca6af1d7b7f7a89938ba4e405076049a054fff5e6d0d4a8b53560cde7dfc4a1862c5359d710d91c208dd83611913f17a7f WHIRLPOOL efe5bca6ce0970f0199b5c757dd8fd0bd4a03ad64f4ef571e4dbae311afd22c753aa6831fc688718cbc8ef037700a3b81220dae318f82a0ea9fe4d4179cfe4e3
 EBUILD hgtools-6.0.ebuild 776 SHA256 71c4d06b21bb0e9c7e5255e0248031f4d92fe9d99212d367660882306c7997a4 SHA512 39e918b61ac0d9415df23ee7b18ed4d131d56af791db84a6f8a775a0d448017b25b5864ad3fa5719edb5b9e7d9819a27242ca5104a6797ea7f4c299a36c5a158 WHIRLPOOL 539caaa259567e8c176caa87b514ad2f7e9af7d10dc1b14c64411582ab565ec833a5585fed182e6ca29a81df7f6980814d295bdf52b0a365820ca441ffac9ea5
-MISC ChangeLog 2617 SHA256 754fb4e7f5f341d75c3b0965d34ff265177ba1cc4b4f969bccb439175d32b3f5 SHA512 c1407a21ebf4ca21c2a04c0615acc38f2dbadfab864e03f56dd960accf64c67667624e84143f880f22edf9fed0f607c9f223705ea8a9795aca7edf3857d848f9 WHIRLPOOL 231f50a3f909519edc611ba5053533d0e82e3c890f17b8fa69f97fb23d3eab1cb61dc9c42fb74d2f7b218ffb630f914e5fdbc9017976715c53906be874079c6b
+EBUILD hgtools-6.3.ebuild 793 SHA256 591b0f3df26142874e0b0129cf8f71c30002d127f80b91b6a7d198c4615be425 SHA512 71e2e0ce1acea85a5f2d0158e9203813fefe96116b817c3c6cf985ffd9b3ac0ca82b0eb3a8ecc7edb1b9cfa3e046ee243934931fb1a39faf01a5e55f8219ded2 WHIRLPOOL 49e52832a5acda3244366ba7da874272adb4a0be2a3a76aa74c0faf9615170886915e89c4c325591557589e01eb687845f6eef5f1bf6fcc6b8e2c93f76f78dab
+MISC ChangeLog 2830 SHA256 c2a47d7d2f9d1b4ecdf402ba2d316e71768ecdb83c0545041caacc21af1f9a3d SHA512 39b6b3165983a28903885b3bb90d72116b5ad965d80a5080d598f38cedf3c9679f7017d1882d03aab8abff7a7489eb6734182381e1b424af99d84a3426f54297 WHIRLPOOL 3308417ddab5c63c2596e05fcd575673d9288cee963f53eee2ef03d0b900d9c1ef55123a0ec478f32764f00aee322246bd4cf5fbd43041ccc8c0d7aa412536f5
 MISC metadata.xml 496 SHA256 fd9bb7b7d7930db4f1566511de55fd153f879d1a286321c9297af8cd06a79262 SHA512 7105fc8fbc7fa469a60ab5cadd7ddbc0aa352bd551bb9c0c36812c6f364bdb3ad13b8d6a89ce2da292b554aca7c9fb6e4ff21dd32a66f5f6ecf18e097cdd8261 WHIRLPOOL 323db3938585aa5de334be1ae2b7b9e2de39f6f2b6b68ab4f5a46d243c23a1790f765e184f87ae6b19e15adac11b6cbdc791c1aaa2ed1041fa464948020a2e27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVdJulXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi858P/i/J4JOPL4/y+8QXtBnyFpH6
-2O771ZWs8wK2pHR9UbItlk3Lnn5RbUk9kb7S7hGzw/16XdZ2K+UmYcqhVeLm1zMV
-bJOLH3wVerfkTiSZHogchQC3im1FYgIpQ3+D9tcM6/vyQboeKjMVHqv45QEzO7tG
-mvt3fainh3ha2XhAJDgXRdTD5mvH0+ZbxY2f+wEBP17irS4C68lHEA0+e6EQ2Pac
-pOUBtfSQTuHg2OHmoMRdg9AcRSHBpFGAldsbtnRtSJdEe0HelTaYfrxYjizmD5Cm
-ZPyP1DZWz8He7683EKkW1yP9PS8S6HsV/bpvGcLeSAPM00RRc1QAaHok5H2C8hyF
-k7JY2lZ8sdty1PKthn0dEuFkPlHF8bjeOX6kdLoVZBmZCLJyHI6oeWHVnuJhV73y
-20nlBPO6VN6kUZY4t6PHCNg35kAPgXLfREOEE95YAJYlb3zCcoCy6O9reNOthyrG
-M7RHdzg9/ojFwJ+eXJ2vLx0fqn/xhY0BUlU5wr6A43foTuGCgGeeh7+w/4eYrUeL
-CZQl9bKU71Yr0sgpXalUZjSjXY8hhAqejavXSVWQMpCjdgnV8N4xZZrH99Es60mm
-Yit2dfmeucau8jV132+i0glIYhQ+sPlFAjpI0K7Lp9iw2MoNn8ddpZnM0tVhu0h5
-Yi6j9fwI7FKGGu9XTJ8C
-=YCrv
+iKYEAREIAGYFAlWBLIZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1ItQCglZSOqqoKhpUbXfBXicxqw3W2
+GHwAniu4UVjySEOFgp6K8pkg454PaBY5
+=W2JR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/hgtools/hgtools-2.0.2-r1.ebuild b/dev-python/hgtools/hgtools-2.0.2-r1.ebuild
deleted file mode 100644
index 8ec17d5e14ef..000000000000
--- a/dev-python/hgtools/hgtools-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2-r1.ebuild,v 1.4 2015/04/08 08:05:08 mgorny Exp $
-
-EAPI=5
-# python3.2+: bug #450666 (doctest failure)
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-vcs/mercurial"
-
-src_prepare() {
-	epatch "${FILESDIR}/hgtools-doctest-2.0.2.patch"
-}
-
-python_test() {
-	py.test "${BUILD_DIR}"/lib test || die
-}
diff --git a/dev-python/hgtools/hgtools-2.0.2.ebuild b/dev-python/hgtools/hgtools-2.0.2.ebuild
deleted file mode 100644
index c7adc878224e..000000000000
--- a/dev-python/hgtools/hgtools-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-2.0.2.ebuild,v 1.8 2015/04/08 08:05:08 mgorny Exp $
-
-EAPI=5
-# python3.2+: bug #450666 (doctest failure)
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-vcs/mercurial"
-
-python_test() {
-	py.test "${BUILD_DIR}"/lib test || die
-}
diff --git a/dev-python/hgtools/hgtools-3.0.2.ebuild b/dev-python/hgtools/hgtools-3.0.2.ebuild
deleted file mode 100644
index 3a415d4b3bbb..000000000000
--- a/dev-python/hgtools/hgtools-3.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-3.0.2.ebuild,v 1.4 2015/04/08 08:05:08 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
-SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-vcs/mercurial"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# new py3 test failures https://bitbucket.org/jaraco/hgtools/issue/14/test_reentrypy-py3-5-failures-from-8-tests
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	py.test "${PN}"/tests || die
-}
diff --git a/dev-python/hgtools/hgtools-4.0.ebuild b/dev-python/hgtools/hgtools-6.3.ebuild
similarity index 78%
rename from dev-python/hgtools/hgtools-4.0.ebuild
rename to dev-python/hgtools/hgtools-6.3.ebuild
index 818c741f257d..54b20c042ec8 100644
--- a/dev-python/hgtools/hgtools-4.0.ebuild
+++ b/dev-python/hgtools/hgtools-6.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-4.0.ebuild,v 1.3 2015/04/08 08:05:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-6.3.ebuild,v 1.1 2015/06/17 08:15:01 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1 eutils
 
@@ -20,9 +20,11 @@ DEPEND="app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="dev-vcs/mercurial"
+
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
 	pushd "${BUILD_DIR}"/../ > /dev/null
 	py.test "${PN}"/tests || die
+	popd > /dev/null
 }
diff --git a/dev-python/into/ChangeLog b/dev-python/into/ChangeLog
index 8e5e9a1e9751..517c90d7144e 100644
--- a/dev-python/into/ChangeLog
+++ b/dev-python/into/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/into
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/into/ChangeLog,v 1.5 2015/06/03 19:42:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/ChangeLog,v 1.6 2015/06/18 02:22:34 patrick Exp $
+
+*into-0.2.2 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +into-0.2.2.ebuild:
+  Bump
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/into/Manifest b/dev-python/into/Manifest
index 35bc226fbc46..97f469c0194a 100644
--- a/dev-python/into/Manifest
+++ b/dev-python/into/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST into-0.1.3.tar.gz 31161 SHA256 a92642e2a7372b477488c9d92c3e4d03b5412908dd291dd85020a7eb97c49d44 SHA512 a201ab8b2b2e4d2455232edde35bdbbdbf8432152ec6f7084300af7ee8960d476c00326342c0a658b0a8873a3a0ee025cf24b87b4ae45fa4f1d94db7a5a374ef WHIRLPOOL 894b9045917c06c5540c248415f0b4ae1cd2e86d979417f23589a0b41ecc726f5a55d54b9bcc1808370344b6be31c277efaeec5c2c13bc8e3e960ac38345aa17
 DIST into-0.2.1.tar.gz 75510 SHA256 bf4a8d7c4141984ba5db201e076d5ecfdb3a32c0f8ca311d4f49b030fcb04a2f SHA512 3df1a55f2a8881c1d952baeb5484d93245085bff02a38266b9ca478ade8cce23c0b16b6be690ada7e279f0f22ea9adf934a0105cbea2ce4d243e03fc73cc1c9e WHIRLPOOL a5e5dd5845e2dd741165fd484b4314c05539a95b76f840e8b71acb3c42aaaf8e2a01a34ca6881a79cc6db5b2b19b2c8413489469a8af2fee188841f2e0a3a474
+DIST into-0.2.2.tar.gz 85008 SHA256 8a6d5595625a1c2de0732ba4448c554b707a8259b477c9b0b7bb94a1f1ca887b SHA512 0dc43e55dcbb6264c226c1b4d893b07fee9e90304e293953b26764d90ba211ed65eddad68c7fe4f2eebe7b57595bbd12131665394ce4f339da0cf77337ed16e2 WHIRLPOOL 49da50cc994788037ac4edd5f5c44802a2263f30184bfe4d64810395efa97283e1741ef879e9b883a0b02ed2732eb280448d339f55cafa501706fd8b2f2afdfa
 EBUILD into-0.1.3.ebuild 498 SHA256 faf22653f224d8390116653f12486301b5210bac78d152c0ae029a8f4f895f4d SHA512 ee8f4d933201a735a6d2f593050feee530d07e72cb48a3c336e9061b90036a11f075c955f21b5f2fbd1a9e00b07f4ccc013f09916f6f43736e578d402dd5f963 WHIRLPOOL c14dee02b36f5f5d77516ce2e7472fadbe15fb24b2b828a11af8347830aa96331615932fc00748148b4e2382a8e70ea965099a6f2ff133725d9533749a8939dd
 EBUILD into-0.2.1.ebuild 776 SHA256 ed2327aaed636057573ef8f268b688d34e064c49a6357593255dd8edb9391f4a SHA512 7fa71f1d8a63c0c9cbe1062827f0f1e7d662fa45b58ab8b0bbf434a12e2d12febcdb333d17d6fbeadb9b1364c7370bb7f52dfabc5c2cab711268edaf312530a1 WHIRLPOOL 27f267c4f65883b5b6c1f5912ba143a581abcff962f2c267cc5c7e92ff12fe794eeaf1339226c4f6018dadf4618c821011e1f7bba7048f2285ecbd41117aed61
-MISC ChangeLog 766 SHA256 df78cbaf85cc0bc6066957d4a5ce4444bdd3d02791ed0c116c314e8119ad686a SHA512 e41dfc91ba1d16b91cf0016217c14556790450c87562a5fc99771a45f0c36b79d070736832dfa34ba4a116ed8cac6830153e3a2f1afdca2dfc9712cf19076629 WHIRLPOOL dc4b0825af8331bd4b173b8701b1c7a707f6c6402e6bae2fc042f828575a9956f1f54cff3e793bfc0973248c34b91716e27a607508d567b40c565c88788c62bf
+EBUILD into-0.2.2.ebuild 776 SHA256 284d307b633cf934391c81ec9ed06219ffcc05edbc1f9dfea2d91fb45ec5098a SHA512 0c58927ca707fc1535bbafe7a13ad102c0c9800e2962460ef535ba88def791409ff834d06bf3852cc1b0c3acbc0ff06b88a8ff8075d471ac753cf9e850df8e58 WHIRLPOOL 37c8213ffc8e2ce1b81ab56cdf3a6430946eca035c6e11809f0e29049a775f1513c4b6e6f3ad5a479a7ca4f40790f6e07af4c8219a9522ecc3a6afd408d86271
+MISC ChangeLog 874 SHA256 685fd1ec85cd4075af05791e33e7a52d2e8580396b32dc3a26220787a48d5983 SHA512 d74af8746927e9f996876074d994281e1d2608bcda486027d397d8b5110db18ae9ea05b27aeca07387b47924b376809a94c746fd01c8337063619e491d9ad93d WHIRLPOOL 7e41393908e79ea3e885da80b01915c169e5fe2c941fcd37d6a7cc5d558f1e08d311a0424f72e24728d41611ed37b53eb914aec7ca8fad227ae68c3678c21e4b
 MISC metadata.xml 232 SHA256 ba1fe558f7a2a18dbe895a6b598b6dacef4780d4baab456ffc1cf04388b3684a SHA512 b25ea05f304fff1369f0e4ed9f97f3a1493d2847ac3ae60dcd9fe1562c398d4a29ff12c8890ea14a44c6dd949310d9ebf48995ffb28e74809a203dbe085e24f2 WHIRLPOOL 952b17475f84403eb1656c61cfb30804dc4062920fbb113eb2d97b6df1f0764ea39e8bb8a2bd0a6672b573dba775a0159fecbcf9d5cefa0d37a6a5de87069e04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVb1i1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2KkP+wTvdaV11XOG7kl+zzO1nsyL
-fgWVny7be28VgPFxABM7FOZ/EXRwsOCyq5MrzWAg/OkcKot4Uk8G3Krx4ZBuznYz
-UYXPWlaeoHpOs5IOdNkYvwZCunw6wAp0KzA8m/M8q0zElzePUYYulTS3CrXAjrhN
-TY+7+pr7g8a0hGKGTiM9MQH/b2rUw1gUZcAel64dyZgNCTG8iFhaSLVYeSpAUSJY
-m0Au0ef3JBmu/FsDSHj8FGPAdFnWpadBywTW1EzmkT3dBBZMT3YnEuv0VymNnMug
-Qzi/u+lztfU88HNI8E8HhMCKJaO+n/r38Tzr+3hvj+2+yBlv3ou6KQ0FsnY2Os9B
-yotOeeHH7Iqz35Y7X5fERAxTfkroOBi9k5DOpHYE2fq6Sfa669riCxfVhqfLn72O
-s2HoiBKSX9M+7LY1ERnJ1/Me6KmKw+SFn+rzEcQvplLU0ddi4dz6jhXXRlrPMyqN
-9z6Hlc9oB+5KBTefBhVCgVP6wt2MYjCOyF+NSiBvcIFPmITGbnzlQCm9V01E3lo7
-MmU100TWtKyRayhEW2/aDNuJ+I5rB0dztLLlKYVFaaQuhPZ/oEa7vdzIorLgUviN
-X+38dqXjv+/Q5eamljB4IgmH9RBTb8l+HX/w7lrdqOzj5oU9EjRVaWAqBvPQx4lD
-Afk949m3D+kRBiolak82
-=JnrS
------END PGP SIGNATURE-----
diff --git a/dev-python/into/into-0.2.2.ebuild b/dev-python/into/into-0.2.2.ebuild
new file mode 100644
index 000000000000..0cfec35852b8
--- /dev/null
+++ b/dev-python/into/into-0.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/into/into-0.2.2.ebuild,v 1.1 2015/06/18 02:22:34 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Data migration utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/datashape[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pandas-0.15[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		dev-python/multipledispatch[${PYTHON_USEDEP}]
+		dev-python/networkx[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mistune/ChangeLog b/dev-python/mistune/ChangeLog
index a5d7ec9b9edc..16d8a7ea5a15 100644
--- a/dev-python/mistune/ChangeLog
+++ b/dev-python/mistune/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/mistune
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/ChangeLog,v 1.4 2015/06/07 13:52:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/ChangeLog,v 1.5 2015/06/17 11:18:43 jlec Exp $
+
+*mistune-0.6 (17 Jun 2015)
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> +mistune-0.6.ebuild:
+  Version Bump
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 656f1ccf31a9..81477e996222 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -3,26 +3,28 @@ Hash: SHA512
 
 DIST mistune-0.5.1.tar.gz 183864 SHA256 cc66489a28845c0e1848ae290af5b555074eb76185136ca058e8eed1faa89692 SHA512 56399def88cc1daf5df02a97aba49c3dcc2f860d53222e524bfbd5f48f262f01344582bfd647c363e631b25c300923f690cd0e68ff4e179c4974166f8beca95f WHIRLPOOL 7fbf46712111c0f3087203e50630e200c4df395cd6593001bc23761f5b07c6151c3199dd44b607058bcfbe726eef244797423497d304e87a1f7ceacff2df4261
 DIST mistune-0.5.tar.gz 184883 SHA256 d53d868cfd10cf757160e88adb5760fce95f7026a243f15a02b7c604238e5869 SHA512 d9c93c0e8972cfa564aa499e64dde115c55c0428d58112697081edc5c5259a772a05e64abf5cfe088f915bafaca9a176a09fa43ccc65a8fff3e7c7a7705e2210 WHIRLPOOL d6f2073780d2d4220f2eebbca4c7252b328394b5a74b14439e09cfa74c7321d66847e6b9d46c1a906630e7b913f74c55548914bcd1626b550b6e364fb259432b
+DIST mistune-0.6.tar.gz 47026 SHA256 d54a69365d01bc97412a39c11674a8aae3f333586e91f38895cc1ad818e13dc5 SHA512 f7f7a7830a733f957c8c541195e061de3ba5843540bc1811639526d7ff0f7b7f549c33af14990bb50e9890eaeb9645cfb9b8cd92e92a4e9a01e388773a33ca16 WHIRLPOOL c52395733faa678655b987a8705f05075ca05922aa5ed5a910d67af35694bdc8a11f7fb8b3fed6398e587dda2208e7e28015756eb5185d372cd3fd3de33610bd
 EBUILD mistune-0.5.1.ebuild 745 SHA256 0192d944ceb0f96fce56d32455de98a1ac0b3222e87d19f1bc11df255c77e60c SHA512 5d1c9b08aa186e119cbc75255e7ee39c2342c18c06cc7252dcac918861b08d8f79a4f4961ccffff581293d54d26ed34a719821865be4e087bf7097c852b2a1af WHIRLPOOL fc149f3b207536d1b34b7262768c2b73de6d6ccbdc325e0e88e79ee030c1b1a2d5d83a3483c402a12cc5e3e2c3af5cacae61c7ecfcfe2e7226d314d58d79d459
 EBUILD mistune-0.5.ebuild 709 SHA256 66dc8950e75c748c6292299e2ef6b8769d194514ca6f225e6ec1d3b38aa98c31 SHA512 4e6eb688fb8f7a2685d48badba79393e0a8a0b6269d1a11641038fb0889887a4fb321128e266b2a892d43e2cc68e7ab494e8fb8dd02f1d34705078c91b2450fc WHIRLPOOL 9eea5f56011c772bc84a29fe3bb9a5e8fadf55f3bb261cdff980883d751cbf5de7bfd3d7b365a3736094949dc66596ab434ea00371babd61faf6b3464e9d4aa4
-MISC ChangeLog 670 SHA256 e0fa8935736bc57225fd248dc7923f83807e2e1196b51faba77c783ecd98b0ea SHA512 b7f5d9b8aa957617b48d0da0b5b8baa34ee8b19ba7e4b32170c62b5dfa266d168f24e4db7479808d40614c71c174b41ba0aa037dcfb002a420b91c5eaddf46a8 WHIRLPOOL 35337ce25f6390f5be1d3d52ecffbd00e5c9165c0bda30d5d8cc3600b35aa6525f651fbc1d065926e8399e053be97a7985c07ebb8a7cfd215b6f95e2abc74f9d
+EBUILD mistune-0.6.ebuild 743 SHA256 b3fb7987f10b54e77b301eaf2cb47dd67844cae9e77376cccefdcf3c73eaa115 SHA512 358536d1bbbd1e2726c2d0f04c4ee9ca3fd99870a8b4f9383d418cbc50284d96ca82bbc03a5ab855cc156913ec3f357d99858c62b87291525479ae14023dc24e WHIRLPOOL c7b4633ee3f60201d43fed0bdd0f1b721ffca65c079a285d385500d672bca5bda0216d2b5b079d80367c62ec7976b6b46d14441a50b191609726a400aba86e91
+MISC ChangeLog 782 SHA256 05f6940761b2ef2a1c41e01dcba1ba1db34143fea31ec0e96ee3abe98d010490 SHA512 f7b34307251924db902150753a5cacc661e457ade2cc50c868d686bc0940555deac2e16c57de6906dc03af55e8f55be6c17276e6bbc76ef67b490ecb2f487ca6 WHIRLPOOL 441c26c7bc7f737fc0f82ca9ba37d6780c8eca6e96ebce31deeb6afde55b462835a05af6bd32584c79742ff05b34d87c91cc52a7bad1c6a3efd608ce3a77536f
 MISC metadata.xml 367 SHA256 c031ef3f2134116006f939c5428537e24d9b591db035efa875a3c3a9cd3b295d SHA512 e586186e92971b3061c36f82d2f4927044fef87b24fc423ffa2f885ad1974cceb7510d7f71ad7eb1ac3b236eb785844b8ce078a6027f6e65fb59a0a5fa4f18d7 WHIRLPOOL 153297d2a5def73b925f377f32cfbb93830a89e9389df6de05d06049050a02d90ab750f1435821aac69cc4aea593744e34c5a6d480163ce8c703f9084bd1246c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVdEyNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVgVeVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFTUP/jwqHsv2OhUgDBdTYtAbhoHC
-2ddu8nCsXes2v7QHSJHOj6rYNIbHgA5o+4zASHR3/iicCU4qjjGtxFcvRKood+MP
-IYSNMmsVsdxhMuasDKIYfm1KaY8DpxemdMjaQzxfcuFfabHhrZXq6bTy+fnNAJ1v
-qzgqIsaT2BOpMmT50fHAW2VQ08kB1yvMJZIDlGDfyG9iWffR6TH5Onu/jBzMhwgy
-1FgUUrgv5iQRHLSwU2e2jH6uTv6oinZVOu1YdsQLPPMyU6kHedsjalQIKDBKw8a6
-0COs1dXyp5L5ZQFZlapGgGF6SAmgrJoQjP6uB8+D8dMlirBXuyII0zj1FcxERLH4
-IxWZBCH0OQeMjASDGcbkRXcmKANbV5Mz7WjafVKqABecPNVOcurxMd2z+PCtwnwm
-EgtcaIZRXSvldZ3YnCB+gv0z254iph0mUCUTiuJ9OuOUq2K+PdMx4IxMIBFUQvmb
-wRtE14CpMw0AwpTd2ZEGDhyeAoc093xL7uWqxDRgZTw/Xh8TecmivZMrnjyDGxcf
-9XyqT5QXY9uPkOzygWVf83mkV+bC87Vmw1PGhmdCdDew5FqPSaZDJnxkYGC53ARc
-M/VlKPRMLvQ6he3ULBHhCJ9Uu41QIVsig/3da1APUL6u0qT+waAauvZfkYvRiJQN
-785FWolk+1FeQPCSmrhY
-=Raz1
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9I4P/0XOdzZRdvQdwarqET4tkbFm
+SJoBOWHhHoskqTfbKjz+jNhpYeAemZvybQ0MXnafrOxm0pD+bg0ar72ouGOuR6cq
+sQoleH5J8peVQJQIzS11QDDSLWU9UBQmTKTi1rCItSLqSei5EBe+HxEzKGmTf/q6
+SUa8LvmN6Mb+2sTBOPBGuK3/qbldp4QXCnFlCThukq4CKeCAx1B47LEbTv6kM03A
++vNh0tYGQfI9w/m2zTeSYxKZrO0ZkmPhUB3PZgwlulPK1n3+CQ1CIu+9I51/HPKS
+rPtCWiLDAuTReu3hCS2KokudTadwpMCuqkXZeAZGHc2ujvOsmTFwT3TmdgXIs9oe
+t9Fi54vrTjPgZ3Gnh8UvXtClmCGKZZqkWtHWbDOWiTVJaCypiizGtIZi9fuJwUcF
+9lawx00Ai5f1arGzlKmfTZGOJXDrLitDUAT1VeVDAc7xrFx+tWue0fFdu43AGq0t
+5sFiljmcgyB/TQ+8rL07Ax9IPuKNLyLYF619wisp+8zyGIqtNf8MiD6TGIes3IIy
+DhASP0jiZRWizcAV6nyj/uVLycr0VG4j+jpCJRFTsWs4eqsFEfL3FRcGIz/78Sgg
+70NNY6Dmz/yf36tDRPiE2+n4hLeMC52tNe4GaghfKXDNH5nDc1CW7na8/k37pNcV
+ESji/uOnduJhdHFuQEc1
+=f3K7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/mistune/mistune-0.6.ebuild b/dev-python/mistune/mistune-0.6.ebuild
new file mode 100644
index 000000000000..5879a0400c20
--- /dev/null
+++ b/dev-python/mistune/mistune-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.6.ebuild,v 1.1 2015/06/17 11:18:43 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[$(python_gen_usedep 'python*')]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests || die
+}
diff --git a/dev-python/nltk/ChangeLog b/dev-python/nltk/ChangeLog
index ef9fb1fea6bd..8243823d2d95 100644
--- a/dev-python/nltk/ChangeLog
+++ b/dev-python/nltk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/nltk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/ChangeLog,v 1.21 2015/06/03 20:29:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/ChangeLog,v 1.22 2015/06/17 07:06:38 patrick Exp $
+
+*nltk-3.0.3 (17 Jun 2015)
+
+  17 Jun 2015; Patrick Lauer <patrick@gentoo.org> +nltk-3.0.3.ebuild:
+  Bump
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index a3cc0b917f2a..154e5e907442 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,31 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX fix-newer-setuptools.patch 1035 SHA256 61e80f14009078654501643bbb183b45b837f533cd1f5928db691b07f91c06e4 SHA512 34a5b8c8d345d360178aaf4a9ca44a47c82230d073098aef67dfabba36b4028d5011231f0d8c012ab0473baa4406950f259a9105a1ca0861e6742ec0fb40749c WHIRLPOOL bca26fe76bffc42253cfcb584e4b8a46a159fcc024ab076cd4bff1c472b8d8ee259c35ca8a7efb2d370a6f8d3f296c0faf1c1455cc2e35e6ee5c623a39587d8b
 DIST nltk-2.0.4.tar.gz 955978 SHA256 a554d6b9c5c7c8b597a090d8848a6f78c6fc4665ae43c9a6a6d6a5b207d98c65 SHA512 1a1923f8819016926ad37337077a87782b1b244eb52c93b0b977946a3549a82b8b0cc4eb886f801d283b6df6f55fa8020db435dae9303371cda1dc1f8c40bc88 WHIRLPOOL b0affed720034261de343c4f7a09cc1a977e695ddeb7cd592d3d7b7c960728025336b8ece5667dda090593498d33d4e64b05b1bd3d8336e0f487d5ff2da82f80
 DIST nltk-2.0b9.zip 1043217 SHA256 bdbe3503f22d0766054d920a0b8d05697dcd576540231c2b6a4949ad5c9281d9 SHA512 5af22190f07a16873a522c41a7ef4ba5130f22d06d623ec85b9fd24c787e41fe3a10c69fb05c41a0c4fa5dd4478ad56ea9f5edeb6cb7e4be475c457e951e9f4e WHIRLPOOL 8c189a60112dd679ed966e179d44dd295ec9c0c96c7628c6eb49ae8a1f02af0f85ca7a7afc3b9a97619db8ff2714b55ff32c2bf11ad030fd76f2b4696782a2e0
 DIST nltk-3.0.2.tar.gz 991033 SHA256 f1e8489f728841bb87e59a40acdbabf0b7525a8b09c86c9fd313c1b292b35d2f SHA512 4caa03b9ac9e52a43e7597de0ca3b08c6c95a7c2f74389fd927ef44f27917c3bcfbd4419d13385b7030de8a7c07f57bcb1e83684aebd6a65a278fdeda5116a60 WHIRLPOOL fbaeb187404e0540d5626a69ad6b54d2c2c6fd1be9084af724f71ae34c614838327fb19b87a26e9c1a5706878d26a7d303d7989399a498c27a680f444b65a385
+DIST nltk-3.0.3.tar.gz 1011266 SHA256 28d6175984445b9cdcc719f36701f034320edbecb78b69a37d1edc876843ea93 SHA512 b058642670166bff538e2c1c417ffb2e57a217a9f3a056475ad47ffa222df7237bfb4ac00a58952dc6f79f12a32e3a40bf53a96262a4b3caced64c2c09abdfc3 WHIRLPOOL 4201a7d6219f437b8e8df2b7c88ae48578e69825c4fe067d777c92b24bd819172b6a831d2ed51de07a3b52bda20f5c559e2da0dcfde58cafca57c811bbb23cd2
 EBUILD nltk-2.0.4.ebuild 808 SHA256 e09fe43cbe972b1fb31385618b2b4d023dc3a6f794c8d856e84ac38fb69a2339 SHA512 9db857e6d50b915f2709eb98a30c104b5df1e31293efc8e1deb44d74f5e6bf59d4ef7b5eb2d20eaf994f0ab63a7e31d2a58bce2cdbbb20c57d2517409e159928 WHIRLPOOL 3689aa495e1ec35fd920f3b3ac588e10ed48b4e28eccef3ca7698c0952c12202e70267ca6556fc65b2248cd0bffbe0a5d02ec5410dbbc49d8f743a870b576c3f
 EBUILD nltk-2.0_beta9.ebuild 699 SHA256 18877488f1d5c39a2081dec712a24ed958bc34db35b6565f1ac93a84b12bb220 SHA512 558e51b28103ecefbd5b2a57d76e990a29b972cfb38390ca9a30cd38f1e03a089269563c729b340c8bd41cc3778ef17b96c0aa4d5619717c1796c9baa3371f69 WHIRLPOOL 27125db96227be00f091843fd2795190ea96fc1b4a9e060289e220c90483a40bf88c149d4de621ba63539a50d2526fc918455edb10b72384f5a77fea7a3915d8
 EBUILD nltk-3.0.2.ebuild 713 SHA256 319e42b31104b32e376c9b5f4de67593503a37aec56b302333cfc83db5927e1f SHA512 522f015530e74f486935ed289fc9a3ecd0a7750f8cb4af693c66c7016fb654ff709a525f021087ff313bc04291cb8558c1ea7f3d08d777e01d154330a190a0ca WHIRLPOOL 9d150b1ca836146d1eac0e08909476b0afe8371967bf3463b2a60c7a24dd0d99dee47b2cc2a619b5ae82c1278c2e973144c0f94e219e8c74a9276a5407b24b37
-MISC ChangeLog 2932 SHA256 12a69c67519aa2c156caedcc87ec964a714b41d183722137977abbf34b4b04a7 SHA512 a996920bcb4e3b7cfb6b610babe3caf46350f6b8c30f54f3a648f0e0d8bb451163c579fef95ec4426b0bf3f0fc5506be663d175e9b8092a46c224334c946b207 WHIRLPOOL dcf1f304425a24f1b9da38f4c6d11888fb97de1f3b3369eb0b93310ac9ad28f8a0fc398da1a6cc26d4cd4dd648f941b8d20a3fe51ceabb308023f6f1cdacaa0b
+EBUILD nltk-3.0.3.ebuild 714 SHA256 ceb5d8be8883bb85d4edb460aafb203b5491e1d789ecc9e390f709a631ad0efe SHA512 c1aa4f62d6d8cc03da214fda4156ada8a9da07cd47b5c11f5a06c73558c0280820bd556a35a83e69bdefbd8f1cf588a1246b6d932a396ed335a5c9a6f0ee07da WHIRLPOOL 741932d6bb54a865b28fd606769b88e1e328368790e130dc7678fd3d2d0f0fe4337d81af2fbc845117dedfad709c91e9b0fef466b24be0433a700aee027668c4
+MISC ChangeLog 3040 SHA256 b5c82949064a806a0f7a4264f89fa8325095a736e1e3ca0ed4b4a90e2503b755 SHA512 00d0f5fd02ea948bb51c3de44bf9547617ad5a0ace3ff0766958bfcb6aededba6d2490d6c70a7a6f27b04452ec57606730bc024e52380225e3b9735b0a5f3e73 WHIRLPOOL c54fe28414f351eadf44fed24d2cb7118f0fd42750680298acc166ffad10161fe909b9c832756755de383b4fde92458beba637e5e9c120ea138eb6980472f7d2
 MISC metadata.xml 583 SHA256 b3f45df127a3d950e39ab62d8554cfd86d9c5d422200515d1d314823c98ada13 SHA512 de47a80d084f7c7911fd25a0e6aa568e81f944f580dd7223b3922aec9ee1b4a412d20686e3a07e5a96130f99b9ef106b08f1989d06a162b153702c08326ad040 WHIRLPOOL 15844f2519e16772e1dac63a293d729fd943fee63f7efbc650ec1602a512a76463585ecbdda32b55857567bc96c4c7023cb3d540b12051a9927c77aeb821c8db
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVb2OaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0wEQAJ7B/8P1eIvaagHTA/sC5gIj
-9JC0h0LMsGZ5nAWYFpxvBa8JexLm3jtqmnDCqqXJp3MHUXH4ztX1O2KK/XdM2iaA
-4MBw3Bek4Aw9g+NJazPWrixX6aHJyO7jcBMQY4xfBfpy3gRfztJ7+ucO0XWxJBHy
-opSIgwGYPJHh6nHNV6HJxssxvFnF7otFtj7vtA3Z8Rw0tp+2iQKsbLMK2FzmLmzu
-3iG1cwy9Sjh1mkMdYDoVj5lUBz4Y//zqJvt7OtFs0DUym1w+iTCGHHoWDKp7574m
-8snB+j+qIDZxpPvQxssA2phKttdhgDUAnt/66Jt5fZt1Zco0/9IByYT1lSOE4yLw
-mKPhoyptzDgsDq8JSHP6ijBSku1dvSYP656WJRLgPnz7ls0wXK7TQ2yhomOlFT6k
-HVp7VOCe6J9zy+kxRweEet7zapgUhQLd3pTJgeSTVPHRgdx0BmDHiy23SwhvBuc3
-kswjxllI9J3DpFbIhPYdTqI3Ox84MX3jmmxe8WiNBBFF6pJPnLuFbR5ho/PHauFo
-KXN6fVHHeGlEtH5VKEuuuTceScEjiW9FwGc/Cw91SM/P9uz/rzTXKzRz7qfHvmP/
-JUdT3mTFiWMqNjHM60DMWqNL+gqEtuMh4H5uCMvRyvvCkA3SHq+LtYk0HYc0mPrK
-fOVCfJkb5Gh+KomVlR8f
-=AR02
------END PGP SIGNATURE-----
diff --git a/dev-python/nltk/nltk-3.0.3.ebuild b/dev-python/nltk/nltk-3.0.3.ebuild
new file mode 100644
index 000000000000..7fd8553a00ac
--- /dev/null
+++ b/dev-python/nltk/nltk-3.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-3.0.3.ebuild,v 1.1 2015/06/17 07:06:38 patrick Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="tk?,xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Natural Language Toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nltk.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="numpy tk"
+
+RDEPEND="${RDEPEND}
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
diff --git a/dev-python/paste/ChangeLog b/dev-python/paste/ChangeLog
index d32cfd5343bb..456c4f793008 100644
--- a/dev-python/paste/ChangeLog
+++ b/dev-python/paste/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/paste
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/ChangeLog,v 1.30 2015/06/16 07:18:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/ChangeLog,v 1.31 2015/06/17 07:31:59 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> paste-2.0.2.ebuild:
+  Stable for x86, wrt bug #405821
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> paste-2.0.2.ebuild:
   Stable for amd64, wrt bug #405821
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 26187b5267e0..5b01ccc0e7eb 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -16,23 +16,23 @@ DIST Paste-2.0.2.tar.gz 627842 SHA256 adac3ac893a2dac6b8ffd49901377dd6819e05be34
 EBUILD paste-1.7.5.1-r1.ebuild 1750 SHA256 f7a33e336f3f0f6be9f456aec39c813ca57848ddb47eb89bbff612237593437e SHA512 a69bd8544c0cafb190ae46ebc7efc067a0d302e931441e593b0ed166073c729803c3a51c1c0513e07b92be3e9157514eb6e217aa45e64efdeb45aa95eb9c3f5a WHIRLPOOL 2315aae529c999dfc6d7e202f4b1d1fba207e11272f68725c2a5a02b50dcb3b40f75d377937a2d4ca13115432b1bb00e11bad0d98f695952921ab476032f7dc3
 EBUILD paste-1.7.5.1-r2.ebuild 2396 SHA256 9520d3eaccffcd80565dbc99dc3bb0a35ec03cc886d075ae18abeb70709faeb8 SHA512 74b338ec816e4d44877e7903fbfca04e3f945aca814c96ef6d2a3f7ba93a0e292e74e08d93254b7c10b9e138e8099f45ae965122052fee7f70271145d09e105f WHIRLPOOL 50147425d1abb40553ffae268253d3aaa56419dfdf0ac47e1052899efdd3c7b67a68e908e405faf0adef41ee5edde6990d4607b7579e5a9f72546c0fcb5f1e89
 EBUILD paste-1.7.5.1.ebuild 1829 SHA256 be5dc4b20e80c129544877aca24f44700ce145a14ed26e3c3ac1bf820fef52f3 SHA512 e381357f9092978ef9b2142e221d1581fa24c6433844e93adcf18f1b871b8b9af7af4be37c8670675685112bae299d76ac4159fca7aed0d33d6f365d58416104 WHIRLPOOL 235b115add02a80a0455c6eb79cc60f7c6c9d3220b19af9384441c1571aaae4ace051ea636164109b3911af3233635d3145c7e902df2a069b816a38e52e6bbbe
-EBUILD paste-2.0.2.ebuild 1951 SHA256 e796b7d75f4dbceba90d30e938d8c9c0712f847717b23cb05d28af633303de45 SHA512 60dd3d1cae76fdb793979b622fc9d5427d901692995297dea74b8746414fd5e33bd9f8489a0808eb11d924eb8ce8f890687d2bad7f76d406538df287cd4e527e WHIRLPOOL 9ab99d105fd55d5f6c7964740d848b1bbdfcae9a1c0ab74be674d26aee4c5f4c764102c6229d87414ea9ff4dd171631cbf38e1d2e318ae8365889d62684af3a6
-MISC ChangeLog 4731 SHA256 2399b721f44f315bcaa60acc2f62758e39ec4687dc383e1a3b6cd847357674a1 SHA512 1784b82ec91e8d7a1056c5cf81559acc55d740efb201789756a3c60ae1ad8925d5262e4ad53e2e4fd886a09dfa98d8d25d4918ffe72dacf3870e8c8fbec04305 WHIRLPOOL e663667087f03b97dc5f2be58eddfd0d49cfa2cbdab9f68db4cf294dbd7afe1a14831adbe65b67d48da3bf3180dd29309183895bc65da0952bfc107f385c7b5b
+EBUILD paste-2.0.2.ebuild 1950 SHA256 c7d525aab2cf700996f782718c30aa94664a86ce6283ff3085046fe2089e2f78 SHA512 9dc175ecc186a2a0c650d3d632120503ae47a3218b864e27456ed53bf625dee1d4178bc6dbcbbd2a92624180af4961d2b06da62851d9e31676fbaea1b5e00b01 WHIRLPOOL 6326fca964c32ba8bb4fe6c9a707debdc8034f4828893a2f924f06cae8408786dc621a0da9b6a38fc66625384bb4b19b03c7683413b2e9a50ccb240ebfcd53ad
+MISC ChangeLog 4835 SHA256 878a51012543a42104d2544b34f06cf77b7c37bfc9a09b472e2b0e1e60a800b9 SHA512 a02c6b811f715fee581f84ca20a8c6dc831ffcbb1f7619b428548ef7ff8d872378cad3a4057448258c83e6f0cfbaeae3d67b74238435b974f9ebb246b498b217 WHIRLPOOL 3bdb40f800fe7c7ad5567d71a3466ce9924e921be81bf78e9d7a9bb5e824f44e306a2558b45f3778c5ee4b26694559650e3d13711bdbdc685f1fb78dd97abab1
 MISC metadata.xml 698 SHA256 457156377643c1181c8935daede8412607f1fc0e1b1373e2782d4f585f92fb4d SHA512 97cab17f12bc3200121fd8f4fe38832d7866054907153f54604fdbef9d9a97da548be0e22a6ed5c409631757db371fe6321a74b3faa5fa39228b2e52a120ab3b WHIRLPOOL 0de9e130f9dfad78b1bd1c1f1c6788a9201d79bf50c672387a063c8fb3b1f5551e54453c4fb46a8bf0e92ae1d76143db13543759eccf91f03120d848712386cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf83eAAoJELp701BxlEWfHjAP/1PGjB4CNqsJi6IaVE0bAwqk
-vU/5se30HrBHZXIilKYA4GS685rUPfGEjZa8+uxLx1w7pi10XVG7YRoXNw929ZQR
-D5Ky6OCbnetOm8GHrYaYfXfa2NjtQsupIcGM1DhW/7NwNnQUxOzNrzy2L3B5IMp3
-JizRLNIvFnbXa0M4dGIZOdrbcN6RAzAbWbKtU9pvljYBg98bz4zu5IF6xuzW+w2a
-GiinicZsXXasTy1s6ueusyoce/c5shBXNFhuBuM0F69fNgzATI0xWmI+i2fffwDo
-/U3Ckdekk3Tk88AiwjnR4jKS0rBigMsl0vod3FAgaqjKshpP8jNUbqlUYHbAa1pP
-m+xT5oXwZRGgX4zMzEtcNLweJkBXFIo8Pjdb4cjmoJCe18MFPl9d8IStJsbUTWvq
-3rX1ofjjhnqnNsyWkKHw80P8aUX0VGggSwgHqjMmoboD+RczavKo/Q88zAYa9qmu
-UYg84Epp0rPsyJ/tp3w8YFpilzMU9GMQF9AHur/uUoLOXxpVj3wSDrKObUvlVims
-AtAsX5BdTTO9R3UKXwg3ufcvz2WnR3sL44HTXk8Ox+bKV/QRlbS+gkkHfXInD/vR
-/HA1w/+tATGiQQbR3luhJIuoEfLnUj9qbftbDU+trz9NY4AG/IClMKtIsKpu0pcG
-7Y+QPNFDBXEpP2mRtnlT
-=ZwQf
+iQIcBAEBCAAGBQJVgSJvAAoJELp701BxlEWfmhUQAK3oTaH3rXxA/igv0hy2Qxda
+fAAElNcpFj0kCOqbT5IKU1C4BIWl8j8MfCUeX3w8iG91A/lfbfKy1dZdEXgbUAdf
+icbF9rsVh3OLWEektBEUKGSHpY4lmp7eR088GZ1Zl1LoIEufe1aVp922XgHyfIfW
+tHEV5ivhyyCG9hXC5l4LGOAd6zjya0MLpYYxv5mhsX3v8CxQTyfa5hFRzVreqEqO
+1LXvDvZOfz1G9pqrIdJRaZANLbGPfhhcPLins+kdz8pFO4jJZSqzN64his+/UBIS
+GZpZd1tHSIkOfQlYiyrhX91BOnd8AKQq7En6U/x0cdSRw83JAMld4Tc1mwHQBr28
+AXRFZ7+z0I/Sp/j/oRahupIXsslsAgYqkbKlXaUtfX978S8JEmCaZ4hEByyQeShs
+hZveByPXHMBdG+aZYoUP+NR4tWipUj1jtpNMclG5PYLeyrl5TYzx+9l2TEDlei+6
+K71l6UgIf6z/IU23x3llqWnP7lGSMoGfd65KM8jGAbjZRqtri5uA+NbCiFNbu+ey
+7gbI9SGAp6lEaazPBc+d5PlfSvvPnaaSxtBFNEPX0WpRBv83APexMEz1YKQ41Hmy
+RZFceLEQSOA+42Jp72R4xPPsoKrKKacp20dqzEA3dJXKNIRFAUawjsqTGbzpOfoe
+s8FTGntGVRRtGMlHChUl
+=Qk8r
 -----END PGP SIGNATURE-----
diff --git a/dev-python/paste/paste-2.0.2.ebuild b/dev-python/paste/paste-2.0.2.ebuild
index ec2d681e56f8..0484a5a7f759 100644
--- a/dev-python/paste/paste-2.0.2.ebuild
+++ b/dev-python/paste/paste-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-2.0.2.ebuild,v 1.2 2015/06/16 07:18:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paste/paste-2.0.2.ebuild,v 1.3 2015/06/17 07:31:59 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc flup openid"
 
 RDEPEND="
diff --git a/dev-python/pastescript/ChangeLog b/dev-python/pastescript/ChangeLog
index 4461874425bd..a437bc5f9e85 100644
--- a/dev-python/pastescript/ChangeLog
+++ b/dev-python/pastescript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pastescript
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.21 2015/06/16 07:18:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.23 2015/06/17 07:46:52 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> -pastescript-1.7.5-r2.ebuild:
+  Drop vulnerable version
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> pastescript-2.0.2.ebuild:
+  Stable for x86, wrt bug #405821
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> pastescript-2.0.2.ebuild:
   Stable for amd64, wrt bug #405821
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index 9754111febb4..621ce5619c6c 100644
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pastescript-setup.py-exclude-tests.patch 657 SHA256 155c453c22be636b204dc342c8a65569812c71856f180ccde306e60445962fe4 SHA512 7e74fb60b387cfc8bb89f56c195274caa4cbe6dd16f13bc3b8e4cf98f7c14c82c2234477eccf1e1dd35602ec2b2fc48aea8dbb878e1fb38769e84dd377c09e11 WHIRLPOOL b6343e986cd4f4972466dc5b083aa4ba5f8c674a2d64aa2325f6d2728c2094301781bde031017d5e591ccc1240e84593faa1d08cabc47a5687fc4918ba64d828
-DIST PasteScript-1.7.5.tar.gz 129738 SHA256 2b685be69d6ac8bc0fe6f558f119660259db26a15e16a4943c515fbee8093539 SHA512 b4d308427bd36e2d84a5cd2c23e178db6edae5b468936ec3bb599598e1c331e77c232401a7f58752002d4b04924f11c545dab56256375296a86892d4b3cfd46c WHIRLPOOL 2e9cb23c408957e74f243c9eb1fad451172a0657d81758917c33a4e56441e3e1daf756d2aa4d6162a573996ef12694488dd8b733e4193a06a4571c033f7f9eef
 DIST PasteScript-2.0.2.tar.gz 117521 SHA256 c03f249805538cc2328741ae8d262a9200ae1c993119b3d9bac4cd422cb476c0 SHA512 2f093eb982972fed354219c75c2e008931cea553960cea8aaafbe57cde8556de5626e7eb9bb3b9b7328bad3b7d9899f11fc9773a65380396dae506e7531516de WHIRLPOOL 951c16499bb9e120813749871cfdc7b36b04660c4dbb4c0d2c7335312a8b58c412dc0ca49029ce674be90207645eb1657bde8ae869ffb72d29c592ca978cdca9
-EBUILD pastescript-1.7.5-r2.ebuild 1345 SHA256 b0a77f13a75309b4b76107c565742c4218c9d1de472522742e3cf39caeb18054 SHA512 620efcdedd462796d4fabc67dc10c131fb794a5769f63a26ef9d27b18f09a5961b0e9bfb776b49984b486fc19dbf55d592d102d8a45d11b7d756f6f289b11b36 WHIRLPOOL 1256abdabdb28d4eeffe79c32601682f900eef9d968bb0829bdef918b5c8508dd595214e96d56ab229b03f5818e2fcafaff66f6415b899a940a7a8834b5cb1b3
-EBUILD pastescript-2.0.2.ebuild 1349 SHA256 321a4634cd1251f8c8e167a568a931cc248ed14944ab48480a5a1f5147605647 SHA512 1408563b5779ea4b0e9edf1f9d2a7cc597191773d664f09bff10bb74cf3f891a0682343a1cc5c6aedd0062ce2ada2d7233a09d259084e68e5db968eaf0be1124 WHIRLPOOL c7ccc108ac85789d275eccdd3f75f76d01d840248686f18a85aa8f01c119f5a30d258212be93eef447f072d905524bf0102bf36a93287ba13964f776f8ee9b1b
-MISC ChangeLog 3129 SHA256 aef6a98ef90aa0c40249a7067a74b5d96adfcc12678ab486fed6752435b72dbf SHA512 339135e88e329ed13dd89d13c8fccc1fbcc1221b50a54c12f357a7ce11c62c95eadb1ad2ed7b883e3d214631606f1166ea1aba4222eab6349984b1f7d0331b47 WHIRLPOOL a0745684ad39a2a29332c17957df603af05f7729f39cbd261b668fb582553459d7f9fff8d059c646f0ece906a76fbacf1e41d00007df0807ed87709bebf224e7
+EBUILD pastescript-2.0.2.ebuild 1348 SHA256 02acc1d9fe8293ed0d79c8462b8181b76e80729ceff33953c408ea29dda8cf56 SHA512 a4cefdae6ce035e73503edd4845b9a76778b118e87b44e1ae4e4cf9643614e02e723afa9178d36328f27fb4c44fb89b623cfe41cb5cf83270b1525fe7ef552fe WHIRLPOOL fb399c29f464af5a6a1644e2b671baa7f6729f5543f818dde83f1f5609e084f5e1af6cbb004da8c84a1b4d7b87d906af0c3adb8c51ec8f0c1119fa045c5e1fae
+MISC ChangeLog 3344 SHA256 18b62082d4f481d224ff287fcee3fe7d088b58b1b3726e5005b2ba61e6ec0739 SHA512 40d5c1ba06afe52cec0c76adc2d5e30ab262c811b64e0739e0a2e9e271be65ee9a17e5e816cb2d077051220e2183aace544068ccc99b98ff8af9d8dcf8e79d5a WHIRLPOOL 5a39b4e7297757f38ec52a47ebd8ce46cf13be3d284503d1583a744c9367b249a327f86944de38bcaba10a1b36bc3f2eb5852a2d64d0d232173912c19d1ccda4
 MISC metadata.xml 239 SHA256 ca62ed31f778c616f5eec467a3075e8d39a7f929a7c951bdfb03b962a8ac8bea SHA512 02fa9b94f1596e518abaac1b5507cdb35d1e1114773342f21bfccb2fc95011dfd9fbb6cfe37e1209af955ef6c77db69bb0968117b5d3d591810deea28316f690 WHIRLPOOL 3d41826efa22fcaca68147664805119d74bdd58cb89800071c33a84adc93d7217cc6aa3aeafce8da4b4fb202d26ba98d355093c9c2d4013b740e4ae0283d208c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVf83aAAoJELp701BxlEWf/fcQAJncPkltPvSCufg7clYXJwXA
-vfFoIK/Ut87f19bEoo5ueOBdOLtf8exor9BgLNBOaqZO6MUMkqjOufZUpuaWRyCl
-ahT7GRw46O1sIIze8kap0LpKD+hM1GcFbk2ylWaaItyvvpl6IHuBzY7oRdwkRNfh
-d8ewamD/1PQ0YJmbvW6kPw3k/fzQHEiV93OHW0UGgBX6hK2caII2XYoZrIzifOz2
-LYgaBVoyMpzxnoU91WQM1daQCHKvWyP0Hsv+BIub3ChD3cxMxRZ4MOsYyS9pFU/M
-8E75wfEJMkpn1OFx56vLguwCbFPCdcQF493tAWKZ8SjoaVwdEng8IM3EgP17GqjR
-S7CY35fvkruPCgtBmN0OZCGNbIs3sVZVrccs9dvrwIk+oAZT31HPKpakQyW1jxwp
-5RgQjqqINvQR9aW2rwhLXNmIf3s1tlgh/AeBhOgc7AvQEd4h55cdp4fo8oO/UH0Y
-Fzq4Q1o1rCMCuOqcS9yFn1N5jircHfp2IJ/7Uuj/g/dYmuERS+7zTQ2RsuK+8Nmz
-3L/2yFZdYABvBA4/8yDIOrDiOoNNCTMD8xHe2MKPtSRLpCUcbw0KFMy76ceSQkGm
-69+VwlYThY1P8bgDa298GsFmqoPwxmu+PyB9Ux18O93j9hxNeWUqDIN9UMus3J+e
-UPZlp1kCDhzr857njtzF
-=P8aQ
+iQJ8BAEBCgBmBQJVgSXtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiF4MQAJdC+m5J+x+oQcjeXlWaWPwE
+2BoRKm+wXN8l/JFHG524J0us8nSdIr6T5RTdm2X7VbrKmHaNFtXpq2TlmmNw3+uD
+Dxii+egwWpkcOREALiLJc17BAKtCARULlUlemO/rSjl85+d6e6UHe1d2kJ7CXirI
+pT/r2Wl8XsjwOlXrAMXQrY7A23nmv+GEQclr3MA4raX5JNtp9DxvheAKkjEqfwiM
+eLcWKU4LV1RV2GyP++Qke9viZgJuftQDwWF9fJBEaK7NmCEsqrlZ0v6UyBArc3mp
+Hf0dM3I0Jlr+AQpUYtNp8v0SV0qs+9SCFJ7/LEO/ACaDgNIU+j6VMpio8hTrZDa4
+WT476/cVfdVFFqytr8oO4fN6lzEwMbx/9TagyGJr5sCfzr3F62PtT1LE72tj8MgV
+jpqL+LtObGqE1RRdywYJYYuztB7LaRFg0gy2YyMcRJnpY0RFbQclStbjZ4umm1My
+jKIfEn5Lgk55mxPUpxnqlIqY42xLkklXsnU4OEmPxueG4dhGg7u6vWZh5sqr14MQ
+rsYtLoVa9Hmy+jr+mjIzlZM/DvGG6CK0K6GA0hDRjWjwuZIOPUd3F14tl3O9qYDB
+KPJP8z3ePzzvhvIDgGmE7rWKnss8iTNJQas24qm9Eb8DbF9Cy0a9YXOxlTrDtkJO
+dqKOzwcTrkiGpobFCNCD
+=A/Cz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pastescript/pastescript-1.7.5-r2.ebuild b/dev-python/pastescript/pastescript-1.7.5-r2.ebuild
deleted file mode 100644
index b6fc36c967ad..000000000000
--- a/dev-python/pastescript/pastescript-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.5-r2.ebuild,v 1.7 2015/04/08 08:05:03 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="PasteScript"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="http://pythonpaste.org/script/ http://pypi.python.org/pypi/PasteScript"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	>=dev-python/paste-1.3[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)"
-
-# Tests are broken.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-setup.py-exclude-tests.patch" )
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		esetup.py build_sphinx
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		cd "${BUILD_DIR}"/sphinx/html || die
-		dohtml -r [a-z]* _static
-	fi
-}
diff --git a/dev-python/pastescript/pastescript-2.0.2.ebuild b/dev-python/pastescript/pastescript-2.0.2.ebuild
index 9b1ad4c99293..9d3adaf013dc 100644
--- a/dev-python/pastescript/pastescript-2.0.2.ebuild
+++ b/dev-python/pastescript/pastescript-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-2.0.2.ebuild,v 1.2 2015/06/16 07:18:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-2.0.2.ebuild,v 1.3 2015/06/17 07:31:55 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index ef457f8788ae..4ecf90508afa 100644
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pillow
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.60 2015/06/15 08:14:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.61 2015/06/17 08:51:05 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> pillow-2.8.1.ebuild:
+  Stable for sparc, wrt bug #534748
 
   15 Jun 2015; Justin Lecher <jlec@gentoo.org>
   +files/pillow-2.8.1-ico-backport.patch, pillow-2.8.1.ebuild,
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 552a8eef4d9f..4b0446ad2e5f 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a SHA512 8a42a75a198ae9da4875e23fd26a834e5fb2209b1e6f67a99d6d14e02cd3ea5e1020d46c3a75df9442eea761de8f8e999551a1af45f2496b5f70fb3fafc80e5c WHIRLPOOL a1cced6e904e75b89abeb6d47b07dc2b33a43e3044d7f7243bd906647020ef42c588eb415f5e81344f5aede0dfa49a31405431d314a35cf37d43b5a7050280bf
 AUX pillow-2.0.0-delete_hardcoded_paths.patch 7309 SHA256 400cb4029d59e6f80aea05051f10cedbb9937ce043ab764f8dfad845cfbabf72 SHA512 add72ba5df003162b29a0b034edc24bd18505ecd09ee80cc2ad7606a00e25f7918bf30bc1749961de341920c3b24743baffe16e6cf6060bf4a4fad6ca8b564ce WHIRLPOOL 43045044d725060c12cfe214154a27332756e5d0c4a9bae3ad792ca94d7107932cf61159af8bb3deaff9f5e104006f1fd28163a051b4465cc42d61d303c672a1
@@ -10,26 +10,24 @@ DIST Pillow-2.5.3.zip 6873222 SHA256 62ff6c6cb88d4a1d6e856315b1691186b06cb923f18
 DIST Pillow-2.8.1.zip 9275663 SHA256 4363b52527c263e77f5b18c3dfffd15ae454edf0c4457197ecbe29863a651938 SHA512 75c0cfb53530549a2bac66cc3457747c239779233c64fe944fa661e7401acd915700e0dfd74e13c93d96afb9b50a112f09cbaea49205e83d8797e832a52534e4 WHIRLPOOL e71a39be415c2b83b7d554af7ad86652c08594c302344c919352a64ca48cfc7c1a88ca8dacccdacb283d8a42ad14cd3cb230c2900a9f11dc31ad20e203d6596d
 DIST Pillow-2.8.2.zip 9402887 SHA256 57a900c2f30e53ed054adad401ab69643d9ab21e3acb0a647749a168e4e24446 SHA512 2bc1e17cb65d5e953e30ea1606dbf79059d51f60ff5c2b000869fc2d9f93f8bbf5cf41b0147fc83974c48341cc68df6964d3d8203e0d6cc6a45ede95f3e0bc2f WHIRLPOOL 4b5ad1db34427a161ce1885a858df72e4aaffd61b5bf9010702803874f44391678d228f71777fca058f424c6ac6208e8c3d7421eeff88c42bb6df94d1d13d771
 EBUILD pillow-2.5.3-r1.ebuild 2636 SHA256 9f91f75bf1b2b2f60cc8675190fe7f9ec80f57d8f4d01e3bbfc734c0f5564ce3 SHA512 896f632c0c220274a6ee6a9bb7e8474ab4ab7f0596d9443f40722b0841985e7024d0ac7dcd557887905d22198c9a64e2512d097aa3447ccd9fdcce54164350f7 WHIRLPOOL ea2c6deed8209aa421ca1ef378d4365f9898ed8f520b7aa9f79199470bdf96a363a8adfb83798b11a57d1cf9b450d169a6950c4c19dc3e32b24a12061887851c
-EBUILD pillow-2.8.1.ebuild 2366 SHA256 ca2e5489a2f26b355f9d636f168e95c845c44f98c6658052186a61938559f73e SHA512 67228da56dc46eed097f604e57c5019f21cdd94196b29e1ed4051bf658a25970a5c732b71cda539b5f4bb2df85e1a92cc8c70fe4acfc4ded475911b6e254f4ed WHIRLPOOL 2c2b5a89d25e6c77c9190d356ee14633e0440686dad9389617b7aaa2d812b746fc24cc6ad47277fa223975147acfb3f239696db7c2ee778f90242368a066e2ac
+EBUILD pillow-2.8.1.ebuild 2364 SHA256 6eea77e95b34777e8eb76046ba692491289343646a2db4cebf208c860554e712 SHA512 7b980d9b058e010c22257bcae9c6a3fa17984163d06082b55bd9f769a623417c15063936a01d5826b30b51728c723f2a3901f933087feee566b90f15edf77818 WHIRLPOOL da3c10098f074d9ecfbfdcb58299fc4ec73119e62d550083752a2263a2c2b76909e82cd119596b642b2b94a2cfa8e7007a29a2151fb548453ae4449f66260ff0
 EBUILD pillow-2.8.2.ebuild 2378 SHA256 c32e89ec0b075760e7b4ad3da8d8f68e7f35f609a409ff1ea66765bd3525bb9b SHA512 d70b4f85bea7141928c26283a13fbf2aa2a6a7cd583be3e7f11ad37f21e9fafbfc4e83c6689eb12699a564c449504cb96a0699e59fcc9fec83f2360dc1ba5ca0 WHIRLPOOL 5eae6f323721a6b12f9b132ac48151de659896e0ef6802151deba8509821cc2253c6e14858d5b49ddb1a270a7e9eac4ba0a75fced1b59e873edc7771ba437122
-MISC ChangeLog 7465 SHA256 f00d26d9e6158dc225fc2fc29248972781c08f60636ed1b5b21e04930fec68ae SHA512 ea51b802800b185f1e1dff0a524a90b3f47e72ad308c5338c557a0d7254b4fcb16a6f2bd78b66737858842d693f35d0b678592cfb701cc9e6f8f04ba893ca6ab WHIRLPOOL baeaafeb663f2daadd90261a3124564cf90bd40b81d4c43c5ecbc72e74b3dd0e12588da241ecda960a759ccbe2073a9e4eb756f20204a3cfeecc7be04dd1dd84
+MISC ChangeLog 7571 SHA256 d3db68e9ec80a7b0c0af976602da019cbcb83b01310d09c9e098db79ec3f0600 SHA512 5070ce1cc12f85015219dc7251ff1ababc932ad373104b2bbd3c6838409716e127110f12051571e9a4213fd74245690ff555b706c10bac4c3984ee670fb61e98 WHIRLPOOL a380ad944e5cd0230f1d215218966df41a0c08aecf02545b38bb7f2b474246a9014a5da4b6168f896ded2b13820838a7d496af3b3f03f5681de9b47abb714a1a
 MISC metadata.xml 381 SHA256 206086ee976a03450dbf62778a9c3d124bb4acf55aac945c524c8c1aa5f77c73 SHA512 a3de43a9fd824f85851649d4b22cb547562b8b3041435d6a4232cac2d07a6b22a25c3e897370b387bf91d2602732f90b2e668f4f43d9c7a8d673b02ec7df0712 WHIRLPOOL 6188aa12742896f3fd116a8de589984d24ed2d13d4a772fa851b1660a55702bb04076f3639e809bd4de8c185ab0b1907a176dd054494cb42f97054774e416f2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfolYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGdAP/034gb13gHDbbTe9nCGePWfo
-4vy/WPlaOd7pmPnz5n8PfUUgAKMOZDQtyU+Q0dEgn8OZCUAx0jHnWLPOYYuT4fSc
-JFrKJzpnCOMBLeNk6KS2KmgnwH6/WtXRNS3iuqgWi0kiT70aCZrgXvonWkrbKDM8
-tocXmEArZeviv4XAQjXK7q9yzkwvXt8TJEI2uA+VSmbEMZkwdhYiljrtSTHWy9s6
-33n9twCjwXWBItD9JsbJ6O4mGBTOIGxsPXiLQGYLOSbLW0YRAkl7wQBkxdVtGr5e
-QftvWwIp90R9umAp3NsnPUmLyGgbg/EwCMqu6rsfVU21xCgQ9cv60onk7OyWA/TT
-u2RScrbPV7XkTy1mMUKcbH2kKFxTS/3+VBY9Vw9nq8mIgWhW8afQhieduw+rqKCw
-5BXiEoj876YbxJdPjZsD+LWDWO0PTdxgZmdeFFlkFd9+HH4cQyUjGFj5FEzkoBx8
-X398ESjuGNwYv/aPlTNWtoCOS/SF57mZfo3LBXTRCCgzWXZhSabHu1oS+BYlB6Tf
-miulmaxAKy5birJCIXAjnUIISIggmw+LdjfUoNPim+8nthCq9Bve+c5Z73rZRc8N
-Xqu6jZkeBsnvWeE3amBUvDTfJNjH3HE1QOMCagImZCTcKZEBMcWuu6e9iUYnYypv
-vGHpy8E2wrmnZWRd4WOX
-=9nCX
+iQIcBAEBCAAGBQJVgTT6AAoJELp701BxlEWfz+MP+gO59h086/a+H3lj5F0PV2CZ
+EUWbhWu3yLAlZv3tDsIKhybRchXAEF9HZaEOhI4qTXgvf/gr2JyhvlpZy2cZwZvu
+0gc9vX621qyEtYF1ZoLFRag1klot9iTs6KVK6wzFQKNdklCuvIBDIxQ0eZVgGvBt
+NRIjtihmRvWsr903N1RHshPkaWrZyDT3tMweyMR2TLXB/0nebMCwdiigOm5DvmoA
+EJILvu46dD53PNzBquyAaXAnBTnvlN4JJ22VrPn/LwcH+CKjEUl5V9hPWnOvgtKY
+4QcyEED7ep9bmpIxzblbcLEilOiXLChMo2iOkAWqLRlHLijeCPJn0wVv5nrj7nm2
+ORnxIAqtPGZkhav6vsS8ufCDTw2t+etsCttqldKVwby63DQkjhYECR4Khe8sHpp4
+86WHWR26Q7D0u77iC1P6X2pjCCAFhR+Ov22sM31e8MQjO/cu2rFa1geTDRJKfbYM
+VCDAtEQbxuN/l6DnbI/EMU1NXI2xfI042SQZaWs58CSSJ1/F6sLiGNBYNLX/3xea
+M4AxtlFctTvgP8G5lKx6SuJ16uWiuRf+Sn2oL763a2pmziivbHYOUxzDwsfPDDNr
+gTXk03WM0n12urCBBcvskzKlK6xGBd027Vr5i0PKVPkH84BcK1MXnvcX8snbNMAA
+tuJl43NLN7yo1Cq8A9na
+=DHIk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pillow/pillow-2.8.1.ebuild b/dev-python/pillow/pillow-2.8.1.ebuild
index b26f0160cf2c..97b99aaa0601 100644
--- a/dev-python/pillow/pillow-2.8.1.ebuild
+++ b/dev-python/pillow/pillow-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.8.1.ebuild,v 1.8 2015/06/15 08:14:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.8.1.ebuild,v 1.9 2015/06/17 08:51:05 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg )"
diff --git a/dev-python/psutil/ChangeLog b/dev-python/psutil/ChangeLog
index d17dc5d7ad75..3f5f3a77056e 100644
--- a/dev-python/psutil/ChangeLog
+++ b/dev-python/psutil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/psutil
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/ChangeLog,v 1.47 2015/06/07 15:20:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/ChangeLog,v 1.48 2015/06/18 04:43:18 radhermit Exp $
+
+*psutil-3.0.1 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +psutil-3.0.1.ebuild:
+  Version bump.
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index ae4e216378d7..895aa364ce97 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,32 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST psutil-1.2.1.tar.gz 167397 SHA256 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 SHA512 9faec6c4139f677252b30f4a8793484658d888535428dfb4e316821bb5f246e1832baedd8704279a7e0da7096d539f1a8dcd49f2d61d943f9299e9204ff47d81 WHIRLPOOL e6b13df0c6f70e5d92a88bd540ad2e2f4d670463e1ec815a3eb3b6b009715dd7c0a96b73a03c5819fb3eb3b30f63a1299d6668ffef992a408d8d1b78d33dea43
 DIST psutil-2.1.3.tar.gz 224008 SHA256 b434c75f01715777391f10f456002e33d0ca14633f96fdbd9ff9139b42d9452c SHA512 12a566c2c53897d858bd75455da8f52d9d9279e28dc0df40594275626f75da716d82c8f67d1fc37df4bd3bc05fef401391cb6c52380c819d1e82fb4edd11f843 WHIRLPOOL 75c8475fc55c5a04858ba8acba0e57f9daa06aed6badf68b484d5ff0dc9c6e52066472bb78350113c1ebe755baf4ab205e347cbb5b2bac3eb4857a2fe0dd8f3f
 DIST psutil-2.2.0.tar.gz 223676 SHA256 b15cc9e7cad0991bd1cb806fa90ea85ba3a95d0f1226625ecef993294ad61521 SHA512 5ea2f0eb2c952314b5683f92582deb2fd7da01a285f984870c64b78dba5c33b6b2f97d5c0e3a05d16fbeb921e22a1e2d165145767205ef4fa76fc424a382c50d WHIRLPOOL e938eec8e2863a52e85eebf2574ea16d984fa06fce31add930c5708c4e2c7d50e9a0f3cb2b2e36201a10a76aa1c10ae2851e2423c69efa668003d171769514cd
 DIST psutil-2.2.1.tar.gz 223688 SHA256 a0e9b96f1946975064724e242ac159f3260db24ffa591c3da0a355361a3a337f SHA512 aa49dfdab8497ce3064465a35d8a99115e269f8b01af61379c35b68fbc31cca31f2a639c44f6cdf5dcf12f161355285e0e6ce2663ef46d43852dc6b3fda389aa WHIRLPOOL fa8f27af83661f22121fc6cfa9306e31d2dd2c32c800393d7f0b3d70342f6d741a3a38d6d904bf817437fd9ba80107940ea0cc193612980177c0c3bc7c1bb068
+DIST psutil-3.0.1.tar.gz 241539 SHA256 3f213b9ceed3c3068a973e04d7a8b2a29d1076abcb5ef45382517bfc6b808801 SHA512 38ea65bd91ab2cb6caa88362840d84ad5042fff037ad7b2ff1505e6a014135bd219caea9b48cdb9b5d952eeccc145ee84029f446fbc709c39dc3cc6bd8974846 WHIRLPOOL a536f08c173b606f1e78c27dd8786d469d4dae1ca5e43f997b2c1e74fa129b391d2d2e345f43da0f1a80f1bbd474eb515b62adc60aa78eea9e1b69bfe2ec2edf
 EBUILD psutil-1.2.1.ebuild 677 SHA256 251245e125e0d63e3bed0473a3a555c96f0cd289cc29e28dd70b97f3872d3703 SHA512 c9d605882d450d0eff79d7cf86ba841b41c623d9496badb8a41a074d1a644385a631e5bdc82831cf874e6b3c9603114da2625d34cadd8e9ebba15d29037fb473 WHIRLPOOL b8482b024482ab1da90086fbf846aab449c72c9236d984cce8eea7318594d911746e0b7d7133f061e488e5e45e7646e96cb0012f4656c84faf154a8d29ddc635
 EBUILD psutil-2.1.3.ebuild 772 SHA256 3284eb3c05e58426a9b67a2f2ad16149ff6988fab39631e825ace64b0ca92be9 SHA512 7396cdc8dcc3b76c297eacb23121e26a46b361118d59fccd15a065493b94f1366a1a900f114b4b5a28fca52dfbe493f491ebd21c4ffe990fbdcbc56f4725c67f WHIRLPOOL 66fc16f11cfa30ff9ce37de13ccaa7fa531a5c80c2a0e4d9ed1263141fba834cb0dc0e8d9f2f6767e8c022ee8d06dc94adcee8c946cfe20c047a30df11203aa0
 EBUILD psutil-2.2.0.ebuild 780 SHA256 ec18d804f02ad5c2793070fd1845b145ca112b804dbc142fdba52dcbe02aaef2 SHA512 756d7d59a3d50f0a63f7c028b17924401fa511ba2dd386585e24387c28d2b7466eaa366263ff7a1a4b13985d9e1be5c1d6b3eb956123e970205b4f36c38526d7 WHIRLPOOL 4afe1bf42a7ff99e70b4e702dd9aa6dedfe66bbf4f9e7bd989769c1be27b3a9093a4a214982493db2a9c118d56bed355f4235b6dec879165cae9fe1f4325e3bf
 EBUILD psutil-2.2.1.ebuild 780 SHA256 7893ecf52aa87c5b1ea20cfef9d542f4a43a8bcbdf649cc65991acccc47b9d4f SHA512 dd2c78d009596de5c79685297a5fb3630bd5b78f4b171252af2713c332dfa9d2d4af6b4a576f369ece92ad8f5bea57c910a3f227a83ee64194714aa389c3cc25 WHIRLPOOL 1fa360a41b831e1b906879fcd2e074de4e2af76d8a248ae27469c324bc7607fe529f70c7efde7c75d68ba4f44c8750b9fed6e03922d4f35924824388c6380537
-MISC ChangeLog 6238 SHA256 7b33c9071b7cdb53274336b21f25ca2ae73f54efbbfb9aba44c68d59d3bec6a4 SHA512 88b9ca8f75a12476c36e83dc0efb3a844ea4c50ed979020b3a6a6683df0f432b4d7db3bef478ab908566be7db97e27e88710b4c9ee89edb2e3204f3832bb626b WHIRLPOOL db4cf6f983ee7b4e74132116aa0c08d74af428f422943387a4e4ce12a57cd777c4000ef05dbaae655028f2890e0a126f991fb7ce057ff065246a256822cdea07
+EBUILD psutil-3.0.1.ebuild 780 SHA256 705759187ba3edd61d07e46dcad73fc8d86fc527fecbcc6e9a89187d4745e22b SHA512 f52ea388bd1be836606f95e489af4c34cf67ec43012756b5986a5d7f63c4733b4d5130157cb36391811f6285fdb85b856883235e39200543655f4f46e2e51880 WHIRLPOOL 7b6eae6cf991bdc820571035fd9d29b04a3eb0aedd7ce0335f57399f2e70c18dcf11d3b847b8963497a480daf3e48fb205f884cc2794a7c79f2068c6c8079bef
+MISC ChangeLog 6360 SHA256 1ad8d2176a77be5fda80cb361448ca8e6ac75de056f370e4f33429ecf3211cd6 SHA512 8e067de4c07f723931a5d55ff7920ffd8b685ea6c517601ac53ecca59d1d9ad1dfe5c42e0dd6f89a2ff6f0974a95fc4e925f89b4299b44dc94c8e39334509d41 WHIRLPOOL 6e3829c302178943e565a030e255ab01bca6edc7babb2aa110a0c7bdbad5516e67aa9001aa7e65906a35909760c6f817ce25a66fb15cd064eb825fe56102e8e0
 MISC metadata.xml 292 SHA256 05c8d2b19d8c629046d5f5f2abcd9895c8768486a5d6fd06788f00b3fc32aaf0 SHA512 6b2c2763ea098baac5908b4919d3052d4f730cb6a37b4db17eb66b703f812903e9a3ab957dcfa6da950003b50e91c8e983641b9ef7960ddd9f5be651a103fb94 WHIRLPOOL 6637996b0599371336a7926b653476b7614066a3bf6e2a1ec9c2261a8e17d74833dfaf022304cf90aaa15e5e3b4532ee8733f59f025a4b9ac9fc5d290807e033
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdGEyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3pUQAJ3G7xjBtQM/hwTIQO9rvw6r
-2zCXEEx1hYZR5+MT7hrx7fQkq55gbQg/V9T4bMYhJt9rMZE2HirsjQ3TyFjl6PIb
-iUYjl2i7WEf0ryaEIMabgfAMQTep7FPfyaG/qICGSfUORErCfhb4vpllx/2kHr4V
-+zDGEaCQQaLBm5d3zZ0e0NRVWtGlS1sE+KtLILDTJ/MIdw+SjxF/KVmW8ImI+Hq/
-qhB2gQZ1NHwQQ8tKIxRkpI7l1H6mJa27UKq9KnERQjOZkxBL/QsLm8Cagq3xED1U
-/qFBBk2zQ1YelQrvCotB2buTS32Nlhg7X6bdk5W2bVF1TJvder4sjyq72k966xoM
-pk+J7ZxSQUwP8jr0fqYEuiCWj6L9mT3C5R+0mP6++s0xQpUCEYerJxBtne1Kr7yR
-klKuatGTzmX4zKA4q9eWhWzfhqRua1c9CbuWmsnpmXV84PZQ7IYSVJsGHU7Tr/eZ
-prEakFkqRrPMenhG337S1IV5to2kYrXdhG5PMpSozvoAlMp/QHvYJrsEbaBspn8s
-N2bzDQKrRQAzEv/W75+6W0a8s2VHWbHsD3V5JW+HpuiPbmSgL3PVkQwxm+FXHsJK
-PSu1GbXeP1p+BUdsQUDA0PuoOzVvhOgQAJIybaShZYFnQnhE+l8YclGp2pBJJklu
-SuWiaP17PQjnk/4hQMJV
-=9eei
+iQEcBAEBCAAGBQJVgkxnAAoJEEqz6FtPBkyjq1oIALLBE3PfVmh91OkxjwIpiZ26
+FCBqgdT6DT0JEvCDqy3U9CT6/ZK3LRh7HIVDuCsSinh4r/jDXrDLBLgZlHgAtrxX
+pvVMkUpYKeEYqXnRJAufvoD14lQExOSTHl0zV1cQdYLYQUqLLuzB8f5E4qYYHZcB
+p4CH9d8nIiYstn3/Toj0JA68FYL4C/LMPihit+cOR0ydlCji33NfQMAH2Al1ipAx
+XAHIXfmywB4Q5z8V6vuFD/yB318ZyQT1OMdtXhYqpiDzIb+Gs8obRm/H7Hws79si
+JP2yU7wveDydrBS09WVztIe8AQ61Xk40xrfGRXJYizACln8k1Kzrs4YRyvFsETI=
+=4qtk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/psutil/psutil-3.0.1.ebuild b/dev-python/psutil/psutil-3.0.1.ebuild
new file mode 100644
index 000000000000..135e1498afe2
--- /dev/null
+++ b/dev-python/psutil/psutil-3.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psutil/psutil-3.0.1.ebuild,v 1.1 2015/06/18 04:43:18 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pypam/ChangeLog b/dev-python/pypam/ChangeLog
index 8fc8b6191e87..1b8c3797c4f2 100644
--- a/dev-python/pypam/ChangeLog
+++ b/dev-python/pypam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pypam
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/ChangeLog,v 1.19 2015/06/16 07:18:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/ChangeLog,v 1.21 2015/06/17 07:49:36 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  -files/pypam-0.5.0-python-2.5.patch, -pypam-0.5.0-r2.ebuild:
+  Drop vulnerable version
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> pypam-0.5.0-r3.ebuild:
+  Stable for x86, wrt bug #407603
 
   16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> pypam-0.5.0-r3.ebuild:
   Stable for amd64, wrt bug #407603
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index 61e8f82db37a..60a5841cbfec 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -1,32 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX PyPAM-0.5.0-dealloc.patch 607 SHA256 5d73ad2efb9b5f0507c1968aa69bcc36d3981e5c02117215982abbb6825863de SHA512 105573489be31763ed01bab02ccaf7147c73b196d85d8318eceda145e86fb5c3fa3a59b7baee9d85f6d5ae40df0335689267650461f5440a9c2991954c367e8e WHIRLPOOL b0527a6c81f9fc4bea9bf5d2a3fcabdc67e9d8b4e7d5e6668949201b53e85f825260cb61152b558ec8a2f473249807687d8667272eb81f03f0caf325bff72fb3
 AUX PyPAM-0.5.0-memory-errors.patch 3708 SHA256 e500628d9ccae7c953967a70a97b3af94c5f6c52849b6615b0d1270789a1d08a SHA512 358e57ba6450b533cbdb39f559813767799e387937a610b15e5e8e78d59b6501785c40c3ffdc5b1914ff6c9220716cdf9b537847373379eb94094f6ffe23c7f5 WHIRLPOOL ba0f6d33eacc9e812baa7089cf24bb6e548ac54e35024a7637c7e756f050c6a92421ecc18c93f97490feb8e62cc68e23c1e49d84a9a0c46615c8755a25be13d5
 AUX PyPAM-0.5.0-nofree.patch 1913 SHA256 ed2964fbc2c0d8b23961cf3a9b5b77d8c4609de54ef0e557ecb64664497f8ff9 SHA512 7292483d60f75d577055f4bf7380b110620669a19b3e2e3a4700e2c816758af865213cf19b329260338e82f9a0cba03a14dea06ba636251f1436ec0c3373f751 WHIRLPOOL e02e958acccaf508497cc87c5abc08398b03a8ddf8d504ecb4da2a63e4f963939b45915273e777ec5ef7d32ac58ffb2a5cfdfcb6dfeacc0a3908269222f137f2
 AUX PyPAM-0.5.0-return-value.patch 1854 SHA256 8a5a7292b415b053a69ccb36f7cd5dfd367f273b0ca8cf1f1bcec96f05769b3e SHA512 73d81d9a7398933011eba0739e3bce7651c3da1bf38f77b510172e26f569d329c3b28e5192a25ee0616875ddad52e67697dabe021d31cc5e51e9e78941333c8d WHIRLPOOL 6bb079b5824a8cd2c2df728f82645ef3ba625c6b0899b57d85eb2f77a677e5647233ce987d2f74c0d1fb55693fd16384acb4c52ce2abba5da26f74045edd9a9f
 AUX PyPAM-python3-support.patch 5987 SHA256 1d81a8c8610c91ddfa8b86be2cfeb0adf2e64e09b89dd084d980054167fc6425 SHA512 8437e5648f4bfe7a4895324c4277e91b5588271ed31a7fa374a4d7f03af18b8f6038c90afe79f16c96219debb10d9dfb6f33883dc097edb2c67714d893acf13a WHIRLPOOL 02e1d61c60e7367913deb226fa7d9070b6ce06a1852c4b66e237034f747704ccdabe5c8ef9d99aab2b51ee13c6a33cff9c409bf5414bf5cf69cc85e474e38f5c
-AUX pypam-0.5.0-python-2.5.patch 345 SHA256 61e70532bae391befa2d13659dca8ba9065a4f69917d78b26a7f056fef00bea0 SHA512 84120d279c4bab81e3e5de21575845747aa39a9c129be389eb9900c66ca87de9d983d585b9de1ac54d8b53eb0c4be472494fb47ef604d6a18e66f52bb9f43039 WHIRLPOOL 357a1db0b1bd407451e24c2fb5c3a81b8460c905e894f7d33584ab03d52527fc106315a0e6ededa3c3b2739c022334c68e7b1c468a6bb26f0c02816d39e93c49
 AUX pypam-0.5.0-stricter.patch 335 SHA256 c6a389f7346a237501b58fa3a0ba9618616a03f506c7df262ad55cc9a5207939 SHA512 6cb56d4610fab8f14af83d64215de24b38c820c61099054c0c02bcc831b0f50dee5746def85e2ae669b8657dce2fe31fcc93f07a93e3b49f0c7a78f48acd74c7 WHIRLPOOL 13fb94ed652c8b7a0a19c951c6ab88fc0df72a3e1e6005b1c1cc92e4d89d02554985680dafcdc762c17260fe4ee88357104f43fc9fcb946611d280519e2fff93
 DIST PyPAM-0.5.0.tar.gz 105206 SHA256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0 WHIRLPOOL 03e93e671dd4c74252b5c04ea74d389408934ce03206ec47d3dbbb2c19d4dce7b4271765d0967dbbee2c288bc3c6451b1295bf46ba82ed3665711bdc1aa173c4
-EBUILD pypam-0.5.0-r2.ebuild 958 SHA256 c861193b07afead07f47611dea70732522eecf31a7ab54ff05818e1736ac811a SHA512 29c5f2160f3fae12b4dade7745b66c1187932385e2d0dbec320a37ee00e4f4bfc0be7898e78a2512d27ef77bab827637c8723a633d5869a7694d4a4c9f975743 WHIRLPOOL 5f9380c0696500a3c5b1aff64751a75f0b66e807b4de9738f6b20e91456ff5f8e4919dfa58d88fbd42cdc49180722d2dbb2cf01f7c86eb38651ede12e067fe44
-EBUILD pypam-0.5.0-r3.ebuild 1140 SHA256 bed5f999e88107517f50140561341b053360fd945a7dcfba7f689682b839d3f7 SHA512 9537c4de277fec393e8272455ea71db25a8cd1601d90224fabb5f06905767b246eaf8b3dee998add52977e3213e052101012fe5d2a1c7c74775d2eb7a371de79 WHIRLPOOL a23a47d31789c3fbdac6e6a6a61fe7896c7ee2459d2db8a9e1f5db08b62a23d9971807926fbe3cc901db33488a0d105e26560542103c12d73ce88276d88d0ca4
-MISC ChangeLog 2879 SHA256 59154d3eeb406e92dbd4568ca33c2fc1c9550b39843f4ae7ea0b4f3714ad20b5 SHA512 0883bb15f4231872c5f083d176f3083c4b5557577b6544bb437afebb34f47d80d38b7fd52e97a04ad016d34fc02a8eaca3bf835ed8edce8d1683e4f1c050ce6a WHIRLPOOL c27545ab49f927c0455daac33de9fc04d8c671a9f06fa240ad7556de333f1c88a73b6713d72e89447346f390e25a9664205803cd97fc2b31314174f48b021de8
+EBUILD pypam-0.5.0-r3.ebuild 1139 SHA256 52cd298ae7b7a8ea868b88a035dacc0e215be83480e7360c0abdf347d0930128 SHA512 c5076678719616dcbc39222283e23f6d853c9aecc4a3ab35a31c19f600d4bbc310e0b9bba4e691b487f20070cb2376b29b607e3b974eb23d20c3bda74ba8770c WHIRLPOOL 6d09ad44f9cfffb022c42578e9755a09631040d60dddda029da106ac4857db2eaad308707c62c81f954873a6ee1dfb2857b2c2a77b4d619275610ad23ed2b29f
+MISC ChangeLog 3124 SHA256 2f1325a26b425cb880f0323b67249b30087f971502e8f09f13ca7b1a27f35d2a SHA512 96caf523572caa6376f8a32233af46a47b97e98e36f0024e65cc58332098e9340cbfdb1c9b2c106cde2cd1db72c22da8d45a6d17a21de6c077d5ce8498665d75 WHIRLPOOL 6c50660882efd17c6e74be10e050824fd048ea4b1a39ddcc679a0d4fec5e0f341bc96fd6924c481beb11ef3fea34de7fc6b9ae75aae0d3aa6089f8dd1878973c
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVf83PAAoJELp701BxlEWfHbcP/RzqU8O3hRvKQXLl3qREtFoB
-uJqP7neR4u5TYtauv6XF7g24QSoxZ9+PRgDvWWqGZ+stWvUYWNAeyq/SeNOlO04z
-pqaEdyDvun/TD/AODIDCbGpXRkf01BSCykdlkgeclCJvIY9XjQnngJHa91KkQQzq
-RQf+oOGwiuvlYI8p6T1tmHIBv8AFqM0VfTbD6mRbMUPcnWfnLCqYqk8lcGLiSEVm
-t2ITaVFPn5BhNQSqb62EDWbqgT4aXunQY7JTg2N5HJSzUpm/xtVFUgzWeKtOs+sM
-vxl0gTFzx9mTAXEj9SHx6DnpDT35/tXjj+bnU6ci4cm2kGoos5/TKzpBLusRyVnA
-9sIe9qti/tEw6+OO0AeMCcpiL17qJluQI0Ah1qTTZs8hJ7WJeXz7eBm17/GjwQgP
-3LtVhERwi2hs0jX/LaZMXFaH7cd6BUvTVEJiUKUbx4AVcoPdmO5Pz8BpvABBq/1W
-n9Gd+Qv4QjjdtR+2N0FujlxRtvv0bmqtMFIYzI/jlg8V1fjoovNSCB9di/Qo7nQc
-hwsNozjg3CS+md6HIjazr+o2KkCWFm6oVL3KYkfeP3zd4Cnm8LGh+GNY/YQrMQzd
-EoznnJ7tnbh3smNX7mNZxsUcpOf07kGlCu3IfKC35LRiprCoqEH+KNcn/SDBkMQS
-6C5VI356Uhd0bXizNaDp
-=OTmn
+iQJ8BAEBCgBmBQJVgSaRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMe4P/if90lNx/yisx2qMy4nPbeAk
+GL6zSlAkk4hjRTHeYmgKwD1Sg/SVDOMY7OmI6GGPjtgDQg058MWrjNa0aSW3+Fkq
+Oo5679+yP5EV2HaVy/4Rk9gFBe8TKM1BY2N+LUntC2P9AP4elobh7nGeMsJXRD3C
+RgPHKtFQ6Fv48Or+tss5HNa54ga8IUdNHlAYonJsBMtfM+vLyP1ENiIbs9kWef/A
+QbCoezkHfXoin+WEKvCk6s/aGmdbxV2WUPiUsQOkd+JxDXt13RZckKevn6pJJp60
+ejrHFaf6H7MJMguYP9sieb1ooWn7DerBFiNe9OPEXz1mJXBWky+RdF0zHgo6cscK
+sdR1LOtSG7j+njFMJhu7bjB4fMqrakJRf8NTBhypyIdA72NbDmiqglbR82ZmcuSz
+jVmthOs6AoJE6o1Gof5wZMMm3QgnVXUsGxwmTgTvEuX5q+8UZjm0OQ/vgtFFpgU4
+eHcJlJpI+xqrwZotxDlflNQmwor8+OgxW+Gdhr1tajre9SNSuFX7od2vaSPjusJ9
+xtve1caNdJ+PqlJtx5wfJsNp8zc1AARp8NM0828vyzJWk9gszwDJ0MRmoDjKcv2h
+yM8gwP5v2nmKCE5HMVaAVDIuPFoA+xyNn/lT91cIfLPwV+VapjPQ9aTdRW6mQjf0
+COpMEMEs66RrxJ0zwG78
+=bAYb
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypam/files/pypam-0.5.0-python-2.5.patch b/dev-python/pypam/files/pypam-0.5.0-python-2.5.patch
deleted file mode 100644
index 687e2f200426..000000000000
--- a/dev-python/pypam/files/pypam-0.5.0-python-2.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'PAMmodule.c'
---- PAMmodule.c	2007-05-28 17:50:59 +0000
-+++ PAMmodule.c	2007-05-28 17:56:02 +0000
-@@ -541,7 +541,7 @@
-     pam_end(self->pamh, PAM_SUCCESS);
-     dlclose(self->dlh2);
-     dlclose(self->dlh1);
--    PyMem_DEL(self);
-+    PyObject_FREE(self);
- }
- 
- static PyObject * PyPAM_getattr(PyPAMObject *self, char *name)
-
diff --git a/dev-python/pypam/pypam-0.5.0-r2.ebuild b/dev-python/pypam/pypam-0.5.0-r2.ebuild
deleted file mode 100644
index 33bbb9598c7a..000000000000
--- a/dev-python/pypam/pypam-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/pypam-0.5.0-r2.ebuild,v 1.7 2015/04/08 08:05:13 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN="PyPAM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
-HOMEPAGE="http://www.pangalactic.org/PyPAM"
-SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-DEPEND=">=sys-libs/pam-0.64"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS examples/pamtest.py )
-
-PATCHES=(
-	# Fix a PyObject/PyMEM mixup.
-	"${FILESDIR}/${P}-python-2.5.patch"
-	# Fix a missing include.
-	"${FILESDIR}/${P}-stricter.patch"
-)
-
-src_compile() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_src_compile
-}
-
-python_test() {
-	"${PYTHON}" tests/PamTest.py
-}
diff --git a/dev-python/pypam/pypam-0.5.0-r3.ebuild b/dev-python/pypam/pypam-0.5.0-r3.ebuild
index 6a83130ab911..768858a0570e 100644
--- a/dev-python/pypam/pypam-0.5.0-r3.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/pypam-0.5.0-r3.ebuild,v 1.2 2015/06/16 07:18:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypam/pypam-0.5.0-r3.ebuild,v 1.3 2015/06/17 07:31:44 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3} )
@@ -16,7 +16,7 @@ SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/pam-0.64"
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 484a2e664bcb..472b6e110c34 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.309 2015/06/14 13:39:58 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.310 2015/06/17 17:26:25 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> -sip-4.16.7.ebuild:
+  Drop version that is not going to get stabilized.
 
 *sip-4.16.8 (14 Jun 2015)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 91c8d6ce43b5..cc06d85d8478 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -5,30 +5,28 @@ AUX sip-4.15.5-darwin.patch 1168 SHA256 6c96b4528ecb2cf596d0eb477167d5314dff65f5
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
-DIST sip-4.16.7.tar.gz 954799 SHA256 4caa8d52e4403bae5c4c64f44de03a2cfd0bb10b6d96c5fb771133516df9abbd SHA512 0e15b837c3f109f8665f057218c81ed4cb3d7c1eb9be78e454d54020cd748e5d1034d04345897f5f63a38c4ec33c39b9500486167a507895597d4e3c1623be56 WHIRLPOOL 3671344235e7fcb032936e3bf509170d2728b04b17402db484c5d73500378a161a6ecce8e592d38381ccd1d6a8daa01e098cb6680dd2546b0b34984e77032b3a
 DIST sip-4.16.8.tar.gz 957083 SHA256 d3141b65e48a30c9ce36612f8bcd1730ebf02d044757e4d6c5234927e2063e18 SHA512 aa63ab9925d581e929613cfd9c5804489a0702b8380958874cc1bd364030e21b30816493c7f38ceccdffc9da310d2c793ea438ce458ed06511ede7fbb913ef8d WHIRLPOOL 3c84a4de2be0458ec90dc2b266c0435808f0e92db09bae92e7ce1a24b2dd1bdf6037cdcec322a7c92266cf591e95bd36e812434aaf3dbfe8c71cf882dcba72f5
 EBUILD sip-4.15.3.ebuild 2960 SHA256 f2e542ca94fef260462548f9246f3fae8a7832e7540ef922dde218bb3959508c SHA512 4698277484174aa2fe7faa8722d4592e272e28b11967339e5d8c427229f16e686408f44587e1cb805d41772dcfcc3fe4d5e27380e093e0f51da9eea20fbd13a7 WHIRLPOOL b2d82a8a951e0ec502f330b717454e95ce5defbb704b6640877db0430845df2cbf667306447a1ce73abedbd19ea759fb52add5d396457097b8da933eb0e21acb
 EBUILD sip-4.16.2.ebuild 2959 SHA256 72d3382457916f7193ce80ce88bb053428e8752f049e990f97e30bbb2e0da221 SHA512 63ee075f777e6aba549de94f5c5454501f0546e6b674498a9b4cef56c90b422f8157982aa68098594ece41b2fbf2676843b485bb24e725dd95a41243785c5ee0 WHIRLPOOL abac0936c5f313da0130a6b4d358c789f773c39ad8b8ab69346571dbf24e740d337d3c2e67840424db650c768c364f3f7cceec0e48346d7b62f4934af18d3f84
-EBUILD sip-4.16.7.ebuild 2891 SHA256 585e657b29945eaeda7e5b915eaeb362eab9f070008aefab29657e0ae4492a99 SHA512 8f2a56a94547b9f9ddfd681ba23ca5ecf6238d69247fdde419652f60231d1e8c2e71221404453d8d8d82ab8e40995ab05454b6a8852ed31da206f44313b98778 WHIRLPOOL 7b64ba872def1773b744c83387c5dc01c29f65616e543ecf7ca0993eb0848ef128cfcc9322f3c77ca93dd7f278eaac18a98a6936e2e0cb33040b89f815a84078
 EBUILD sip-4.16.8.ebuild 2891 SHA256 7bf831cf24613b5341477b7a5affcadea4510816f54e3ab19e0a495cd19445aa SHA512 5cb317f4393c2df46390444b6796f69e01a48727e9c14aef9b43018611e1cbbe54f8ea96ac38272c57d883611b2821a06a1dbc1388d346ffe7dc53c762d2b3a1 WHIRLPOOL 4d620c744cd33fb760d9c3a25661ce400f1d925fbbab77253bd1e6a40fc9d05b357f17bd6d6f1a9e2b8d3d81a14c76c3719aca1ddbbc46ea1285634ec5f26c12
-MISC ChangeLog 36794 SHA256 4a67f58273d246eaba6b23312391761ce7dbda718b7b76ef94957dc2f64aeedb SHA512 c2cf651ca1cb91b3f3277690a1df8cf8eadfb6439d99262c16414b53ebe0f51dd414096b3e7502bbd32cd76007390fee17fc46c6a25a9ab71063d87c11e7b910 WHIRLPOOL 92bba91fb8a9fe2ca1b941b4d25d29f9c0809ef41371a313842e507abca34cd6cee9d7f9a0e2e0ff9dd0a72324a0a2ebe967e7a8db710917e0d7a9ea71d1e04f
+MISC ChangeLog 36917 SHA256 d31cc4f0fa091b73c69cd14feee21a3e7197040be2a2672c21849bbca6535001 SHA512 fbf18918f5184f3f575de7e11095ffb807764f8e7b8ceebfc40663a1c1e487d90689f8b9518701df2d391c38f14d255beedb3ee518fd7d6566b5f914be119d7f WHIRLPOOL b838ce140622da0738476665cbe31a47e312e4377e85138b5efdb2f00c761de938896e2e7d31e9bc9b9cbe57e09fd8f0c2e9a66e1f2771b1d6ce669b37147760
 MISC metadata.xml 450 SHA256 0cc9ae9aaf8d033bba396b2a9a139124b3990d753e8f8b6acfaf33ea99f78089 SHA512 8f81d9f3261e99e6a6b2e8d41166269494fd32f6bcc974f8bb5de27a9f5aa193354a422a60cbca1ba102eba5695bd9b66e9223c847cfc2451348c80a7973e783 WHIRLPOOL d5d8d0cf127b05f2a06588a1b58503414afb025b27e4630b5d387a46454e784d90aec19ae96260aa3715bb6361033597a479170c2526d7f4d8b10d4d3fe13918
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVfYQwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVga3CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9mLMP/R3QEruzosBKkiIGSnDK6cTb
-2+SHEb0uD53QLvMqS0OiIZZy/uvLR6ULNlRS3S9JDC8TC3uahdjmR/lRkYcRGCT7
-VTZR2UEgLnY3k7wqqeQnciq02eDP/A9m0aJ/42fzOf0FLT9uZHAX3aQXzEZvGk6E
-susnS60xiSK8W+7s0ItVrTb1N8NW7i78CHjJSKBmOy/cfnk89eK5zPDBAyH1tan5
-NpsPpihiDbBZO5eNLIN+wmy6jhMC2NLNA1R6v6+QnD615uF4CXD4kBO2iVcImMdJ
-KPiJeT7KiLkerx2LmQP5aeWxZa0vqGnDFr8Pax+U56pUSc1dH9MHaQ/HtP7Ztcg/
-HKxmxf43NWgNho+nOHSLIE9SCId8aVCbiiqV0HJGZ5OXtS65ESG2x5BXGWmfZRr9
-rKNq6zz9aVJkSbsBrXQV3j92m5eDyGl//svaxjEKynQ0FOIvfxplXGB2BlNMY4W9
-aI52KpM306K/LTaYlgeWL6AQweHaLXdPOsBbTGWxX5+Q4VbbmXNus3iHoz5GKHks
-7i+Z9BWlKLv0QX7tGrZx0xxfOUDrP/Bl0kkJ4eWBdTi01W+I9xyYM0U7vTjLSGov
-tS3Pqzw5MKeizaVU6aR0FjZKycmWDtBz68A71b5/yjiyw0EIvoMMsfKpoShOIN3M
-Px1ZgP5vPqcf1vV0+XuR
-=52yC
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9q0UP/RMW7Fjt9o3/jVfU+ETjlfjJ
+77EpEUpMDbdpfATL/H8bB7k6WWUjuAJr8wqL+se2R5aghEz8HkyypnZTTkjUsfLb
+BDHHHkDXnxoi5/R8oEeEMceXpEqoGl2OVGKFvQG2PkVGiO7nsgXTAhJH76SOOYIH
+yf7+rg1pfBy/Dz7+NoMCd/Odzf1HupBYocrO6RwATHFVmy9eHdUEDEaI6mevpQIF
+4c/BCHACORm2AerfpmTJMHswYYyj1y3vV/9/9T4gSdC6XBH7sjLURAQEgDRQqClv
+/1s4Xvtey3JcljJS8AzmItagOtwyB51vEoxtI4rQDGt3HV1WU0q+d54qVdo/8qnS
+p5M3Gmf2kHY+nhyVXXOv7okc2MR8x0JCKpDiFBVRxMxS4hT5CRcjuy9n7AdrvzzR
+NsvB/xcK3Cr647Tyn9D9kw/Ah6y8IovWyUuT25IvCOAsZmrS5vjsRLWgfeJ03nnD
+Mp5eckLy1uJl1Q5E/57qLBjqhWoabJvIzwZMB/t9gx5W7hLJMCrkK8+dPS/2r/8r
+4YzT5EUuCN0TkHY1/36OnMmtrV5OWp58hFOBC6oCVEmW+UCk8p6FpPBRtI+FpII5
+wKKQE0ThQd6kXpq8kkYFNXByQf40gTOGaLtRXnIYTTLOirRSFG4hrEFCmg/VMKO2
+cv6XrHPSy/Cd/3RflfwL
+=3cGj
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.16.7.ebuild b/dev-python/sip/sip-4.16.7.ebuild
deleted file mode 100644
index d37617e9761d..000000000000
--- a/dev-python/sip/sip-4.16.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.16.7.ebuild,v 1.1 2015/03/29 21:17:15 pesa Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-[[ ${PV} == *9999* ]] && DEPEND+="
-	=dev-lang/python-2*
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	if [[ ${PV} == *9999* ]]; then
-		python2 build.py prepare || die
-		if use doc; then
-			python2 build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	dodoc ChangeLog NEWS
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 726e31e0c58b..1c0edc2f9f42 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.162 2015/06/02 05:13:52 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.163 2015/06/17 07:36:47 patrick Exp $
+
+*sqlalchemy-1.0.5 (17 Jun 2015)
+
+  17 Jun 2015; Patrick Lauer <patrick@gentoo.org> +sqlalchemy-1.0.5.ebuild:
+  Bump
 
   02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> sqlalchemy-0.9.8.ebuild:
   sparc stable wrt bug #540290
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index b9eafed5d181..7bd425575040 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.9.7-test-fix.patch 1453 SHA256 4c78479dfda8ba88f9c2aa1d54e2b4b38d3bff2ae2c3a391f9bb6892706a75f8 SHA512 71c83a7d1411230d92a5a393d70da18a2e56c2dfb3e0221af41e77f8fa108070c778b5010f14abfffd866fff9939e710b3792c5ee4609990eb74d8655f83f0bd WHIRLPOOL a7ac8c3fe7d0af947f9c0f268ba3a2137ea4ec551489a7c9d2d6cde863dcd4a1cfc9e1f68db001dd8658619781c8281c904a7aacf3ad20f012e623ce83e2554f
 AUX lru_cache_timestamping.patch 1088 SHA256 e4bbc35e94b5091f9abb1cede122d2773bfa3f96a21a62a090fb1c1733a9f0ac SHA512 9d7ad6990b312dec26ede2c1c0717447cb034c4d701435aa278dd9d0214115c6d94d02c6a608c0aab0e28da69c3bfa7cf8bc1c9d61b3bc3dfdca1eb47f63eda8 WHIRLPOOL 149302829080935d5f620c7d6f97cb939b027b944f24c5d5650e009cbbe1bdba8ce2f7172eb2ca761b5a3ab1513c078710f679ccd61b23909423e4b2c1b0ae10
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
@@ -19,6 +16,7 @@ DIST SQLAlchemy-0.9.9.tar.gz 4213948 SHA256 72a51f6ae99116ea969381f65fe471aafe14
 DIST SQLAlchemy-1.0.0.tar.gz 4462558 SHA256 85286929727ff4aaad63785655c3baa413521b4d4955b81aa14d2f2cfb5b84cb SHA512 87c8d01d9b87748b8c374f64fa2978a093c9e130437c627922d9f92e2c9a97182cb596353f4f567a6594fe7229ae69bc681cc58d1d06fdf8dad07c0c29c681b4 WHIRLPOOL 6cda898ed4f5d6bf4d190e2159a565abcab957ed99f7ac5a56302b69e197e09bc8236d653c3fb4f835a6a468c1a8b449a4bb091bfc484b347c547f9fc93089c7
 DIST SQLAlchemy-1.0.3.tar.gz 4492091 SHA256 3c25d5e038b4f49d8492c18608ead181b09b7a38d301faccecc12b80e2c2f6c1 SHA512 4d66b58c8213d67cc0c568045bf15d92dcd1bfc2f7491e16ea04bdc2d1d8ccc08021b18cfd5b9275d9131f5bcf02b2bdba37c4518d88d4d61a69d77ea32d6b46 WHIRLPOOL 41d002987c558191b7837ca3406c79cf5f467dda76a6b1b1edd82c60829319712335f4c85300f8cdbd7b50cae3f06ca2efbf4f5809d684b7a0373a089ee4401b
 DIST SQLAlchemy-1.0.4.tar.gz 4580773 SHA256 9eb568d6381c6a45e3cc5616333deab653a15b3c6f9958419abeb055b400400e SHA512 fb33ba351b8ef10a41d74ecb8489baa6c83a5a3844ce6303926bd23baec35cac40676d74ffe86ad561899c6698b9f197e800ea845d241078e5e1c1e2b84aa712 WHIRLPOOL 013d32d85d12045084729152d39ee26b6d34155bda4bd5f9d8f463f83f02f822b0d3ef7c55f6426224bed59629abe73545e5eda25cfc31e4e7036949cff7085e
+DIST SQLAlchemy-1.0.5.tar.gz 4600531 SHA256 b57d3a35c39ed956e3002118a51502918b2fd357eca7523a6b50ef8d329a29be SHA512 d898c2b74132a3f1ea9c2aecd761af6788f6dc2c76b471dfed5b0c6f69eb273b6b4602028ad0a142129311be08da97d74d277db2150c169c51385bb7d28f843e WHIRLPOOL 204c8079ca8a2ab43e363f3e8ea0dbc436e12ec9c7dd0bc9201eef85e9d7717084c38e4655def400c19706c9c80f91baed9bee2c206e670ae8de030be27ed167
 EBUILD sqlalchemy-0.7.10.ebuild 1799 SHA256 12cedc287f65d1e8a64a1ddfdc88ac4c9bd96b9e3a82a9b5da4e57054a5a3ba4 SHA512 0162f8fcb6ba95857ade018d0758814481ef999cba2ad4feee4a507c819c0e0b9481622b33e559d2f7bdfe994c9490e4767156b1ce778a81f7cfa7377bb9baed WHIRLPOOL 0343b58d3d337e2eec93c47debf0cb5adce431cefe71444dd2f6839d5a2d6935452b532a2da77f76f66bba4c162d3832f7ccc7a2a48c50b3ae9bf2132d1bdc8e
 EBUILD sqlalchemy-0.7.9.ebuild 1960 SHA256 3a0393d89956f4a5874b13d305668c82a16916154d13a96648a1da4b0138cc58 SHA512 b9641ec4785d6d5a41fe7ce3414e5da1638b5f6b45c6358fd7a686bad824213f93d65c148770bc1476b99e8416331ccb11a5f7b74a3d4c01f5d3a3d1e826e334 WHIRLPOOL ce77a226a3c02a6560868b27d055e90b0b6bc235900afe08e2bffe0505e7e0406f231d53a00a71a779019bb3bff160b855b22d7c65ba2f88f7cca6e0437a91c7
 EBUILD sqlalchemy-0.8.0.ebuild 2080 SHA256 095505f1bf1731f67be284cce424e9078ccdc57166eb20f6b973c9500c05f02f SHA512 1d5c4ddeabdf5a3735c5c92fab21a0b4c15d5b7180c82dc9243522071a43347f1ddc6fd0f5b64090e491258f9b93152db9ade93592f072e7fd07f03080d78298 WHIRLPOOL 1918d861a28d6a02eeed44dba702fbe267540a4b1596ef35ad7fc148e271776171172bc84b46e8d211e72b59c5c33e3ec0611937152c4ba84632c6739f88af48
@@ -34,22 +32,6 @@ EBUILD sqlalchemy-0.9.9.ebuild 2592 SHA256 5dab5c6efde6b1ec6c258271dccb4eb1addba
 EBUILD sqlalchemy-1.0.0.ebuild 2598 SHA256 dfa10d1f2ea7ba2f5f27b7cace824ce95dde086d3678734498a564cc37d63a11 SHA512 f6104d5ad4ef862a534a523688981b140c665d00ae5c1fc81de3d81a9a72ad40abc6ad3675c6126ea066f882af78ade3f5494215739a82655fa95f034f7b0952 WHIRLPOOL b4973f8a46138f6dc516d1d8813a7ad7364675106b64afc0e79c0edd5146518824444600d58b8d015515167ab0181f473b98f62e7b6f183862598bcebb2da4cb
 EBUILD sqlalchemy-1.0.3.ebuild 2598 SHA256 6d8805f5ca1ce9d1d88aff02bb11e93d6a322709fc939da15e50004c2b401e5c SHA512 490429ea93f62a532c641600f0edfecf9448afcba2ed31a1907fb8cec1ceb8f1c264eb23f1cdc7b01057f1facfd4d051a850c0e9081d2524cc884f39faa39315 WHIRLPOOL c4698217861f03b46a4422827c7990d1f11b68a0216db108e6ca4111a81c11fa1b2b03dce2453209799f7bda91f11ea332899579ba273c3503d50736ddf694e4
 EBUILD sqlalchemy-1.0.4.ebuild 2598 SHA256 ab0a214c2abad3e66140cb63c5a760d192c37f6d6ed649b3331784c41a51ecb8 SHA512 7ccb5b23888d974af648fce32c6cff8aedb65eb0aa564f13d70ca64add94c0e7c84b14d483e4ee3bf8de825f062277e51bd25a9c00a9a816ca3d14aa18cd888e WHIRLPOOL f54797ec809b7a3c93aded74914868fb2c33c5f8f1c368b4bca335b36f9ac1b894c13ca88092a81d7ae54982579cd0dfcc57453b1095367d5c810f9549f4eef3
-MISC ChangeLog 23367 SHA256 84e28ff59a1adabfadfb4a74b767b1d9803fc31caac0bb4ca0cb9e07f6d17521 SHA512 7d79e5d3edf2f723d3de0208fccd2e0de3cee7db90246428b08dd158fee000a3f0d4b492034e0440755a56676ecfce2176c1001b1eb54f698aa1c294f7fdb6e3 WHIRLPOOL b3b26dbb35e0a6261981d4ea0cd14d625d087f867948c17ff4784d0f3b43de2d87debfd56628fe338668997d4fae857fbb59a81b61247eec89b3b6e13880647c
+EBUILD sqlalchemy-1.0.5.ebuild 2598 SHA256 954687dcd0ec1a67fc24608e73a115492e3c62990722666f079215c1566f7b07 SHA512 ec70b5df8982a3ebfc876e6b77fde84879d1d972568a6cf86fc6cb2704dfb990d6b91ed330a268f2adf4c6555243214214dc5a2ed7e884bae027e104d9626fbb WHIRLPOOL 583b26ad5f15e1b937675f627492ffb233ec07a1008f75987ff0bed783a7111cb64aed180e3ea720b1344d5cf429f0163d968976e4249f713ffdb41dca42f95b
+MISC ChangeLog 23484 SHA256 4f1ffdb396f9cf779ada1b68239edc5b45868a949af17d1493b4c054cb6cfd0e SHA512 142956203077d52f25dc505e1a9bfa05d2439688230c8add024c7454a21ef8f60283f7d98c17b01c4ad1d414f75ec27692b79bd82e036220e5bee49e5fe0db11 WHIRLPOOL 4be2c28358d43e17e91a30c39d8ab59cef6e33bc2cd115e7a231ee04932e12161dafd926dee9a74021653410b2e20e55b7ce1387e764b1e7cdaf69bbd29cd7bf
 MISC metadata.xml 233 SHA256 77ca0910fec09997d5679f4de22c824a0b0de12d9ac12b253ad544ae7357f720 SHA512 1521eab2401d4b820c053a13680ec44b9bf4931516f4f4c1508ca92b288bf6cae2db36a875ddc5c2475e862c16d3e92cb662c093958950ead4eb72e463abcff6 WHIRLPOOL 9279e4a60e5c11a72f329dcc13bd9c18d3bbfc1fcaab98f46df1336835f407a8471b4a76b61e74a5fa1bb8e24156cd5e3c2e8418752a412479f37b6193b74ec6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVbTt+AAoJENNAYYQy1of14LMQAL3uAkYS0t6FJ1yeg7jDNu9m
-0hoY4jTSJMh7FexJSPMdh1TOuOsjtY2B2dL2IJOE4TfXMpG+t2yl4C+GI63UOahP
-HYxlxaN/TWOBDmkkTrgxE0G0ikpXwIx5lqeettfRQjoKEq7lBx18fzSrPdd7yUWq
-gK5M8dRvODl7fi2FB7xHofTRdd9hU/VAVOjU+upI1XgIarHm1gSTmsVGsLsYaKI4
-7iUGJBlWF7dqvPWjDCoY+Fxt2uTXErVaHgvgmkAsAq2S2ONYISZIBETpAMh0I86l
-FjRjodZKdwo7qbEgwQuUCpXpJeYxbPtppb9ZZWI5TCwlKbZPJwlZXB0coXupuCkz
-2OBAqI90WFDBHTRhXUiR2LAFiivH8FkvJELXKMKLAB5EfYWbHdG5tXjF6Sc1PNdC
-ZDi/mOPXOUTUuhRCrprvAl7o5X4TJba3Z1cOX7lbNhU3Ce0pDQMtCuc17AzTds0h
-0AveWVJIzqSR91snwB8ujSsfP9hYRqgQPgJyrftzsln0thUdphfbNrbaJSeOiBYo
-iB/QHXVH+F36NsvM6TjhPWCeXZdUhK6U4iE1YlyOEhM480ZkPp+rwGEoulHesRhd
-rpsC07WlZfEXfEzqOl22zDCyA3uxVDtUJvnw6bIvh7+v/k3Gy5zPcCRg4Fk3vcrl
-8wt1EhrvEKc46fUCa5Zk
-=QgoS
------END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild
new file mode 100644
index 000000000000..356c14032300
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild,v 1.1 2015/06/17 07:36:47 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
diff --git a/dev-qt/assistant/ChangeLog b/dev-qt/assistant/ChangeLog
index 29055d8cef1e..d9a2aad51512 100644
--- a/dev-qt/assistant/ChangeLog
+++ b/dev-qt/assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.30 2015/05/30 10:57:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.31 2015/06/17 15:18:12 pesa Exp $
+
+*assistant-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +assistant-5.4.2.ebuild,
+  -assistant-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> assistant-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2743c7894cb9..e86db4e2ca98 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -6,17 +6,29 @@ AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD assistant-4.8.5.ebuild 1598 SHA256 1cdda8bdbb8211fa9b12dae0ba56233e5f21e2f2c8b8d10eede7146d6ab10777 SHA512 aed691160820937386f7d2cf9416ebdd89bdfccef555ef92ce0d6fd82af56dcb9ce11d20be3058ee3cd8317a5fded84dd3d35cb3fa33dbef9bd043a31ad3e8e4 WHIRLPOOL 8e896db7d39b62bfb2a5a8794535c9a0385a117a8355462f83c5f9242d3738fcd3ab9bcd513aa188654d73806e802881f6341e7d98ce0c1e073d380c68157e6b
 EBUILD assistant-4.8.6-r1.ebuild 1672 SHA256 b4c7fa449e552649677483034d5348dc09ae63974bfca565748c56a34e5e7b55 SHA512 f5f2006682d591a256d4091c646b85285413432bcb01480709edd10f1579d75ff28b8799bb2027897558c01725e646050d2538486d08d6516913e17c68e38eef WHIRLPOOL a80f7d841adf2f5880060bfd0a80520178f9b0e83946db8185e2045998ba4e47594c1eef4adea3f83524122de1ed27487e4ac912bc7355a18ae45babf818b218
 EBUILD assistant-4.8.7.ebuild 1643 SHA256 ffad2775a6476802bc6501762db76704e00034565238ad1fea12ef2070d6d47a SHA512 df8dba6c60a7d066ea022ab89ee4186e65ed20a4b80d41f7bb6af2c5e8cfafc42e86b660f38112e49c79100c181c993e21b07fbd83eac9a823fcf869a78ac8d6 WHIRLPOOL d54b150c0ed5c681741de268ffeec30f500d41f9e368b32d530b5c8dc3a9d09d393e2f7b128d44ca616df9accce6440a24d1db1452c02ad7ea5ae89661295ac4
-EBUILD assistant-5.4.1.ebuild 974 SHA256 84798ca9d998c2bd1790304b6d43986b8b20bcbc91c9357ae4964ba78b5d1cac SHA512 e355f40e1e7257dd696d89d8a97fd55786147657b77720d7cedfdf8338c3902eb99d5734a02f31b791d99e693721184e235db7ec6ec711475a4db055ef840387 WHIRLPOOL 52b831948325c9678fb311a1088b23371d1dcca3d39881eca5bd7831a7be814610401eda43b21655030b3fcab7f4a7fd4a1c8089852ef145a1cef5072d51feac
-MISC ChangeLog 3789 SHA256 1bb0fa1c85c59be549c4ec1b0632f60b1c5e0a6b7d96d804949a9bf84e9a7e38 SHA512 a7418143fc1ac289e8a64b31392f0c20d146646aa827c846d9370710b683ad3488babfbabd5b1908a74abcc4cc720590194c654752de71d27ad38497cfba8dd6 WHIRLPOOL 6a4c90cc0874ca36fe9a44eb4ef99be810689d3702fd4a8037c3e5a28aa92645cc62cddeb4337dec400ffa08620ea45c03fc95f049e038df59f3188894531b9e
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD assistant-5.4.2.ebuild 889 SHA256 6092c63a386a52655423b86f3fe6196e4a2d4036a7ca78f4cbb0f516e8fdf96a SHA512 0d1503d7faeb30358ece44e9db7a9f137fe2249aa24a81cf7428673067405f48745cc1cf0cb39f2a2ae58a0e71f034b81e39e63d8dc27d3f6c02a81e15613235 WHIRLPOOL d35570ebf8447f7f6ec965460a23f5d4be0652a3c4c0c1f37701d80cb5df8e51da2dc68305ba2d272768db914e11c67a10b2575dad73150894037b3a787d0cbb
+MISC ChangeLog 3952 SHA256 7f03cfe35c85d7339c7289251e2319484d2a254178c4b7f38ac4744e8b4cd9f4 SHA512 fd15bf35eedcd34cef3b1ac12e816230b31c91dc6585ddf22768ef7e21a508956d28fc9462a10495f9b6dcd15ead821c2a07066a72e43f8754db68c5235cdde7 WHIRLPOOL 15f3f65ab0329da43c883aa0421f0dccff37f5b7a7bd5d8a0e2084fc3fae422ba05dcaf684d9f8ea1661f7c91636797972d13bfd9b3fff927325b91b4b206958
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl4QACgkQkKaRLQcq0GIcUACcCPjlI6OPnedRHA7f0hj4ibsa
-VVUAmgLdiMX9I1ZxhP7Yic67wWZ/h8bt
-=iWfA
+iQJ8BAEBCABmBQJVgY+1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9GpkP/jF582xXuTK45UkMRQ3cfSmW
+OweXnwP70yPX8/L2JTfFFHXfk1BqKw9bNLlLLKkAPt89yNc4l/3Tlx54sx+21XPq
+Xkb1HdwHRwXRiagDp9FyCxZPgwk9Khi6jieJv/FEGKkefnYmqGi7wkXV6E67nldy
+sMO6+aF56DqR5K3qIOBFs9oEFPIT0KOGTIsW9XVINLaeQnLSdN8EtpK8M+Y/4+UZ
+XIHN0ZuSzBAMSILaXoEBHlRhlWQWSgdd+iHsBxY4Qeti38kDzM5r1q1bucFcggRQ
+ImvgxZk64d+JxVUaah+lzXUWZQkNyKJZye7Vrm3r4zZwB8ygdOqPzg8c061KXQgh
+QeR0J1n/1LW2g1JjUdRpZ2crtIfHeije6U5zD+0o2vmNsdnyB04gGwnlUBei1jpj
+WSYhlDwOSgaoqdRIOeUPddc6t4tTcIlH+EXIMTswX+TAV4+GcefDCZ0EBwQQBrqB
+0e+QAhiRtJ6WP7BVEco9x0Qi2LfHJF7+RpZ9cP9NlHYzwpRRQmxZ3GMeFXcG7GwP
+XEA+rujeoRyl0HJ2qOeWt4pNV4PoXqFQDgdmDGrUX145+347g6xRh+S107DG+Qo0
+iKxq3d74U59PflU/LO7o6wCZLjoVAV95VIDw4EDaiSjFykutxDewEqxvwx+zYuzp
+pOyBF2ilwG1QtXIGk46x
+=mZqO
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/assistant/assistant-5.4.1.ebuild b/dev-qt/assistant/assistant-5.4.2.ebuild
similarity index 57%
rename from dev-qt/assistant/assistant-5.4.1.ebuild
rename to dev-qt/assistant/assistant-5.4.2.ebuild
index 8a2caa8781d2..027018b72754 100644
--- a/dev-qt/assistant/assistant-5.4.1.ebuild
+++ b/dev-qt/assistant/assistant-5.4.2.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.1.ebuild,v 1.3 2015/05/16 10:41:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.2.ebuild,v 1.1 2015/06/17 15:18:12 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qthelp-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qthelp-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/designer/ChangeLog b/dev-qt/designer/ChangeLog
index cc85b1df8920..907c6a1a167d 100644
--- a/dev-qt/designer/ChangeLog
+++ b/dev-qt/designer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/designer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.36 2015/05/30 11:03:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.37 2015/06/17 15:18:46 pesa Exp $
+
+*designer-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +designer-5.4.2.ebuild,
+  -designer-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> designer-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 4521355cd2fc..6110110e236c 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD designer-4.8.5.ebuild 2590 SHA256 3bc27bcfd2b26dc87ebaf878415151b1030d21d9790a1275a22dee82b8c2e6f7 SHA512 d7f4e4d8d61fee02235b97efb4d09eaaecedd82d1a854e7ffeee2b72d72f961ecc6801c6ff8a88bd12dce2286499565c48d9e414d154efef840887a0dca80bc0 WHIRLPOOL 3a6353e438a8d0ca73f2fce27b078f3a11d88de39a8bfa224f680062b0624e4893bd41288142d3937047188d0481fde1b0c0376e22b55bf120587c6cb698e396
 EBUILD designer-4.8.6-r1.ebuild 2106 SHA256 daffb50122e0d89d1691673b7b9bee28193c6cbba370ce9c359ac08dd413202b SHA512 304c1b9cd1ec282ff00f03e174b52f51de93dc4cc085b92083788855891313810ce39757e0f6d8dd4cf4d5ee162570122890fe1d5b75ff41aafc42b15c429130 WHIRLPOOL a548e369d6a69a84c8e389d15de2a2bcf3d3a678ab969f99757d797c7d5304b8824a4badd028c9811a4b7b14c2410abd06bad499221afc6a595b0b404aee0bb1
 EBUILD designer-4.8.7.ebuild 2073 SHA256 6f531cd6509127776f63156a276e81b5ae3d7338e68208fdb017d944ccb78c6b SHA512 0a63269927ef0cbb639efcf675559f6e8f77413575f70ec6879820e990839970e03c7d9255cf2677dde4178221da4c638332e50c33310817476ac24eed51aa3a WHIRLPOOL bd929d9a71da8b4f04a62f2bcbe64e72246b5f68a5374ed8aa0a3fed26e9217fb00c6fc8b4a216b3aca393c7e542465501cbe8cf865473697c5dadb8af80b231
-EBUILD designer-5.4.1.ebuild 1083 SHA256 6684ace22f460d436b4dc7173bf84eeacb8d962fb9e3979fed86e5b96d26a6ab SHA512 0926c3ba9d1be030d5e5c958d07c928eeeca90a82b55b3408d12c54610bc3925ab585a7e43b88385e3b956c324272587861f253d42dc87e9e03358c4fedf2e34 WHIRLPOOL 7aad1d2edd02012e77c6b2bf415f25241c2ea7d3c3ddd5bed1af1ef7d476361fef9e8843a271fcda5a17d7a5704f9953c1cabc6b01a05facbf31d52148838031
-MISC ChangeLog 4534 SHA256 2ed4c7edfd7324c01c54103cfa36fbef0e7066db84021a954b738b66af8718df SHA512 67fe56c05d9dfeaa913874512f599639bea4889442e42a36e3286ed465d646c1bf1ca175ae4f36ae62c0ca3dd9bc42a403de00c30972007b1b2df474f4997077 WHIRLPOOL 1c9e462cb17ac554f54475245264a0ae229d23f872659df53fa5b15df73e9b95d09b5ed41f13c0aa3657f5f5ee17028203c9d17fc7d31e78b8dac3396f4b2198
-MISC metadata.xml 666 SHA256 988fcc19ac163521a9d07a9959e0f62f9e6810014d5936319ebd2286481b65fa SHA512 cee05b3ad88861732b1311c60f7bd8a57ba39cf1108933793cd8bb209e25db022e5073d15703e78f5a4fb8b646904c20fc40b97b6eead3a83fd829f1922a949a WHIRLPOOL 4786bd6029829a2c088d36892ed56084a0ea659445b17efe38923af33e5e45849730c39af4edc7ab38bcd32346912150cc73a18dc2c0bca05331a51d64f5fc4d
+EBUILD designer-5.4.2.ebuild 998 SHA256 152cd81781644f139f8bdcccfb60b5796697199aa710403195ca625b526859d0 SHA512 8b063eec0872567f7ac45636eec345ae3f0770cc381ff3587f998fb0e370b3d1253b7eda779cc2aaff342d528db2a83ec8ec97cd1058483b13395e010d688c7e WHIRLPOOL 0ad76935a66ae57c08f3ba7b02f3117b089ff993a46f024cb8a412ee967c6296de5fcd3e9b00f9694de6c2ad3b15768f47f95deec4d62f0fb5af68e59eae9938
+MISC ChangeLog 4694 SHA256 5f3149da7af0ada4fc74bc425504ea6ea88dbc9b99c038a5f20c528081bb1ffb SHA512 913e35b825dc3cc95a2e63076b4f3c49bb1135eba7e473131aa77f635982dfe3de5fc26d9531b1c939c46b565baaef1eaf3d81a1ce564988d9933f018f167382 WHIRLPOOL a42e01ded76f3975972eab6c9d774f49f3735859da1c605040a8b8d56afe6a0775a2fbe1e592070eb3a9e597019ffed25d04118084e44b4411bd4469f78bb553
+MISC metadata.xml 657 SHA256 0d82d0747cc33e0f8e757be58331aede459e422d9c4f21290bee0b778235bd3b SHA512 98085e9d42a2ddaa392fbe23b1f02b55a17ae71198afd84a56d984eeb5a15edd7c6cc74ed597375d60f0701610e76e2edcfd862092ac1672d053b748d7436570 WHIRLPOOL 781bdcea4d51b1b71dee9f5c90b3ff4a7d3ad6bea030dfaaaba26da5f783170deedeb750d9f57cb837a7f26c57e661c46bad3481316591d1d5ba7fc10e89179d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmO0ACgkQkKaRLQcq0GJdBACfdofBh4a2aEN+hKDmIFXs9Vy2
-sHcAn0k5OpivA3WECOUI2xqzhZJfEnqN
-=awXy
+iQJ8BAEBCABmBQJVgY/YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9TnEQAILewVuovgLVqyqJuiVATHy4
+6Lo0oekO/Pa7XaClSoiHrSNi1hK0KYmJZHliUAbPdt7M0BZOeeLpidW0iXBQYxHm
+WODCI64BwSVBTUPpBAdyW9yJ8BWVoAC+LZJLMwnVr8zHuGNseNLXo/Zk5JThnBRn
+vmQ6+zQN2LUNwOOlnREDkEsUNRWbi+BcF4bdjZAFvOijkC7Lv5L9GrGDcdD6pgLO
+Xl9+delHmsYxmLnn26oPZRkP85hdOc4bNOQ9rF6a5COHr6jerEdfnVi2BUYTEfhw
+R+W55McQdP+Or+b4IPTlhr9Gwu7U4Kc+rDTgyCL8fOIiCcSZR5gn7WNvSjmFCNfr
+ASekfKHqG1BmuYFpA3SA9Q698VvvkIb9hmC/7MGn/0aZV7kSlIk+IsjLF0FA4OlC
+ihKw3XPuDhtuuCI89YMWhPNkEB0ba5Bc60SDPvblDF5INeIUXGlMjLhlL/m7bVOX
+6xvkGW8J4zCFwhMSmd/ol51FhumOl4Ofalntv/dxnR429+ORPJhmneqyeSPWZaMd
+oJRseveTvgZErwb9OUnG7X3K0WhFLWGhqAExzfjc4vnhOs/o7OVhpLqMgZ+/pZpc
+KQV9ynU10p7tftwtMYZcCNb87QdXzX8ZkJGO5dpQMYVe1nYDa5YdhrNncw4jvsPY
+usC4jeyzCr9mXvwNUbOU
+=Y7UF
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/designer/designer-5.4.1.ebuild b/dev-qt/designer/designer-5.4.2.ebuild
similarity index 59%
rename from dev-qt/designer/designer-5.4.1.ebuild
rename to dev-qt/designer/designer-5.4.2.ebuild
index 55c96fe1c437..4594e5234ae2 100644
--- a/dev-qt/designer/designer-5.4.1.ebuild
+++ b/dev-qt/designer/designer-5.4.2.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.1.ebuild,v 1.4 2015/05/16 10:42:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.2.ebuild,v 1.1 2015/06/17 15:18:46 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="declarative webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
-	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 273867d523df..d5e349c54759 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -12,6 +12,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/linguist-tools/ChangeLog b/dev-qt/linguist-tools/ChangeLog
index bcb9fb01ad91..36aff541630b 100644
--- a/dev-qt/linguist-tools/ChangeLog
+++ b/dev-qt/linguist-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/linguist-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.13 2015/05/16 10:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.14 2015/06/17 15:19:07 pesa Exp $
+
+*linguist-tools-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +linguist-tools-5.4.2.ebuild,
+  -linguist-tools-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> linguist-tools-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 76244d30014b..1e91df61c6ab 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD linguist-tools-5.4.1.ebuild 853 SHA256 4403ee71c903fde7b86efa93d709e74b30b2d546c2aaf849652baabbc57179f1 SHA512 e92d0bb6cb2a300aa5df13df3930cef23fc615e2ea8e498be6127a61122d24d835a0d99b2ba33628cb4f16a48b4ce674519905e664cff20692b65fde80e1d1ef WHIRLPOOL 759807aaa008b64e7dcde2edb09134121df2598fe9933cab25c61c145ce4e3a21e0807c4cab6006cc73fdc765277e9d1a6ae0d29c73e38fdaf2683b9bb123188
-MISC ChangeLog 1596 SHA256 9a5b99e29a727634df3786570240617c26782219c18baebc8d36bd155bc2044d SHA512 76972a6aa2e7a29368ec93ad8af11dfe6a3723b59ee2bc8e1dfa88c3c3ec30ee83990552925b6f672bff5b0920543554bebd040e31d7deab3e5a99a3c46dffcf WHIRLPOOL 0fa4b1b1e90fc9dd27cc23e6de6a53d89ee1078c8adc6765baad49bcf694ef94c05214777930686c657ba838ba5176e3565fb0f6a30f7e572d04b9aa88f3f294
-MISC metadata.xml 339 SHA256 3b98372c3fd90377ac1d83355d02aa52592ef233e306f6152f7b95c89e7bce65 SHA512 4e5ef90e7454ee0fa6b9b1234f9872da7698a5c8c35e70bf76cbf4a595d642eb9ea07a372d8cc68509e9bc54e968cb297b260eddf43147ef12d4ab25fe981ac5 WHIRLPOOL 0082e04b9fc4a106823ff1abac5f2fca007865ba02759de8c457000394635d084712f3da67d278abd0d510f76514424402ee8a604cc780a1d76a3c0545279408
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD linguist-tools-5.4.2.ebuild 807 SHA256 51518aa015124e8352c7f6702ac1f488948cf3fafbbd16ca4bd1af315739929a SHA512 57ac21efe0358b28c1f5ab8d7aa1fa3603f8d77c9ffb768029ebc6c77069be9cc2fdaef63db7871da40f12f967a9ce7f9779113c8fbb33d2d61522ae24f2d679 WHIRLPOOL ff5e54bc936d2de7f4f8c22e0b57336224071865a82890ac700acd20e241c3233dcc3c89fcb8d202440fa4e97cde2580621bcbfcb907382ad2a3aef3dd9b9990
+MISC ChangeLog 1777 SHA256 6b29095283d8e39323a1752f5801be81a25e680073f86455ded2de7a0e9e9c86 SHA512 0867639b8583e05b8a2f3b3dcbf6a9b039de4f20142fa26d50eb6b75e04ddda49c7f02bc28626204a49b01656e34f326857deab72333c8f4c6493da3f8cb232d WHIRLPOOL 8d75d3018904a9412e50a47a9fbb827d096e40e2e595bf6bcf1d3357a72a48d9136eb4e9759f266f70db1923c5c293127c93d72f2aed124ffdb258b4102f3e40
+MISC metadata.xml 330 SHA256 e2b4cc71a1862b72b009b37ad816331faec93109932045ab799d63c04faa2977 SHA512 508a165179c0f12a0fb295853a9395c898ddf4ec2036d9554e9df0783ed5c586b1cdea75b91e3bd97be7aaa9514668bae295b3a4ec9ed8a09c194edf488f48ba WHIRLPOOL 286938f0cfc64654276d64bac093a8799b9db0854b826e15ffe80ea5f69ac866130cddf30e1c9d2f61a71bb8276963892afdd5e9b838914370407fe743ae2ef1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIv4ACgkQVWmRsqeSphPaPACfYvmeXlpn1GFujmQBFjBoGzu4
-PIIAn2yG5/3lm+oKSK2Oo9gp4ld7YdRy
-=t2T1
+iQJ8BAEBCABmBQJVgY/sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9nngQAJj61PlUA1zGKxuO0/T3GXZY
++wMJZWKe41A+DQS3SoE1ZCPA2PjatqIHSETMqfykcXZHPnab5EiJoPa/ktLnWBKD
+1f47zjo7xp/jBWI56IhY8bT0X1h7eHkXpAjIMgrLQZc4TJUzz1KnFhXVkn1m2dcB
+qVTuEg7+bILE8yJK84yCRjKSFlLxsDO2ycSyqM6KUnBE8a8r90c9a1ZWawY4autc
+GNxrob3wWQ6C7YdwS7Z3k1tTQo5F6qptAyNu6CbDTFUDz2ym2xCKsmfVPMcZUM0U
+KstM7FVIjXJqCnCTySAWm+2Nr3UAh5WmeSR5Bs3yqpOvCgOdRlZoM01/NIgLrX96
+w6BHz8lQK99K72TD8nJF3GOS1PBpjyoTanIHR9KByqys1R8yXxj/g28s4fiY76AW
+4ea0QmU8/L1aojgV7PMbUBUPsenoL0Plu3YPPSH4RESNnhDQ2skeY8aCiIs11TDO
+36E1VS7WBf6VEmK+9w7RGU193pA3durC6SGNrJw7rpNJw/887YCPhQsXFyJA0tCh
+M/XO1t00XoRfJOYsbUzM4sZUO3K89FY7Djh2tVWfcM82A9tntZnM4cv6AbRLSQoD
+PneHMOmvCi1i/fmnDhMgzoMTTOZNt7rxdRj0kIYynycqz7i/h8PdeISGipvFA2o4
+M3SaO/FqjLOTAoMh+feP
+=vgP9
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
similarity index 72%
rename from dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild
rename to dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
index 9d408020c6f8..90ea40b5fb14 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild,v 1.4 2015/05/16 10:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild,v 1.1 2015/06/17 15:19:07 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tools for working with Qt translation data files"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist-tools/metadata.xml b/dev-qt/linguist-tools/metadata.xml
index a0aaf4ffcd45..7fd11f84adca 100644
--- a/dev-qt/linguist-tools/metadata.xml
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -7,6 +7,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/linguist/ChangeLog b/dev-qt/linguist/ChangeLog
index d35d83cba71b..84f5c3fcb1d0 100644
--- a/dev-qt/linguist/ChangeLog
+++ b/dev-qt/linguist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/linguist
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.31 2015/05/30 11:03:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.32 2015/06/17 15:19:00 pesa Exp $
+
+*linguist-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +linguist-5.4.2.ebuild,
+  -linguist-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> linguist-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 14edc8adfca4..55c31255b83a 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD linguist-4.8.5.ebuild 1378 SHA256 3e7e2ccd9397161b9342ae2c1aced92810ae2e3d642dd7fbc0add076d1f1d044 SHA512 677085c8d6ced6f107945e38c42f1f1fee1d7d50490e2b8e3214570c12a29a4a69512c47ce1f21c720eb46ac4ca15f7435398101442674c9432fedaf67d11f13 WHIRLPOOL 35d656ae9a51c3ce1045070c5d3c72d494da89c06f497b1b4ce79b7c2d5f0eb01d48e6563e6184a47ee5f0059bd11b44d94ff8e2571bd96265e1c31cdd495bd8
 EBUILD linguist-4.8.6-r1.ebuild 1409 SHA256 92ecd6d378c3c1f3d05ca3760aae94ca1b244055d1d27be43667548dfd536501 SHA512 d3afc8c739006690461f438a80a60eb85e20685fad2fb08a50d60a3e45d2d3d9ae4d984decb67cededceca8bf4e4d9324aa02996e3a84bfda8ef869860683721 WHIRLPOOL f206dbe916efcde66dbc676c66f02e83a83b44176506da8c94c88c4a672e7efc6df9daa80afc4969bc99e058b76ec42d681bafba0c90503a8c0380915adfa0c7
 EBUILD linguist-4.8.7.ebuild 1376 SHA256 f67b54313c8fcc89785c6df9ac628d7697076b122a175706746e04e0aad5da53 SHA512 b79bbc0e3bd2b0e9c89afb3ccb01948874b430cd988a76d9e29bb20e84f13e9378fa8336871f82ea8df85535e8101b589c35eaca9f868e9b90204d7a319082e9 WHIRLPOOL 09b031cf6b6243fd053ea08b2f8c58d6fafc1e14a5ed8cde84e9927e3753907dccfef2d308a85bb1b8b7723a2fcc85d1e2b0c7d9716795fcd2e5c5342804ebbb
-EBUILD linguist-5.4.1.ebuild 741 SHA256 2986be02f352ba1929f454e88b61a13b6c8fb032e4d95a58b830a7848e4b1c72 SHA512 cc892298159c30443884a3f09d3fa6cceb971c346334f5c1cd7040e015ce04ad623dcb8195c6e4a79568edc8651555d20816c484a857003021cb880413b6fdbe WHIRLPOOL bfaac5cc74bca3b5c341427a584e00e125eb32b19d31b901e3821414eddd9ab3cca62dab943a1129b3d254315b51a382e9181345ee5c840734917843bfbdff43
-MISC ChangeLog 3811 SHA256 a066d3b3f83668fefa6afd24ec9dd0490545b6b477a104eb507b6db51a29cc54 SHA512 e7958a81c5d93a46d5940ad3639906af5dc7bdbd0fb19329a69a1061b172e414f96805fa2a165daeb995a36b57bb68652062ed42f5438a46739d532c91d81471 WHIRLPOOL 74c7bdae1692580ba78de109a39279ab8bd70b5713318ca6787b7052a77973f2851ab1326fc6c330b4df4890ee4ae79c7b48b5322259fa9d723224a81d41f655
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD linguist-5.4.2.ebuild 665 SHA256 f20b8bd3ed73f2fd126e425090a5beb4a3bfb129dceec36d314e5551e67dba78 SHA512 9f04ee2bcd228917ce4642f714428eb8df17cc6c86e4af62af71a7067ec03e934b3c9e4f3f9bec3cfcb3edebc6e505be50cbe9dc4a70645e2a9448b5262eadd2 WHIRLPOOL 490fd81bdc475ecf7c30bdc4926906de00cd25e9b275c495362317fbe9c81255961ba8a63da6ecd4ffe3340a26ac1a2ba8f7fef17efad6ed888b48d63d2340f9
+MISC ChangeLog 3971 SHA256 d68b3e98ed544415a1a3515f17ce7c2c142e36d2559b654c5b0fa58cd7e33521 SHA512 84efe8f47c24f347c762c764ca59312347a04461499839223e8a6b2f5887d2e79e1c98efc1a4f36b784dff77d560c3a380f5345f6b180aca262b717c22b43638 WHIRLPOOL 429e6c7859d51a1cb8e3f92d6e11c5a212b81211598b3b99f496429ecde58846ce63111e02b9275d694d28009ecbd430724191c9703568c06fe0c3dbd6d189f6
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmQkACgkQkKaRLQcq0GJ+EgCeMVH3cIqzN0ACq9GzjZRuMh91
-kdwAn1VjzmpxS8nBSGJSp/q9kFsiiPwu
-=q7hK
+iQJ8BAEBCABmBQJVgY/lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IkQP/1oAJImXqVIq9saEwY6tCsQs
+pdc+fIsEc9LcIdxgZueWy8Y6mcmKMknFxIY/zqFbIurI9I80teCbeNeLEADEmQHR
+SUuRxPWWotBwlFAJJpV/F72iVA/30RN7c7l5+MzUY/gW/pIEHWmg4fK9DO+/QCVe
+nlHisIs9nUwq/8Yb92q/bEoGxk7BoioDCwFkIKljxxBbEb8k9wbbpDgcEPRVDtun
+NL6F3SN4TAnqIKHrF2uTwbW02157jvaPJbXeJViRvdnQTiio6fmXR/nsJ1GDh4Db
+Jmweq5NF83CyhlffguSp6/gU2KbRJx+24p8i/ySMSpsTNoIIvgNbCjApawMReUED
+tvxFdq6L4qCtRs3oUsKeCderN9TOmp/9O5S8X8ZyZ2QWuhrevWZGTXaLtsp6ZGJ9
+E3/pjzIwmYHxgWTAtla2yQhZflPf0qwwuqM+0js3TySxNW4K6Nbe6Q6J8t7gs8aU
+uNJ4pXeHFAJOww5eYoyEyOCKp3UOxinPyyoqIrE+zgRG5uhwce6LqFtoWIpQlqcu
+G+oOg8Oj6v8lP7/gQA3qtXItkWNE+i9aJ7Qqk0kKoArCFYfaJgyztG56/iLhWDD6
+/wWGuSAYZ0A23cTsbhPKLLeZvBlrMuWipMmT2NNe03jkOPiH0vS9cyjpNOsODBfT
+guya1oz0zC4Gbe8IXr/7
+=y2Qo
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/linguist/linguist-5.4.1.ebuild b/dev-qt/linguist/linguist-5.4.2.ebuild
similarity index 55%
rename from dev-qt/linguist/linguist-5.4.1.ebuild
rename to dev-qt/linguist/linguist-5.4.2.ebuild
index f15598b99cc9..8c2f9a0105c9 100644
--- a/dev-qt/linguist/linguist-5.4.1.ebuild
+++ b/dev-qt/linguist/linguist-5.4.2.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-5.4.1.ebuild,v 1.2 2015/05/16 10:44:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-5.4.2.ebuild,v 1.1 2015/06/17 15:19:00 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Graphical tool for translating Qt applications"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~hppa ~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/designer-${PV}:5[debug=]
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/designer-${PV}:5
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/pixeltool/ChangeLog b/dev-qt/pixeltool/ChangeLog
index ec2df49736eb..de5b3a73df6b 100644
--- a/dev-qt/pixeltool/ChangeLog
+++ b/dev-qt/pixeltool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/pixeltool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.32 2015/05/30 11:04:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.33 2015/06/17 15:19:19 pesa Exp $
+
+*pixeltool-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +pixeltool-5.4.2.ebuild,
+  -pixeltool-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> pixeltool-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index ff6c5c70b7ab..c9d25906a611 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD pixeltool-4.8.5.ebuild 1072 SHA256 4855e8f7e33ad0d2a1f106e64adaf7cface096370ae8bdb0b54c800434e2cc61 SHA512 02c2ae6fa0a8bce609bea34e4dc0b9eb85785d7f440320dcab1548b7f704c4a875d2a798311d2d30792d049bcf22261f37bc8aa81325bc2fe1e5609927dc9dc8 WHIRLPOOL 0ad7a582a40ded0671c3674adbd2e383150b63ab182c631dc948144ac4e23699c54416ad0f168be3e35dc2bb9ef904a9d8e50d3789d236eabfb8535eaa19cd9a
 EBUILD pixeltool-4.8.6-r1.ebuild 1031 SHA256 3fefce3003068edd1434650046b35189bbd7b39fbc1be58362832ba1a8b38271 SHA512 b5a8ed36973a769edd163cb218f52f1816919573fda06e0f6b4d5982dd5cbc32fe08779917a775d6ab2f3699c88c6614873e85bf21b5ff061cd9c67d6e9525ad WHIRLPOOL 88edff5a0c26e1d46b62220042a672fbef88fa28c5097727f3f13817ed81ffc9fc96e037424549658248070f02ab735d9dc7459befeacf8410519ad881202cd8
 EBUILD pixeltool-4.8.7.ebuild 1002 SHA256 b519ded389a5ea37b79c7a21026a4000ca9c54db15069403d4e46d337d693dcc SHA512 7d68b6f8bccdcae4812919344168394279ca721e1be2c7a1fe828019fdec503ef81ad52fbeaa40d0056370c7886a2cf61487a0f9b0cc98a9424bbd9168649798 WHIRLPOOL 4758acd0776297ebddb3e69a705bf9ec9158e456cea5a88b3f31c252b1fef22b90f3fb03c6fae4edc66e988ab43a24f95edf0c6524d64a3820943963ed93ef67
-EBUILD pixeltool-5.4.1.ebuild 630 SHA256 0c0995831a4bfc0566e521fa29b22e90b759d5a6f812304495422fd227de13bc SHA512 216d8b042f6978fe3b200816f9565536bab93de5eed554872bc9812d4bf1c539e2341d7afff17e6b1b7c71578f6b21a6fba430e6310479343494d6816f874f24 WHIRLPOOL 65bc459604bdac141bcc92e99bad65925aa312b2db9dae62238895b95c1f7bfe43482980a752e75233571c6911d81bd7fa0e8bd34fa4ce96c29afd6732594a00
-MISC ChangeLog 3929 SHA256 8aa272fedc065cfe908d936a0667a795bd557e7c7c013b141890fa89fdf25c9e SHA512 55d88b877ed123e2f24db0151993d7dc5447eee20f638d84ac3fc94fb169f489b0d4567c75907a83de8f2c49de5df72c06323d5892e7efd16fbcc608c00219d6 WHIRLPOOL 5a950cfb8d083e0f68f8a662f6667c31a7d97f30e1dc7dfb6db40a64f14e540e04e2ca3831241c935eb3bc7141874c2953dcc3c30a3b57b1c8e4d7ce2876aa00
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD pixeltool-5.4.2.ebuild 576 SHA256 b2d4c6164eec89de1f80b63f054beab6e215c86ce4b5350f6554642fd182f424 SHA512 43ab9b5ce71ea978d4eb228bcc6e17af621d5befe84940a15983412a984f1da908943d8b0b71258d589c8832365f271a8683e525f4ecd10d1e7cbbce01f8c6e2 WHIRLPOOL d199bfe9132a60dade13955108e2e7202f8c17854c3dcc619f89ea53293f4fdeb4a739150546ecd0306a5de437c96101e7ed7b983c8501e25035d1e08026dd83
+MISC ChangeLog 4092 SHA256 492303ad93c4f315d3745e270ae29e1b7365fe86099e98bfbdf1f02af52989da SHA512 c2f24eb73fabda76ef82c3dbd6d4db21d2d263f4a86578301c54c4ab520448efaa65f597b7416a22aa2040bb043aa160ef8c49ba8c5f4b7f187df5cf7888c8e0 WHIRLPOOL 95932c189f174ff08141660709eb180258fe07c1367374135d1450bf0b44ead491a84ea3a4782f86d35e0e966610bb77516556e9491e2246268d8c590546f12f
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmSUACgkQkKaRLQcq0GJevgCgkmRtrVKdKwDzixXr0BYJOggW
-NJgAnRA/x3byUlPjFiNGRwKdU9B3gIkC
-=19BS
+iQJ8BAEBCABmBQJVgY/5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9LNoP/i6qLxiezYI5UbqPGbOIx8d/
+3TFNcKMPOaLzLQz+GS77nTNoHxbvGIC1sI+GPkQk6LN6LIpgL/qBJUzFcNIAIUuH
+Yv3K3AktymQx30NoOtDZUKKPPoHmlKAy7x9rvIppiCwZjSp+rqS6WeAGlzWuUwJL
++4aoPciX03UVdMlHlm58EEAtbBalsVCpLuZhdFroeB+6MpuomIAXgiM4DC2SrRDs
+446ZdGHW0v3W1yQFsNISc/9IuWaD4I1cPPgYHBRc7n0eLrqwZP+b7c2WJEmQyx0s
+FGVpZI8DBL/J2PBibI3wGgnT9o0wfVVCmA6rgOPPzJUil1Mx9v0qEzqzjOxR0Waa
+Xqny4I9UO4tIVJsWEew1KQbfUkfpw9obG9gjFoMgcuIA8MXHOCj45n/nl7gY7g0t
+qtNlE3ZXg/KUmScNuGd8NjIltjCCGkqjATdtnaQLXgQwFXrSriur7dt18/fykFw0
+uWctOMZXgVOThNCp/kxZtr4h4Yuij5tih6AoEZFAEfxmYCYoUf1ibkGGPgOpbaci
+6B63N0Ft/tUuUHzVbk2Oj2lGR/xbKKv4obT/5ehoIRhGhmAL0R102XxCn+FLrv9R
+tsnC8HiImoDb1EUs95EXT+ZAqlrp2dESd6UKtV23XcopdtReX3+ZrKddIa7JiI5y
+w1alP4Lj4snCMBOwhPR7
+=8sKp
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/pixeltool/pixeltool-5.4.1.ebuild b/dev-qt/pixeltool/pixeltool-5.4.2.ebuild
similarity index 60%
rename from dev-qt/pixeltool/pixeltool-5.4.1.ebuild
rename to dev-qt/pixeltool/pixeltool-5.4.2.ebuild
index 58026b4e1603..eab8413788c4 100644
--- a/dev-qt/pixeltool/pixeltool-5.4.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.1.ebuild,v 1.3 2015/05/16 10:45:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.2.ebuild,v 1.1 2015/06/17 15:19:19 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Qt screen magnifier"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbus/ChangeLog b/dev-qt/qdbus/ChangeLog
index 2d922a54e1c1..32f49da8a131 100644
--- a/dev-qt/qdbus/ChangeLog
+++ b/dev-qt/qdbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.12 2015/05/16 10:46:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.13 2015/06/17 15:19:27 pesa Exp $
+
+*qdbus-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdbus-5.4.2.ebuild,
+  -qdbus-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qdbus-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 2d9653aff60e..c39a1ad1c277 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qdbus-5.4.1.ebuild 619 SHA256 aff504a08f8af37310cff87a1fb810d13c6a942ca3c9afde7cd9f7c4bffd9661 SHA512 8c8881269980ab60211e81d434dacdb2fa7e74f04345b59bf938ae13f5d2c8a0dedca4854705ff77a79305ce6f49a03181fe5a7b2597af5fa0124152a86bc755 WHIRLPOOL ff93ef8ddc0472a88fd5d280dee75f2cec117714aeb9c60a72fd563ffaaea10fb83b3030fbc2e2459d31f5d3edb11622191fb2c82fc69f82e6ea81c24b85cb72
-MISC ChangeLog 1319 SHA256 c73713484c2f373d5733b3dc7dbae220554fdf7265f162c016f7d1d54278348d SHA512 d263c780fed2b40248a66f411f7020613128a187aa6ef4c3aecf7edadcb409db57dc9682233fe58f9f9fc17c5b27b18c251f5d4ce27b5659f5c8c6fdf7cb2556 WHIRLPOOL c3570bb70b24cc5619a36ff39a8a2a32c7469d6bd6740dfa83fbd8294f0a53eff6f5daa212e0e40d20a177a9179dcd6b68f4e3695a5f742a80f1d9bc996aaa36
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qdbus-5.4.2.ebuild 573 SHA256 ac60b1882a3ce870440bb72097e4a2777a870696799235ce31e1ac4af385cdee SHA512 e85d0c4cb8da173834289eacc2ac360ef56f0935addeb9db8b5d4e2fb1c73a956668a6611b9e7a3af5732dd1c40449a2975ff54b92b96a2933d4ee51e9be908e WHIRLPOOL f132a005fc3d5394bc3ce7fd8e941876617b91ef739f771416b887afeb27c41bd5bcb34dd028c1aae588fb0f3946a627e052465bcd68dc9547b55668fedcf646
+MISC ChangeLog 1473 SHA256 78ab5c009ad7adf3c6824de9100e928f675c7cce10493df844591159cbda9cf7 SHA512 855d8e756ab0fd601baf13005085a254d22a78363fd20c5816b61baedcd09bbc1f71c82fd3c4902c6c581d2e27f0b433896539817c6c660570cd1fc62ccff74d WHIRLPOOL a0f1f50e229b7aac9d573ec36f886f50c8b2a1a225fa9ede894642b9e73c6fb322557035796278663e1a2101deb8ecdf94ed878139a6233e4ed88c93d8b0257a
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIAgACgkQVWmRsqeSphM3vACbBxb7EIojm/OlKTxeJ/qQlK6H
-8z8An1ubgBp4BSsVojDAMbZ49gf0/MH0
-=kcCV
+iQJ8BAEBCABmBQJVgZAAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9fgQP/RZja50S0JQgLukRQRZslrFf
+6HkuVeIYFUzM/SsSdfc0RAvwfj1DSbKZWEZOaxmBBcq2/nAykOS3NNF3QMYyQscA
+oIbDSlhxWKqMLfLkbo8w3K2CM824NLdSqIHPhWbcx1SbY0BdhpoMqDBIE1RDatNf
+JVu2l4P6Wz6FpvhVJmdvahld22W8RekMny/z/fOn5nR75Fg+7r+rvN6KRldXHXBv
+0E70tItjI2D5iHDRC0M5vnkCO3Tgm5P2uhVGdjGJU7R1V7ptUWvYzoMTwrOWJuql
+aScL2AWc91manHQFCDwEQHz23y2/snpjq7qVaKMK+/PrpXHnTfiDZX3XCWnyC1HU
+qGLDFd4q9O3wpFkELYn1oe7ceUwR3YFEcScW15+vnqPAkqN2nfMdrVIdQEIMFr4+
+aKiHaxjPK1L+nmVZjrw/uB3NnEfwBSGznB4JQSP4a9HirPVaEDm5H85uKkUvAbID
+ZWuFgvtNW+V6JeVNE7cI+tHIdwveQ5PtnN2cApcLa22+qYe5PCW9kSvvayic0ijM
+fvQiwPJJN2lvd1YRIdzGQwSfMnBLPnlgASXkawLQBPIm1vjscMpesMb0RuiZE9PD
+hEhYeTNkSi5i+cGI8oRrBXxcG4cCSk5MSAKvASaVssQTr63VjyrkMMmUVmMC9AxL
+snj/5XVa487NjKYZqGxe
+=rd/6
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qdbus/metadata.xml
+++ b/dev-qt/qdbus/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdbus/qdbus-5.4.1.ebuild b/dev-qt/qdbus/qdbus-5.4.2.ebuild
similarity index 56%
rename from dev-qt/qdbus/qdbus-5.4.1.ebuild
rename to dev-qt/qdbus/qdbus-5.4.2.ebuild
index 0b0345e38c5d..b88b39d4403f 100644
--- a/dev-qt/qdbus/qdbus-5.4.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.1.ebuild,v 1.3 2015/05/16 10:46:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.2.ebuild,v 1.1 2015/06/17 15:19:27 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdbus-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbusviewer/ChangeLog b/dev-qt/qdbusviewer/ChangeLog
index c85522830d4f..e1e3037f813f 100644
--- a/dev-qt/qdbusviewer/ChangeLog
+++ b/dev-qt/qdbusviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdbusviewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.31 2015/05/30 11:04:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.32 2015/06/17 15:19:39 pesa Exp $
+
+*qdbusviewer-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdbusviewer-5.4.2.ebuild,
+  -qdbusviewer-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qdbusviewer-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 8f0399437fe1..9a9afc188f6a 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD qdbusviewer-4.8.5.ebuild 1402 SHA256 4e05fa791850b270b4f497912e99475f51a042c0a203ad4e31ba77008e2a4abb SHA512 48b57fe7d146cf091cc990f82768da744b6bdb4064796b6075fd3ef9753efa8f157161ebb00cb9b5841c3ef00dceae665223945fcb9185050833f3b6c2ed38ed WHIRLPOOL 85a101a1392214be9f1d93a138812d826795bb8c81ec2ed320894b664b1b89f51ec543157c30e6faf492e3d1af13610b7e8bc7a5b3618dd234b640145ef04892
 EBUILD qdbusviewer-4.8.6-r1.ebuild 1427 SHA256 3be5bfad900f50dcecba349775e7a75cad4df3235dd6a374fe0ae2b35fb287fb SHA512 402bd3fa9128cfc0234189e30cd0b1e4c59fb5f868c7a566ea8f99399781404337599f3e4694d5afb6d64f92a20779e9f802e45e36ab9f8acff00ece018821ff WHIRLPOOL 19cfec150bcf7b11f1a6824be0250bc24af2a343f4f6a2e2e6cd4e3cd36e946a43155d4be465eb2ce14c6b5c2992c85a3b8f393982c6fc1c843292e5a2594269
 EBUILD qdbusviewer-4.8.7.ebuild 1394 SHA256 7962209f9a086125d4050c357ca4672c07a777663bee43140fdc7df415e5fcae SHA512 9ecc5f7645fa180005e3ecdbf535f3767c52c6e719ac9f5e9feb5bbef8e7d883adf6b3b73f741194589866168a036b764874afac80053a5d36b3599cd3ffa23e WHIRLPOOL 2da1dc063e9a7a2bf483e1e482dbdb1935ccda8624954f7c92a5f4789db83aec45c7665c3c7c0acf06c659bcfe6afa033a124be927f6799e7c2e81dab3dde1b8
-EBUILD qdbusviewer-5.4.1.ebuild 718 SHA256 556b1c5ad402b782661834c699d8a107feae9d55b0b2659bc4eae0744c39692a SHA512 3bb61621d9db1651157938aa1d2e5a58debfea5d79610bd0d431babe99943f979f3cc1e6fe5069e3313c7928f6e4fcf7023bbc50077fba05611a0fbfd9f48680 WHIRLPOOL 5ef3f2cfec5976184cca7b38b6cf1d59693dd3d1fa11f72e548bfcf4fdde92decb55cedb9f0271339f63a23f654ebd8c43cd35b587fad4fdd703871d0b6c7aa7
-MISC ChangeLog 3918 SHA256 b93b885f969c4a6b621165e9c3933bc348a27b3781c59988aedece9219b510e1 SHA512 add9a59dfc565faca7faea7c7ba8819670b7bce446bc1e9b9b3eb166d4c78c3a7388f9c779dfda7c1e1e30e149382db288e272768cee26396c0e2aeadac37a68 WHIRLPOOL 9bb82fb816adc17718b00d55f952551f75bd081b05ec1638beaa30575ab9c6aa83cde4626e78bcd6be586643c82a9b5e8b02e614db56e767ae2a5ad41a3dbe1c
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qdbusviewer-5.4.2.ebuild 656 SHA256 79eda5dd9ec9cb09eb2aeaaedccc4eb58755fc89a026ed08ca52d053acad718a SHA512 6462deed1357347ee0d0de3ea2cea682ce4bcb4d8b47970dff4b41ba5d0caae108fb810326ff54ef61927d35ab94f7291967fc6a381a66a24210ac37a9e1de82 WHIRLPOOL 2c7db1da01c78370c66571a0c4c57087493db9be3736e1e63d98a893d530cae49f27311956e17bb7756702cfc07cbbf938a23c87cf8fde872c10f0fa878f7d85
+MISC ChangeLog 4087 SHA256 864e5990a9ee74c9b0ae7b262641db573c9d85c159822fe2cfbb667d69daad77 SHA512 71a334ddb0f67245418ee20947aeb2d41321ba744c3371e77f88e1c182f0e06b342bbc8674ceac9fb83e160b26fdeb5a77c5175da2eea11f82355e4bcc310398 WHIRLPOOL 9f11f0b85396196f16f43ccd39a337b217d58527399b41998d88f0c53a976dd2e2c21febe4bed484920186dfe02f725cbe4c4418f6229e51143d977bb1b75cbc
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmUIACgkQkKaRLQcq0GIEaACfeMB5iOeHPaRXjvrZ+w6CjujE
-Em0An0JBwZF0e6ZqzFpTVeNIdUufGFGp
-=CYEO
+iQJ7BAEBCABmBQJVgZAMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9htMP8gJagHaSQ4QmtqStd37Samq5
+GXBJW9yFQWElqfk6SDBM4fKyeajMxGJp+W3enyPDyLEDwmEqcr/Tk1+1Eacickxm
+X6UY8MBWPVcmB3GlyPWhvuR856gomlMhKrvA405cdx1xCTNPEJ4ZqrkbKZvBxoIk
+qNYRj+uIN0BeiXRJEbNz2HuaWn17RlSl6MJ9fe1HNYdaDVhl41cKJiEkzFJ6tEob
+tmNUkP117queciJ2LsR2J1YgMxq1WsuUATIYHDolWpnLLCHp6lu0I7NE8SeIMv0X
+R9IlRJVVdHZfCvYjxBCC8e5YdNoVKDXCZ3FZeUyPfbelraUE81VjxbnokeGVtAwo
+mlzXM0/1AZ7phfqrOjfPuAj+IAbvSYNnRwTCAasQeTqiQijwkl7DcHh2QkUhoq50
+gJlARl33Vp3RUW4/OJx3gcZi5SX5+BjTSPGNWCAfJHeztJEgxdHF+32prBmKTAF0
+wqCCJKxRKQxhyjYsPiMHXG6hi7f1OefUPGjaTJmudnyjBTj+JKYbtEEo58wCI6oA
+eY4T11TmKsgAJzcJHaad7Onje/u7fFvRodxiUsfxhApUm4SWSJxhE23FsxQ3WF3a
+yZK7B1pdrpi5jaU5Yb0D3BEgM6VXiwkRD+aUrmTV4XoIzdRlfV/DwcRRzZ4pgbQ3
+Lorm6ysficGX+8Jtd9Y=
+=vZDN
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
similarity index 60%
rename from dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild
rename to dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
index 626036bc995d..cd073a26fd35 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild,v 1.3 2015/05/16 10:47:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild,v 1.1 2015/06/17 15:19:39 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdbus-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdoc/ChangeLog b/dev-qt/qdoc/ChangeLog
index 656ea8daa60f..b7d664fb4f69 100644
--- a/dev-qt/qdoc/ChangeLog
+++ b/dev-qt/qdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdoc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.10 2015/05/16 10:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.11 2015/06/17 15:19:46 pesa Exp $
+
+*qdoc-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdoc-5.4.2.ebuild,
+  -qdoc-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qdoc-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index cdd183dc825d..b34d21a79374 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qdoc-5.4.1.ebuild 549 SHA256 1849e11c830439dc75ed21d8dd00935b5b20542c1f26473a7e3eb83e6521288a SHA512 4efbd7ea0ced9fc92431e370e266caafd1f96125d1b2d1d0f41ab5ed8683893c9d4762bf6b45a825b6f3b304749c124d912a3ac680734031432a2f9c9b7c2ab4 WHIRLPOOL 3a33d9f64ce44e7fddcedf3e0a4343fc0c1363ceb9a25b7b9d3c4fb956232c5dcd508e3f7826e7cb59d64830bb5c4db7a0cd74dba49264b0607b3911db91bb5c
-MISC ChangeLog 1302 SHA256 94200e78ca45b478fb5437fbd014eca18557e386fc5f7be1b5d1535e3ae3ebcb SHA512 012ec840af6bcb91e876adca758354b6c7c273fa2293c7e7e0026bf694c488c3defd0cad0f5d8b0a66509e798fdbb7cae1eaeb347568c1c71879dbcaac1f228f WHIRLPOOL 96c6bbd64e9c01be2dba722e469f5a93c1a3515321434c1182b0ef50a67b7dca22a712aaa3a82bc258a525be18995b87669a2bb25869dca733f416553b4fbfb1
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qdoc-5.4.2.ebuild 511 SHA256 d33ac93c11ef3b1bf6fd48ef43089d787aebb15f30e1245efd6d3ce830d46287 SHA512 5f48a1c8b6ef140da8b1880b04bcad5d80c932a494b15bbe7c306dfc432d3839b06ca9acefcdf081b4dda5cb3cef6b2a83e6a87f25c563a2db750821fa401628 WHIRLPOOL 796f74ef69b3a4eeb508880f2e1d5fe1641be8b6e5eff446ceef2537754fcc5030eb4c791831790e693b2d570c8d616681ff696ba534c8af908afb465e11d7ff
+MISC ChangeLog 1453 SHA256 8f27e4d9ebd2e7afce4fb50565a52e1cc3be3d3db8e4db24015065049e260c03 SHA512 614e2dd80ed96d61921df4540a6365783274c7f1e26f532075b628adc256c01e788debb7fe294756a45f33b100b1c1a7362f92c9ef31954fc2ee70620d26f112 WHIRLPOOL 378699f2ee17ed63828ff6bd48866faa3c10aad7692347021f6675d10be28f6184beb78d271400f2f66263756e5c992072372805841846a40bc5c5a6766b6ae1
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIGMACgkQVWmRsqeSphMGeACfRLN3nSEPpOaa76Dzt24VNyMa
-FBMAn0HsdyozgKeUB60aJPEcDoWx6U6k
-=T61X
+iQJ8BAEBCABmBQJVgZATXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9XXAP/i0JdkGmzk2b3YFGywyt5RBM
+qAj5LyQ4c0fxv+UQwNh/fGv5Js78i+emZS6aijRGzApwByxSEYRgjteRodMqn28E
+wmeIQoSWBzPWyVBgyloQt3bS8/Y0r9Th6b7+357xCMs33etgVX+Xf20WySsor9gi
+aLLnb6h5FNBtckcODb2lEQKqqKKp+7XogZrEmVoUdrtjmQU3eqh6YCIHQXisB/Ak
+6yCvxJCTL5qlvD4XuN4LR282eKTc253W8m6pgMnJ+iccObvP7FCXarBcLr9AktGB
+HO1pHO0fFNX8Wry2sBfmUKLwXkTc9ywUtUjmxxGNkr5InF1PCDR+h0v/03GiSZVf
+BhrVCQScjcYAKTc9x7mSNNhvNgzeonHku7kpbqpRcI055m4bMLKYTAOZo6LCkGG9
+6zcExPxqR+cp5b4f+dCYKMHSQMLAfNg8yqsXBCjYljXrVEyT5OI6OZLeFbTsKijc
+GA6iV6zJowEL3N7cAGhfc7mrb6ZbqRpa5XV7b2J1WAFwLpXLHdhjkYYqhOLuGcSf
+0dxZHUIkCX/NZi9h943Y87oPlIMo/qm4IzOIP/n4ipwRmhqgPj3kNC5kgfrhsdUq
+079lt7kza0gjpZJws5kfzj784A17SgsGYcEclzCelnhylgrptB9lBUeWVpaY+Ret
+4kF9u3f5vihtS7qnnL4Z
+=e8mK
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qdoc/metadata.xml
+++ b/dev-qt/qdoc/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdoc/qdoc-5.4.1.ebuild b/dev-qt/qdoc/qdoc-5.4.2.ebuild
similarity index 58%
rename from dev-qt/qdoc/qdoc-5.4.1.ebuild
rename to dev-qt/qdoc/qdoc-5.4.2.ebuild
index 9043465ba69e..811b632083c5 100644
--- a/dev-qt/qdoc/qdoc-5.4.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.4.2.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.1.ebuild,v 1.3 2015/05/16 10:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.2.ebuild,v 1.1 2015/06/17 15:19:46 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Qt documentation generator"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtxml-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qt-docs/ChangeLog b/dev-qt/qt-docs/ChangeLog
index b96580fed72c..3460ba4299af 100644
--- a/dev-qt/qt-docs/ChangeLog
+++ b/dev-qt/qt-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qt-docs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/ChangeLog,v 1.3 2015/04/01 20:44:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/ChangeLog,v 1.4 2015/06/17 13:46:28 pesa Exp $
+
+*qt-docs-5.4.2_p0 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qt-docs-5.4.2_p0.ebuild,
+  -qt-docs-5.4.1_p0.ebuild, metadata.xml:
+  Version bump.
 
 *qt-docs-5.4.1_p0 (01 Apr 2015)
 
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 4a604e05d734..0740af3406d1 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST 5.4.1-0qt5_docs.7z 78331600 SHA256 3e98d788e03e9aacfdbcb8c458928a537208b4525c253dce04cc9b8d8116b7bd SHA512 23c2fed256d5f4eace52411f2582ed689bef063ca6dff0d928917dd62c9dcece3bd2409e005dd0cffc51c5f81d837f3875498caf928b0c6f91143f645687eb30 WHIRLPOOL 415a53f87eeeeb3dc9a9705363d98aa3f9ba454d9a339048df302b6aacddab2ac5ca2f2247a474b91652e92049c175e3d6ab2e8e7c0901d958619306f1cd11fc
-EBUILD qt-docs-5.4.1_p0.ebuild 928 SHA256 6e93bdb40e8bafa83711df57320c230252f0a9516da60c691a6ddbca695685b9 SHA512 6e1acd5af07b38aa47aa8d713c5784930856da0e24f4d76b30d767bc0e4182b7221d417b72a24ec355d0d37a5e394d37906d50359af0471fe23fda958f297c81 WHIRLPOOL 9572c14fda4c2c46a81f334ce529549faaa229a02dbc672f258aba7881e8f387270bba4357c3451b5836cae10f4ba39cfbcfdae30d1b973120e10f2f0ec10a8b
-MISC ChangeLog 700 SHA256 d39664d5cb9da99ed2694614057f5454133e52acf512031dacb7ac7ee0431587 SHA512 33c085cff74f2de7e5c95ee8ad67814ce843089f47712930aaecf9e33f9709efe5dd9eb1a90c0f251d45c8a3987c4cc40ae542ebbb2bee22adecfb0c1753968c WHIRLPOOL 036bc5ee3c130414a8787f04e36177a61d14573f0f1059922a1773f43872174edf7f66e5a5212da149e2f51097306170cb808d7b301d1ce9e7dd8e9e84a2a781
-MISC metadata.xml 275 SHA256 27953caf318944ca21fac56f700bfc73fa85c88662528326ef008734734b4f5f SHA512 edcffb8d5f026245ae5aa8f59da26aa117de5d909bd4861b7e3fc5806a42f17b33491416f6d17663b347a161e737195f3a22e1ab7eca45a6403a95cd7ce7cb7a WHIRLPOOL 51ec5d0f5b4e4ac856a9e8b2076df202ede24095020e7f2d6c34f4e7c99fe85e6e4876508f51d3fde17b7109d048fb5432bae80155303efac864b9edf2c6403d
+DIST 5.4.2-0qt5_docs.7z 78495429 SHA256 c2ac1a18467a0fbb1d2504d78085e6c0d4901442d79895894fcc078fb310c719 SHA512 9e13b1f3e7daa38e91695d193bc67c3ddcc2d0d86febd6c53b4045bebbae7e97171c30990ba702440597861fdcfe780a177918fa334f190970dc933985cb55ff WHIRLPOOL 531521c00af6be74d2b1c4ad782f43cdae8fe8dfe67863582e8672342bd2df653f682fe5aeeb4782c302cf4074d4abe5d1a4356a07899725b062790d58bb1d46
+EBUILD qt-docs-5.4.2_p0.ebuild 922 SHA256 4c1af6024d7d5cdf31e20af876ac13a76a48446a06b237e113dd5b3494c20d0a SHA512 138c1c89ceb9cbc17ba4fa7b88948ded74eb7fa9c22cdf19aadc3a2ff618b58292fb275b6e7a6a12f35cb792f66fa6d9d5d951563834cc92c0ae693febe575f0 WHIRLPOOL ae535b54e13f73ad7425a0cd005aa2f6c7333c5596134aa7785d8a152277f214c2c0a68127a566a2ca6a485bcb5ead476e57cde5528a7c09aa3bbbc108006a29
+MISC ChangeLog 868 SHA256 787db6d7b2542221e3d22e65a5ee765b4de23f24cfdfff342020ff9651e6d697 SHA512 69059a389b9b231b407895da5827abce1560697c9ce552a6abf51ebaf4fbed3cbceb5170fd33a02e1616102888ecfc1c766034d388bcd8b6af1390144cfaaa7c WHIRLPOOL fefa4c7f0721fa68c7a15d2e4a355273d37e1c531f43679610eb6305f50af77837a6e656782436a7f688fbf5bf575f518e66fd49aac15ee35a410fb98b0dfb82
+MISC metadata.xml 266 SHA256 eb09b848ba59f9c3a3b7165d649e7b222a29461d11ec81677b7fc32cabeb79b3 SHA512 1e12087c3700f25865b7a4de219bf27125b1bc36a184a0ca40d95dfeb40b40e4d356ae2d8fac91a7bea081443fc76c00f5bc42ee53ab7d8e7ae610639439fd53 WHIRLPOOL 0a2e261463eaf39c68f4883c9a99129ddac0e9d3e322ad740a2d68319f3c37718157d73d00bdabc03ffb542f26492e7c4ef6f9ab8440900cd2d3abc16e41cd4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVHFjIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVgXo1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9wf8P/3JuNehsC0k2mgjxqYFgxbhT
-KloVg7G1TJpYk/BqVUg3AvtLoEXytNxrTb376hP8O6O+WgRVOA5J50ezgvq8udZK
-u2P4miCkiuhR8LUshs/vC2sfXRDvRD+ysI3+Q4nIy7nrFmE6O0xXpJXeHxMCmKN3
-LeGYJqVEK8t+Zo0Qla0XLK/eg5EzzQI8ydB8O8YcRhd5SumTHRnJPAjJA9KeHyb6
-hpVi2B0obB+QpxYgLWSzrDt4vnmD+i29XHxD/EMyUo3IZv0o7k0u0tpkzgr8ksi3
-DIFsjMvN3U5xJch7vxQ/HDA8Jqsm56ObREsESMO8u6qaFpjieddQv9fWZGZ2+AmF
-Euc4QwK6yArR3gIb1+w8rL8TliqMvC+tBUb5orUVxkWuD7MnPpayEyevPRZl1+px
-s8XTP9i+hlMU98g5sDosg3LixM5H6K/GNM91pL8KIbG12n0Fnzs1m0FX9eefzKmf
-8up0uxb0HBMvlcWF0aVpPpdTzKs38xQPa3agjy21Cdn6jTFHq+cYIRgj8WvmrQKs
-oKnxtpY321s9mpMEpIf9l16JQSXVsiw/Fr7Yd5kiAONuuga/TYPAUskOqQSLJ6cJ
-i99DFJ9T4OAxKkY9pC6uykS4OdSVqd1tZ5QzCZcY49D0ZUb42NomOSg3hcVUCo4Z
-ybJDsTlneHi54o5RFMwr
-=mr7o
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9mxkP/0YC37e/1UpnUT672rsnxiiK
+NVwwVvBDun2MOVnNqucRihCQrv/Y5Pf91BaLQXGx+MGx0worx1jMo2RgqJBvIhjZ
+lnjVN4Fes3+yGglQ+euJzklYSqUVJJaCWzupYCdOlW9RV9FnHFRS9mNzy9Ejdwf4
+nZ1nsxuQ178SisoOkoeRqGBciu/U0JTnR922LyVBE8Pg6CUIRdiPw/bOph+pehj8
+x3ve6yP+o9gK7FvvzJNcL4gf+1xbheYRYkFndPQMZsFZylj7rACnm4+YrIaEtfYk
+PjXoYmUUcGVHuCiHw2BKb1u9cdm6Wrw2RcdFv/UVH8nE5k0DseE5KzQUWECZcB6S
+AThSqWMLctrXHyitKBl8kbH3SINKIP84MvEXbUb85q727S9dkhvbmJGZFmtGDsvZ
+3XzFamAOr4N7OT1GYnlaUOy5HIV0hvB/kYrtK0D4VBbvw/t5UUHZWi1o2F7OM56R
+Xj3IBtFnamFr79f6d9lszs2narqahTX02+j/kWzrjC7tHvfu5XeATA3QPoShMt3d
+15aQ7UHE7cWq8TMNuZy9LvIZnwSRlxTi/HdHrfvF0Q+35xGPUiDF7fzgmTUIrSCj
+PPi6hTNHacMwoW/+BOQ8Heot5XXvkWyWxy6EOccYLJ6lsI/dEGkxGAlj9H1wNyyf
+Yt1kLVlooSuppiunjeKA
+=BhpL
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 9c2c6d1c1ea4..b41982b9d583 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -4,6 +4,6 @@
   <herd>qt</herd>
   <upstream>
     <bugs-to>https://bugreports.qt.io/</bugs-to>
-    <doc>http://qt-project.org/doc/</doc>
+    <doc>http://doc.qt.io/</doc>
   </upstream>
 </pkgmetadata>
diff --git a/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.4.2_p0.ebuild
similarity index 82%
rename from dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild
rename to dev-qt/qt-docs/qt-docs-5.4.2_p0.ebuild
index 8ee5e1b5a7a3..b2453c23c655 100644
--- a/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.4.2_p0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild,v 1.1 2015/04/01 20:44:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-docs/qt-docs-5.4.2_p0.ebuild,v 1.1 2015/06/17 13:46:28 pesa Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ src_install() {
 	# remove global docs that conflict with qtcore
 	rm -rf global
 
-	# using ${PV} instead of ${PF} is intentional
+	# ${PV} instead of ${PF} is intentional
 	local dest=/usr/share/doc/qt-${PV%%_p*}
 	insinto "${dest}"
 	doins -r *
diff --git a/dev-qt/qt3support/ChangeLog b/dev-qt/qt3support/ChangeLog
index 850f05f76c53..b26f6b045b32 100644
--- a/dev-qt/qt3support/ChangeLog
+++ b/dev-qt/qt3support/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qt3support
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.22 2015/05/30 10:51:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.23 2015/06/17 15:52:15 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Update upstream metadata.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qt3support-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
index 92d6c4d56349..b571274cf17a 100644
--- a/dev-qt/qt3support/Manifest
+++ b/dev-qt/qt3support/Manifest
@@ -7,12 +7,24 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 EBUILD qt3support-4.8.5.ebuild 1022 SHA256 96eeb78bf2846064d1eb4eddd95f4a6e44a354afb4704cf6d10071392c0a24f8 SHA512 76cb57ce2852584495a0aefd19b18d3d84dde4a940568b79e9a007b431e43b0da317a448bba202d09c3575fdf90c7ff285e356a45b0468584662eb85eeb2bb0a WHIRLPOOL 96d9f05fada0140d5fb55d39fd5e00d6e0a5d27d9893af625b0268e8b02893d76f566498371868111a8d2f306a9b2b86ff356bdd1bfc6c243f5f65e9e40141cc
 EBUILD qt3support-4.8.6-r1.ebuild 1037 SHA256 b57f3e6494933e352ae8b15c538bab69ffa83162bc2111888bb40dda2ae5f695 SHA512 4f33a29e19a9a66e955b8d60e17b914159c3d4dab9aa63401a63181efb32e6428a2a9316b650225ade0c6d21805f0ef5c851dd27155d4ca5f0bfce195f171bd5 WHIRLPOOL de6b6323e0972e6f401c6c7eb9d63e6160ed431a3034e0ceac44083aea8ba143ea1b9e0eed356e268b869c5cceb8ed0e1f0b3dbde9997660de0e1b3c5f7d7f10
 EBUILD qt3support-4.8.7.ebuild 1004 SHA256 6fee2d9b455c3aceae568c7f36d3e39eb5aee6c7b5f72977a83c5809081ed5de SHA512 053e6bc2e787a479ad3f23a86361fd3485e8fa042a2d33c1fbc15b48bca60026a1ef7c800cf518618be9d85ab1c4e29e48d9fff4e373166609f9f9b2dcda0d80 WHIRLPOOL 4e7f3bc59e6b774f7397bd97c06fae6a013c6ac8f11c3f16f45eefc6dccb46dd962ae4aaf28c0b8efb61f7a88983969659833098814584f38c74ddff6d025589
-MISC ChangeLog 20486 SHA256 6ab534e92410a150b67ff8c15a6c674cbac54ff2c343819867d12fed7f2bc8b0 SHA512 c73cd308ae56a8223c4bf3b4b798b6e1a333823b8d5d249e33d480e147290a33c6780dd5a017c6dd26ac46356b70626a7fd7715e892a75606cca347cc5abf3ea WHIRLPOOL 056397a13d556c1ac9e60453660288168da45bbf89ef05d9c2f0878a7ec0b6f4864e7bbb82ecd06943bf7d61f7ad0f4b0c79b5574a16a37925277440202124b8
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+MISC ChangeLog 20577 SHA256 922940ba776fc91d7c90a2b8a467fe24194bf9d12cfb6889c813981e7c84699d SHA512 05fe9268cf08d9e52a864d1b8c9f2e5ffe558d775e74ee99bc0b0725ea087271f7520fd2c2d7a781f639a8c5ceee40a2df586d8fac2b1c239af85ad485be9bb7 WHIRLPOOL b5753c455cc3cddc9928c4e338d7126afbebe12068260f348782728be54f9286023ba730b988c552d279eb798ca26e0f7ff17ae9e164c6fae2f40b15297c1140
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpliYACgkQkKaRLQcq0GKngwCfclBU53ynHpUZNp7+RiZbHTJ1
-7MsAn3ovgi8QQb6K799iXKl9y0uofq03
-=c16n
+iQJ8BAEBCABmBQJVgZewXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9+AAQAIdwsG2LSq4DUp0JgwK/bQ2a
+CnFysH23N4190lk7+A1g9wTCKQxNjRdrY/6c3YfK+nrQlrN/S5PD/XtGD66Vb4OX
+sLv6UfKpG7RKjtEdg4r6SpqULEQ1dxjwEL0DPNFJFUgtQNMTG/75mD90FSCEZGiT
+e5kGi+vtFR5RVQyHI2CCFLpMslouN6WnTiW/EzM6zeblyn7uYycF+TmrH9bq/KpD
+bMD5pDveYj5UVtn5VydCGRZIVvi7HGDhF76BaPL0Rhhak/q2zRKHd5XPsMAPTBAK
+EubaR7rkz/SAMtBu4N3TrtYKLez1oaFN+vMKIxgQICesyC/JqRnbQVOt92NuAeMM
+Vsl3DQJJvVJJ+CCTe1BbnT2IJvSGAV4atB2pX9YD+2Oh2LG086Nwwin5/WjARXMl
+cd3n0qgLjyIQ871EuCQI1rA+wp99anNtZ+xj0Hstxlbn5kgVyJOND3QvDjbLU/2F
+FBdMOi+RW4vSOw7jmfkFykcDTq1y6BNYH9mKdyp/Ys4hqLhOx2rRso2bRXbWn4sx
+/9/XnP3+/xvyDM0C9IJ9iMKwmqZwkqK12tiCpTf2wR1Qlcm/zixkF7YLzBvIdiJW
+Zsp+UNcA6ZR0O6XKV2r9b9UqCXj6PNzKb2P6c+NPPTyoygglWT3lCvGnl6COTJRV
+ydt3PF+k453BUYy41QNq
+=MkJV
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qt3support/metadata.xml
+++ b/dev-qt/qt3support/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtbearer/ChangeLog b/dev-qt/qtbearer/ChangeLog
index 6b15f40f02f0..5aeb78d4e5d3 100644
--- a/dev-qt/qtbearer/ChangeLog
+++ b/dev-qt/qtbearer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtbearer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.24 2015/05/30 11:05:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.25 2015/06/17 15:52:38 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Update upstream metadata.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtbearer-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
index 63dc0eee979b..78f9353537f8 100644
--- a/dev-qt/qtbearer/Manifest
+++ b/dev-qt/qtbearer/Manifest
@@ -7,12 +7,24 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 EBUILD qtbearer-4.8.5.ebuild 1684 SHA256 e5cc6d865f80c64fb2046f86ce69d6c0a5815708c7288e1b776508e65699eb5c SHA512 f284f3fd478312fcf59c71f744aefcfb44e07f9bd130ce4ba536a86b5ca1363f764073ef14258471e9fd2c9391f13ea986a73f23253996f4075cd5771b793eab WHIRLPOOL e7bdda38b7c0ec3ff5a6d4e583d821f2c410dea7cad3f888aab32378d1820e53974d3b3b5bc43b901e5dffbe25b58c809e9a39d258ccb3fbcbc44501b14fdfca
 EBUILD qtbearer-4.8.6-r1.ebuild 1599 SHA256 cf849c669f69d445154c13992e2ab3aa1ae930c10dde66c4d970b623b850d7df SHA512 9d18726452a922966f725c59c4a81235f659177725d729b52b6e355c056b1bc24201e5797ab552aabf5235d39e8f05be3ab05c1f853533e7bb0a92b74d9669d5 WHIRLPOOL 0870706e92cfcdc85e097d8464d79f7b9954941b42c523711e9768d3efa7a31bfe465b46fe50e2b42e4e80ab67beda039919a0d6cec0ab74bcf8f56a227d82c8
 EBUILD qtbearer-4.8.7.ebuild 1566 SHA256 03845bab4e42483e55d42f6cd514af66d8fb323f9d4968fdaa3eee04947ed7bf SHA512 64b0d6efc117bd555b3fc5f04801123e2c62ef4e6e1eb5e488f87a8ddbffce23ba8b0269a7049cc3cdc8f2e9041517d3d87f7220eb548149718e9985dba9a83d WHIRLPOOL 5e03184f6de2a57e28b88189ed8ea835677ee65c63a280051d372fabc1d95dae42ea4331bc1a9961e50d13779bac0c45a3bfa640db6b10f1a79a0ed30d05adbd
-MISC ChangeLog 6004 SHA256 bd8fa443b781e113cd4b5617e762f2a534d49c7bd6da4e8ebe037e504e4dbb6c SHA512 845a599d2a7b86487ca355f77d61869503a9238230598a0ed375ae5e2a11c536750e087e7af08155d6318ec76a3081d0a86aceb1c7262aba054a5c22d31e9468 WHIRLPOOL 07d662643047cf7dd61275b31825d859565caacc4b5547958148f13a25ee6d99101d9be1cb197defd6d184642fe5e7dcec2eadb93e583a900442ef6323872271
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+MISC ChangeLog 6095 SHA256 aea54803d5ed95982d9c74c844ed815b2b45fbc36813ae6470c2501d0f6145bf SHA512 8f5a3b96cd99a43e1eebad95d631906f9ecc86c9a60fb8e44e4c6b392e09880499d0ba377b62d8b951d2ffb518b471a88d0f025e1627ef5ec7c8a529310669c5 WHIRLPOOL b231fd1171226f023f437e4b44c7971f5b9492d80a0d0018589fd5a3df8b06835589ff09bb91e78b078adba041824866ea8c57184d46ab049619790ee9ad0957
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmWIACgkQkKaRLQcq0GL/pgCgiwvfnRGm1HL5k3zwi4kxVf46
-/DkAoIFakhDPjNTCekGFlCKM+p+IFi2/
-=P92D
+iQJ8BAEBCABmBQJVgZfHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9vc4P/2ZDfKjbXB7uZXLkx4NUis8P
+7RAGe4f0ivdCLWptN+1uVu/vnC5FPM8Fva/lKCamIclV85zwzmJvhmysBteImd3V
+V0o3AtCa9oQgzduoWpamsPjWOJLJdTQeM9CH2H7eigsLXXmEI/LtM2GAIPUoeTHE
+Rgyu/2Tony0UxMIF5IA22DqH1GeuQsdeCD+MVM5uFwjxmOxro73aaYwaJbHzoafr
+e7M4l8Rc+G0LfF3rPy6DYL23oPpPgD/iNkUXj3tp78rsdXtEWdtdrFBl67cQCBT2
+bm6tBw5koW81tg+0EE6Bfr4x44O69BdtSdP3ygVvgZhw/npQTw5kf2q5jjUiikMy
+S5sr2bfo8aX9wHJb17qzNsFNKb6JgQhxeYcC9/SSHqeFnOFqD/tt3jipKH2n026A
+cmXw9Sqly2zZjlOXz9/symi+0PuogbJO8MCyM0aVzSnspT3qHNFOnzKkif/1x2g+
+xtxcNsT+0RCCDnohZPxHqP7UkosiFGuST6quiv5IRaLEYdNXqw+vs+9nahCN3m7v
+/ehm4rhUW+LIPCJEzuXMEFXCjN3ihdnHt7VZSjHK32pL/k0O2sKD83Ccb5cpGhvv
+b705oKXdfAG5C89LoiJvHDkoqogsPRDgmy7kuKtccuNfAHAT9JO/Dpyf/gNG3jrO
+jsKi54Zu2q47cIhTzaMo
+=uxJN
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qtbearer/metadata.xml
+++ b/dev-qt/qtbearer/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtconcurrent/ChangeLog b/dev-qt/qtconcurrent/ChangeLog
index ef055642ae0a..2218ad52261e 100644
--- a/dev-qt/qtconcurrent/ChangeLog
+++ b/dev-qt/qtconcurrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtconcurrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.13 2015/05/16 11:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.14 2015/06/17 15:19:53 pesa Exp $
+
+*qtconcurrent-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtconcurrent-5.4.2.ebuild,
+  -qtconcurrent-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtconcurrent-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 2202663735d2..c6c3a2c3af5b 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtconcurrent-5.4.1.ebuild 582 SHA256 c92c7d8daf5440d94275f8b5b138544e0b641c50a1aff0618c233a829af918da SHA512 5c4f0ddf5db6c80b4c860d7f319957458edee8f5f8bf9626cbace2056c29d07905ffc67c085f6b7de3810386455e870025f3b1fe19b22513ee644e193ba210c8 WHIRLPOOL d4a2577b1236f2efe8bf0a3a98e3fc4121e3e05d591178fc22d5e84b358b142defc57d3ce87f5ed365e772d5fdf4c4c812c13b14489a6d980fdfad240fc7cb1e
-MISC ChangeLog 1560 SHA256 3aa916260372a6c52c82da5761675f681870b1d12285aa41725c66e9982f44a1 SHA512 552e3bd5e1d337d9b408b900e1466b74598a9f1d31425b6d366a77ac3f992a478d0ae5ece599422e9ba9ddae127d692ca98add0872437554b4ca613157f015ef WHIRLPOOL b1c4c632c185c98ac7e0ee7229f1846f3384f58fde1b5829d98d7b76426061c86eb65456cd9e5beff33348fb9948051ed076b25ce29b5d2c64d889bbf5ca838f
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtconcurrent-5.4.2.ebuild 552 SHA256 afb1ad2a0117f976c3cc80f6b690633c09378d9a3f877c6d06a45a40acd50167 SHA512 c59dde8ddc09ccd8c26371af5a60ceafe30118b58ed3596d93995ad8a762fde1130db5e45489d6f4d7683f09c919816db624b2afee089ce7d5584707f4317823 WHIRLPOOL 006b4afb2fffd46e2015fca4bb26870482c7de788f92936b9c371442634e1ea19ea601884ad702298bfd4592906f5fd954b69ed96fdd17e37ee0416d4b2fc8b2
+MISC ChangeLog 1735 SHA256 fab68427316588fe5b6059c47a22890c7fc90db961eff65a613cf826705b975f SHA512 ad6f5b7f51cc5663fac34c11a6d0d29ab2806a9b201d8200dc9db37913d659c43f651325ddb972db08e76db76ebe1d9e6145fc835849fa928f44d9c082dcbfb4 WHIRLPOOL b4bf500900f46c68407506a14fedcc00018c2bfddde1f767d62a5c74ee4448a7d23abac9239a4e85fcd0acc472062190554b67d198305d46055ea5004b667987
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJQIACgkQVWmRsqeSphONpQCfebMxMolJQYlRpB3BjQ4laURB
-KjgAnAlAEqsDRv72DgewH/VvpqlEiSqp
-=UFZS
+iQJ8BAEBCABmBQJVgZAaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9hPQP/jS7qsrBGuDCwROM7IK8kxst
+fWnlSCN0W6bEn22kWejdxHzs7wpdNwe1Rx89LCj4hzqdGIavPJhs4wA6ab1byxdp
+1x3gcZ49RJOj415A9S87PGVeTlilPJhZfrNWD4oN0dX24JDlK5ti7wSLlT+mjcjO
+BrSjqxfmrDHtLKnTTMBniiuS1ePhcBY5ryewERCi6AcwT/hd893JZLwyD6X3qwT2
+rVqun6lRSmjaVNZNHNR4daAVQQG9h0VKayPB6ur/sisVwHMh45ErZn6MjMOA6vK2
+R1rNmmI+c+u+vlSpwI3MV8XAJoITglE3QvEQ2519tLVyC8fuXGe3txbUlsWQA08P
+y487/ueWhvUFvK6ElmlxnS3wP4PkXfNdtZvrfEYvgwhGTACCeX13JkhaPEMrHQGs
+YpIvZaHpyff2qHGYum1b3AFiEb+Y/L6Vz3ZpU4dhn+34KgjYeqDjrvuNSLm/NdEI
+0p3G09ELzK1APvF5M6XDxn4qeRCTqm2zcMvcGr3m+Wa8PZ24MabY/UvbY1AeKrON
+N2m/WIjJST8tLXtclSGylRDeO4difRjGLevZUx53FTSup5aewTTvNIcYQxPTergB
+l774fQyaLye88euHx6pYBi9n1QTCMXhr1OLu/lHqLX7BiICK0btPmoCajp0efeTb
+r8TTQO4Dg8J/Nr/Mxmkh
+=cxh4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtconcurrent/metadata.xml
+++ b/dev-qt/qtconcurrent/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
similarity index 74%
rename from dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild
rename to dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
index a3ede7c1ebe2..a69683c9b6a0 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild,v 1.4 2015/05/16 11:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild,v 1.1 2015/06/17 15:19:53 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 62d282ad0191..f0697cd99c56 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.80 2015/05/30 10:52:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.81 2015/06/17 15:20:06 pesa Exp $
+
+*qtcore-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtcore-5.4.2.ebuild,
+  -qtcore-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtcore-4.8.6-r2.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 491d93a32248..4e959df5e210 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -10,17 +10,29 @@ AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtcore-4.8.5-r2.ebuild 5207 SHA256 166ffd4d2357025ce9eef8ca0db78184915219b8f3e2e19b8543ef35a7d20094 SHA512 3434d8243745241b55a10ea92a7c24012c1062584fd441d1805119d673c2a55d38caceb65442e168b4a4f0ca93982bf8b052c79ce0db1fbc75ce28d7e3f2c188 WHIRLPOOL 5ccf583d46b52e221d867eea97284d673fb786510a8f73f2cfa9050884a158958e9563895ed125e49492cb5e3f0593d32b2e088e9b15b8d2aaaeddcd333f2310
 EBUILD qtcore-4.8.6-r2.ebuild 2949 SHA256 b576d432d9ea71bb09fb78e2d7028acf86afb434df9f0bfb35069aebecdee2fc SHA512 7c1476bcd8245ff455ce50b2ca173b9fcd9b260c67f90875cc999d81178ad5c27798a72179161a0d67be8a920611c0dfb442e636af235c4dc1105f0e3c1400ca WHIRLPOOL 0e4650c0b582eccf4b8ef5c2f747a494f9cc017c0019440fa4cd5af434202d2c689a6d0d421ff19613a7abc036922a4e91ad88895136c4e1f81355a9716f6835
 EBUILD qtcore-4.8.7.ebuild 2932 SHA256 594ef11b1b6706a155944dbdbfccda1d0efdc2d62b3fb5123074402a95174584 SHA512 67c91a50be1aa800ae65e909f07dc997a997bf4b8ab97c09f53a7411094d52d12c14926be97242564e4ff928236fb03ffe2165139400eaa9d195fcf069c0da15 WHIRLPOOL 225da3d16d70e52e06c914f614c1c50690f4f313a2ada934f314818fe18ccf1b5febf3666918136241234b9b05001b2c4e50f494cde9d8036eafeb60c9f2e8cc
-EBUILD qtcore-5.4.1.ebuild 781 SHA256 a14451f1b4b7929096de3556b70f341c8ece705bf6780b7c25f7291ceb503ab0 SHA512 3d7abbb993df30779f8f1858d3bdfbbdea5c5f4cd283a28e50cdad2ed4874b63ef54063af05025bd14ef43e3209cd7137f06916c2f1865886464b7cfaf7dd8bd WHIRLPOOL 8468e1b8a7a6894df88dfd7932c92b10dcdb1731b0bc817535ab9f39f50221b830c9805748170c2c2559fb4f2695adc89afb8d8b27cfa9e2c5f05ba02faaef99
-MISC ChangeLog 39304 SHA256 90424af259d19bfd274520a8df1ac942f656af599a0093315f1ca5260d7a287f SHA512 a2a6a6f7a7b853da1febae23656b27f3fa0eda80dd3b3c0c10434a2315c0f6e0df32f056a48cbba1ba70f2043bddc2ade11f9ffd468698414df146c475f333b3 WHIRLPOOL 33fe32e76d13daf432947b0867114f9f0dfcb8016d5c65fe600e1dc26192be7115bbbad99c63d0a5214fb77926321ef0db6251b6710e8485a9e9148d95568a5c
-MISC metadata.xml 642 SHA256 7fc084d5cbde663884ed35e9733591c8b33c30bc0baf091960e9bf791a49840e SHA512 394414c48c95a7eab1cdefbd8dab7df4049e18daf1d8f5c1cf9dd13c6d79fbaffa5f30d83358cab8de81ef715bf6826095a7e3b3a40e0ac4556a662a8f292093 WHIRLPOOL bda8ef8538520b6e4bdc25adb88ce73225dffa2139f0c3dce768bc924167986a0fc137173003cb923a5ab3f52a44f67cf668f0c85c0c7858f5a9e1b16f9586ef
+EBUILD qtcore-5.4.2.ebuild 834 SHA256 1adc03caaf75ab10545fce7268bdb27bcb2544372cd45f6b723e1d98821a66bf SHA512 62a1d5c910a5b79111e2df06c9fe47c3bbc55b1d8dad9f55e0fa4b5ee1c52a4f441a6383bebd7c0643c233ef41fbab80e57b2c64df26205bd129a72a1e450c25 WHIRLPOOL 571da6013e2288063bfdfd83877a0aca5b2a3730e81f2ccb6fc598a7915de39a1d7e11c334efcb7e679b47d9c32afbb62a51a293d46b8f0f89a2629b255c9fa4
+MISC ChangeLog 39458 SHA256 538ab612e6a4236bdc8c54ead41013e9900532150871c00704179a997ebb102f SHA512 858615bf43caf12eeca50b45c1b61696291762f43bd96cd8949ba6d263a6c52e6e527289c4abc22d988e2f41420de52a919ab28bb889f6cc7c21c4e2a82a6a68 WHIRLPOOL 7355b16095460360dba36c8cfd0d917c34192013d1f43136d70f3f7547f406eab125815bc4cfc0b4d459eda70dc8fc275afcdaee642b1834b5f4461bca6ba543
+MISC metadata.xml 633 SHA256 b8a9342f8b5306a23b156316bb8f6cbf6efc162d678d41a8e13e46916f12cf7d SHA512 3adcde8bf745bf21b85c8dd7b4b9d420d427053ed7fcbc110057aed87ce3a786e72d942c11d81de87bda04c5e2484ff410641ea147a2748867e969da828e6957 WHIRLPOOL 30fce13f3de4d40391ca081df75d94b6e88e352d0c0b0c10b2e2942462e0df6491b1bd15074dce27bf6cebf7f9d0381ca17cf22cfc982e06bfae4e2d278fc1ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpln4ACgkQkKaRLQcq0GJexACgsOsT+4jKwKUyMQ2fep+AbQDT
-uR4AnjGG635oIqKGro9iksbJ9LWhJHdn
-=ljcW
+iQJ8BAEBCABmBQJVgZAnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9SxwP/3XiwQBcg/vgwsC102cLmFmL
+aFW21hpJs0WHZrqAqDwBRfolBuDvX1OQ2Sjt217Zn6ifX3WbZL5HCIKacBpJ06yn
+x0HMlhpTWQbQC8xZj+CthhhXA1iwsGkUXhFdIyQvHxlmrqFdFfqwxpm/Upi/c6Mi
+6WSaaWUG0Pd7XzdJDsABw2rv/o5jfTpniF1yrb3QKz++VKEhXEU3tZ1y3HRkMGvf
+mVeyc9KvbPqY/UEhsUnO3+o7PbGFCsErmMVGhDN8VdjHIv+N5GbPWlwgO9EcntM+
+rL0X6gEk45EJ6D/yhl+HFa1My/I6b+vEaJyrtG4nAPQSP7TlFBLPxQhdLmTHFULP
+OgIkChIdJZrPas2Nduj5DxVe7BRHH1TSU5xvz6FSIVsuOq6Ax52CJHPk3sxoNC11
+KZjx6kQtnxP53o6whzWFFplK//jTI6zKN1m3sFazO3bRTT7lxRrE3oJXkfufkUaF
+q2aH5QDrpdSaQKfJEDvsK21B6YWKzwXk8UR5jeqs7obwo4kEd/Gsqn5lLxpHGwxH
+ABJip9zNtUR4mQLe0Xpb5XJhjWHl4fHT76bdZOZUZQEqrgEVs9d3dYifcU/k6GYU
+CUJ6htxttf9Sv75RLbhNxSf1bTf0RE8fvMxjQ0W7qdRguc+wTHO8qkAmn/UYjLIC
+EQjwj+CJCbx5aVaPWgba
+=5J7T
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 828be903f2c8..9b129875cee4 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -11,6 +11,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtcore/qtcore-5.4.1.ebuild b/dev-qt/qtcore/qtcore-5.4.2.ebuild
similarity index 69%
rename from dev-qt/qtcore/qtcore-5.4.1.ebuild
rename to dev-qt/qtcore/qtcore-5.4.2.ebuild
index 356c9b3e5419..daa352334404 100644
--- a/dev-qt/qtcore/qtcore-5.4.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.2.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.1.ebuild,v 1.5 2015/05/17 01:49:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.2.ebuild,v 1.1 2015/06/17 15:20:06 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
 IUSE="icu systemd"
 
 DEPEND="
 	dev-libs/glib:2
-	>=dev-libs/libpcre-8.30[pcre16]
-	sys-libs/zlib
+	>=dev-libs/libpcre-8.35[pcre16]
+	>=sys-libs/zlib-1.2.5
 	virtual/libiconv
 	icu? ( dev-libs/icu:= )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog
index f29ca1221c8b..1cbbccc2ab42 100644
--- a/dev-qt/qtdbus/ChangeLog
+++ b/dev-qt/qtdbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.32 2015/05/30 10:54:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.33 2015/06/17 15:20:18 pesa Exp $
+
+*qtdbus-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdbus-5.4.2.ebuild,
+  -qtdbus-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtdbus-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 1ed6fd502107..0b5c2155ffac 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -6,17 +6,29 @@ AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cb
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtdbus-4.8.5.ebuild 1184 SHA256 2f9ac94d2d32deb1798a98425b288ea6ffb900bbe9dfbfd24b156cf869249476 SHA512 4defc49eb7de95e21e12a07ee919fe0a3aad462e3f75b46e763a0822d7c28df103b6fc4c2173a50e3e8df6eb30f3585f28417283b6b1d2023fe3e0f6a055ebed WHIRLPOOL 56ae1d167972bc7540d4195e3bb6660a0e58f0e50ece0d897fa679af196d404d9156e0cd48fa94fdd00fb404e2139aee5861482b1c33ed0e2fcb0ba7e4b81fee
 EBUILD qtdbus-4.8.6-r1.ebuild 1099 SHA256 b0e5be2f2443b46226934cbd2e35d0ae14a09f3d6bdba6f7eac3638a5d26a5b6 SHA512 45ab5bbdeec41a28b74dd8e3edc2cbf071d30b3da7e19bd8c3a01f808449d916d5783c04fb17cb4bc80a028697c8b14e7b900de6bd900230c6cd89054bc011e3 WHIRLPOOL 654e53f0201449608cf215122d650b6716c733798bb1a53001873225db1ef7d369a6e46fcb0a9f0b141662cf25a898eeaced0dce162e36eb7a22fe7bdfe7e40e
 EBUILD qtdbus-4.8.7.ebuild 1066 SHA256 85a89539ba3c7f079e04fcd7e1deb37f29a482b770ba51713d17d3b6bf56571f SHA512 f544c36baeb399ee2e70d9c9045f230a3c219271daa53e9eb13c10c485b046efbee572fad1be4f7fbb2cf399bc53fbe1eaf3fc1b0531c1bfd8a67756bc60315c WHIRLPOOL d12196a53f4e0d90a893caa5f192ccd91f95d7de72f15b2a88b4e4e7cf4954fd0b3f497706b247f275b25e49d76a4b76eb8e8ac622c08cc83628df60549c06c8
-EBUILD qtdbus-5.4.1.ebuild 749 SHA256 55a7e7f113d6e3edd466e4e10b79cf8a37d948b57ec30d6f6d69e3b57a972e44 SHA512 7fb2340002b4d9ab3f5455578619b1a7f82f585e535a45a0e3c95e4696b47a721cb8d0cf7c21895a884d3011a09625a1bed73a1079dfb6a0851b93b051476af6 WHIRLPOOL dea1f8d277b27274d0ece601646f2f3193dd5211a48ac47f20695e2ebf7500ab347ba16a3c7eb032923b62aed0fa1c219ca5028c36f63a5d9c50bccc5cd4212d
-MISC ChangeLog 20495 SHA256 d34f63a549337165dd40e4abc1a8c94804213d906f6a6c5befaddee9d10cc6f9 SHA512 d2412bda2e535d420c28f6e70385eb89cb12d2e277db229c9d413efd7c56cd6aa5f082b20d258f8485f84be6d7709815598d2073f351b15be77caac69970586a WHIRLPOOL c2589769c9756215c296711cd8f78e91d1be361054f90f272e1549bf34d8a417052160ef959689ccdfe3e941131a146f6f24581008840a8627cf7a01643d6b99
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qtdbus-5.4.2.ebuild 727 SHA256 8abe117d86e7b483a5149a84bceda634b4a87d0dbb8a220445eb9cdf9eb7a7d0 SHA512 ef841a840d3ffc26448e5f768a749657fc79056c269e0af3ed4181d0ca7241adb5c01c70727c6a8a41ff10ec692b83de611886de48e19acd0b7e3c71217ce9ab WHIRLPOOL a713bd88fabf191a4db2a889d4939ad21e27717d453982c4fcd3cf680ca218c2fd333ddaec5aeb5b93a3c55ae9c84126880153b2b882339d6eb0b9244e39f43b
+MISC ChangeLog 20649 SHA256 1fa7c92ec34f7c0d1339f7aa500087d272c8ca7f5df1bff0e49efce75fb46935 SHA512 b603a69a4a3e1266de771cf3bf9e8a143dbbf74f72a6494d7a19df2a270398b851dd1aaf42226520eb4f9b1e74e58c75273c6945e9930765e2995bf61cb9126f WHIRLPOOL ef93c7a8f91b389a090b05849ae7e8b342ed27b479566db997bfd03778f5910055f17c1f8f30f6d19e7f3116a5bb0a7afc0d3051ddc918beabc5bb812932ccd0
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpltUACgkQkKaRLQcq0GKyuQCfb9cfwB8qktKAKQdvbtJl/E+q
-mrwAoLZBOUF8Syaculb4p79qs45LSDfV
-=Y3cs
+iQJ8BAEBCABmBQJVgZAzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RRQP/3VhSe81ZhlKcTjrrg5Ja5DV
+a/CqsNH8vcfHCBly2pmRz6FeP3+1uE1ECvT7Uu0ZhGzHRZcz7MThlGHbNsTKfr5u
+0dFk9/l0WnjjdYgEIMupDgqqcNVQO2P44JlJ6sdYucabkY8muqrzBNultgaIB2g0
+AyMPx7KBYOvXbjIrz9FkMKZAldxYr/rerrozX4nVvuXVVVGsRnzf1N6e4nHkOf4i
+1eCyRfY+qBybD208RVKTNZjFFvE1tpalmY99t/ui8NViGO3AJk2/vx/FVWYprmxP
+oTwFLDzFYYutshwkqPmaq4zhAMWYSZXXoRaUR5FtFSMKwiIx5/sbXAp3nC4EI8do
+WLNNpGbzZY8d9fHUXyLH5HP5PqRND9cZiji5opL8wFw5HxlUlDta3wAnAJgTckaH
+4N97ClGncEYmi2nPNggS+ubbgi8cmUcUcasOe0EBu05s9m/vis0teB6VNSumh7RW
+AnifbvkosryudfGZZMz2AwtnMdjxe/HniJ62vx+djrDJMf8qZgCxCsRrmbmpek0b
+u9Z9qdoDTlPS4yIhS7/lC22Gi20E21/rRAJls2SG/fW5Tog5TW71EIusNcyj4/Uu
+6zvo7ZDhW5XvV5q3wDnjdKnhgwwKpuD730/dJyjgwE9uiOKJ22tIwBSWoEzX7ymZ
+LGJ3pWul1Unei5npBWIa
+=KcKx
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdbus/qtdbus-5.4.1.ebuild b/dev-qt/qtdbus/qtdbus-5.4.2.ebuild
similarity index 71%
rename from dev-qt/qtdbus/qtdbus-5.4.1.ebuild
rename to dev-qt/qtdbus/qtdbus-5.4.2.ebuild
index 4060cf846d7b..4756c4e491f9 100644
--- a/dev-qt/qtdbus/qtdbus-5.4.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.1.ebuild,v 1.4 2015/05/16 10:19:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.2.ebuild,v 1.1 2015/06/17 15:20:18 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="The D-Bus module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index f48a054f31f0..f30b9b9dcd15 100644
--- a/dev-qt/qtdeclarative/ChangeLog
+++ b/dev-qt/qtdeclarative/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtdeclarative
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.35 2015/05/30 11:00:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.36 2015/06/17 15:20:32 pesa Exp $
+
+*qtdeclarative-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdeclarative-5.4.2.ebuild,
+  -files/qtdeclarative-5.4.0-stack-direction.patch, -qtdeclarative-5.4.1.ebuild,
+  metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtdeclarative-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cc3ec12a3f2a..6b20875b1ca4 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,21 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qtdeclarative-5.4.0-stack-direction.patch 1866 SHA256 c5767459f2b75c9ffef1c17638c15f96de48efb9a4e44719ee6ced325ebbf8ed SHA512 518c9ea14280fd2b2d1ae8ad4026a217e800c1e1b6081c05f9f226f0b6c0ad53d89fcf897b09f9d2b84432b64741c27db964fbd7ee548872c67d3e85ffc20749 WHIRLPOOL b4e512dd913c6b3b9f0e996dca2539343a257710c4b20977f466ccb2e8586c068aef331bf497b8cdb17630a2e40f5a3f02ab29cca6d7f63eebfadce63ad9cda1
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtdeclarative-opensource-src-5.4.1.tar.xz 18406948 SHA256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 SHA512 58a688eb5b6ad1d9e56ca75c8b62708df773674425d9f86b8fb8cbce46f88d3c84b62936ad96fb8634ea20969eb8abaa3947e06b8e23d2a12ce340b78d4fc548 WHIRLPOOL 96507dbc7fcea2efc8ec1c1e82bbaa9e610b3b5a5f6632cf2571a8dd035078c6b3d948ec3fa4dd7533c740b5cbd941e1a31a053ee3387c2868ebb14d9c9e8228
+DIST qtdeclarative-opensource-src-5.4.2.tar.xz 18497092 SHA256 b73021d78fffe7894c5fde998a767a866b09811c7e210f8e46f252a32be741ae SHA512 be8b28dfafc20364e0056739f94432750493372b423f2351715d1ec0942cee71b36f6a86db5d6f450c291b147a07632dd1573b76601c0d5eb4c2fdaed717bb93 WHIRLPOOL f8666b6b95a386363d1217c1e9ed70fd127340741ff9b9d177f8694945775b41b7db224a5a401fca721311290c1b0f9a5ccf8521433fb11a72c8dbf5dc1c0d47
 EBUILD qtdeclarative-4.8.5.ebuild 1982 SHA256 ef04c159545997c13d866af405727d598073d07dd51a0be315b1d47343f5cc42 SHA512 f3235d4cef1ffc732be9034e12da9ce3217ba8c4532336a0d116bba9902d645c4c5ef93fde1ea94724ea50ab3e5431cb5e7fc072400e7dbcf972935f4ebe6f3f WHIRLPOOL b4fc1afe86e01206ce909154d55d5cc50f90d48fae6c96b2d501c8b589994e88a5e3f8600c31cca541c21e689e8441208063a5188bb36d392e8f5e8888947ea2
 EBUILD qtdeclarative-4.8.6-r1.ebuild 1689 SHA256 043480f91b6a092c75355b24cd78833962f62f655326ecf471ac4c56093e0424 SHA512 7ec00ebda2a191485dded7c0f8d7fd598ad4cb4dc7685eb5f3d6853e0e660b1a00c84f287182211118b6137a4307eb34c0e6084b12326371ca947081fc2b5870 WHIRLPOOL aae93644fa9a7424ded768ea7018b50c366a88a72fc0b5ea193c5102df6d2479d93a1bd11c3d94975189227c1537394cb1399016e798349e4ea90010c040d344
 EBUILD qtdeclarative-4.8.7.ebuild 1656 SHA256 1293c4ceacd8590a22e44df19111945e6f3246af31baae383666e9bd9eeeb94d SHA512 454db0a445c5c5a47bada1fd9dddfaa0ec5740342db55f4eacbf88244d3d48649a119f72de289703b3f2d093faa52f926345ed8c2d7f5450a1150e51977a34bc WHIRLPOOL c39b384f386a76636410e672c79e2317c2876c9d9f6a38420e6022e01e32c26797aadd4f9eb26931b14bad49a2be09bb01056725ba6a9d3780b564be002cf561
-EBUILD qtdeclarative-5.4.1.ebuild 1366 SHA256 21eec701fc3b06ff1bbc0c189bece4a9d1c8f76c47cb5d390fd86e2000381167 SHA512 4eb8ddd147c9d06b344c10f0bbbd536c2498aaefda9230df97dfd454b2555848fd148bf1be11c00a67d78d60e00a40cf5006e413ca1640ee2743ec3f5691731d WHIRLPOOL 624b01f8ef27a436540e03145cdfd1b34dedbc747d0427753b3f2508d4ebdfc365c48821b4eaa8fb245d00413ae6c5ae3fba7e6ea84d47b16654f7720277ff9b
-MISC ChangeLog 12780 SHA256 91052afcb4a4e9cc7b87fa041a03925f8b6aac28181d2246e4393b8f56e025d4 SHA512 7aac45997afcc12653c4700edb645bda5d365a2d1354eeb3b2f221f5933668a9df4d32119309704702dcfd10fdf9fe4bf724c5120a130b4fa6da8da078c8dd63 WHIRLPOOL 63e122d0cab16b207dc13c1fdc7ae24934e2272b5b2cafac6c68d40849a7ae4b0b461ddb74f9a2e2c07ddb972e271cdaeb1cb45a0f083a4307418e8f8dba1872
-MISC metadata.xml 936 SHA256 0b7fe39080ec6de4fb909be67c20d791410d24a512dbc805e779c86f6bec6127 SHA512 9fd8fdb6dec2fb0a47ed86a3f74827246147e439551421185b25bfe279e49a9f93d374529041546e9647c0321555dd94f25c690598ae05bb36350b29a8195ca5 WHIRLPOOL cd591d5cf83bcfacc2ef8a9a8dc0d25acb6d38b778a25e4ebc4ba551554b70ee97d90f6341436e8ac97cdec13e9ef21d174fad11a499e4d9cf6c5c4921a16370
+EBUILD qtdeclarative-5.4.2.ebuild 1229 SHA256 342069ba649f0d4aaccd856b7a15d93cbcd70620bfc5b9027aec30453968abb5 SHA512 8deea72a236b33110780b0a3670fc39b13e0c8af0a874d15a6afd9ca3eecd0deb00dcf1efe831d6c5bcda941d473172231c4c8c240ddccb4e652fb4ac2ceabae WHIRLPOOL 6165383153df9e6b2e1b35a0a3d70b9cd960c0b33e878c646824097e07c2f6d08ba3e5fa65887b65a1c41c2744ee1a707581b534039b242b2d58bc848b8acac3
+MISC ChangeLog 13007 SHA256 9ef05cc1a676895ea89473f1b908ed0fe40064631b4fdc27370b6679a206bb6f SHA512 c7265154098c219d6f892cd34a79cd7f4df5ac471cd98f8f3313db34035ecdaa7cccbfbed5dfb9ebc73ed0b3ac702821d9873a2d33ae22cc2cfc0e7dcfd87e6a WHIRLPOOL ac60061fdcec358f831050b80b285ff54b317bb8838098ee73dc3472e4a2606d81083d8a0033117706a532c456ebd853a1141200783b95bce7bf1db0faa52257
+MISC metadata.xml 932 SHA256 0dd30a412c34ea4f8e3d700858373a803f566163f14e86b97cce77a46554b2f5 SHA512 6877384f9b6619ae04e1bbd59f309a1b1f795304d8ad53dd8927e410f8925a66bce9d3fe19855f51f383d1b6cfa25efb83495eb1eeae40b5196cbd6618ee8238 WHIRLPOOL 929e1385d1688b6961354c4b14e84b82caf8289373ebb1bd4e4c5f4b5d02af808144711411f3d058d9649c0aa267c5cbdaab8980f7c388e58988b6f14ab13fd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmGkACgkQkKaRLQcq0GJkQwCgqXDWWL+0nBrbLOMB9BsRJeLt
-+AYAn1SnJVHh9jRh0zRplVpOHDXGtbJC
-=7NRc
+iQJ8BAEBCABmBQJVgZBBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV99EoP/3XU8nIDFUw0Fd7+JWUqbsmD
+ymeRy/plPuajupv+/OyvaIftE4hneEQFCaggAq223KgGGmNmBqZJ4+y209W6s68J
+YlQfmuYJeDABw+dvYSsPxrTNjnIWKOaqXyjZ7xPc3/Wv+AWJGtcJZ2xgp3+BhycI
+hNgFPKtMeypYaPlE/Ck9ihV1jTea1ckJF0dBYsLVrnzM07JPU1U19x/Bp+9STWQy
+ezlZNyF9amcGRkHNblDlCZ/mkDC6e4Ko6h76dEGuBjwveTAXRXEt6wBpOKja8oVa
+rev/TQBLdpnr5/QP3bsdhCeJmCnesmCRkTsyO/t8CMxElcH5YUWDN1+pQBCqTfbB
+sJT5u5SoTe8htzCmutEGVy0TamYLwfTqorzZ99oc9Djbys1Vp5IsmS1vFIHzUwvY
+p0Hx5BLOvfeV1NRa7yfi+9m3wsNSkvRN0Q4C6ZUIbLNcgvhpDnP66bFUQnu31vmF
+qFWxsK3Or7rADJO0ycmrKn7gdmu9KrBRSdO5vzWT488DkNDer/bnqYCCidmoAicS
+Cm78I0LBO/fQVjNocH/5gDZTM6Xzc36Hzfh9Lo3nMYGN9KdCvSsSvueGxJPZndi0
+FeGR+eEDSzRT4inWG1Fh3/oikO1Fv7AZOmFpWZG2kdGnQE5cmKkC3L4BTuZElFJr
+9tbwrKCMhGc7NdquIBVn
+=/yYR
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch
deleted file mode 100644
index 1889fa80c70d..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit a4152c29b6f98c32a30a824bc50a760ce6bad6c7
-Author: Rolf Eike Beer <eb@emlix.com>
-Date:   Wed Feb 4 13:24:53 2015 +0100
-
-    QML: do not check stack size if stack grows up
-    
-    On architectures where the stack grows upwards (i.e. HP PA-RISC) the
-    stack limit calculation fails because the variables used to check the
-    offset are usually close to the bottom of the stack, which is in this
-    case the origin of the stack grows. Since these machines are a rare
-    obscurity simply simply assume that everything is fine on these
-    machines. The few people that are indeed running QML on such machines
-    will probably be able configure their stack size properly by default.
-    
-    Task-number: QTBUG-44268
-    Change-Id: Ia83a39179a0f6e0602ba7a5032d386e12d8d1ba3
-
-diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
-index 5bba745..6156e5c 100644
---- a/src/qml/jsruntime/qv4engine.cpp
-+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -108,8 +108,14 @@ quintptr getStackLimit()
-     } else
-         size = pthread_get_stacksize_np(thread_self);
-     stackLimit -= size;
-+#  elif defined(__hppa)
-+    // On some architectures the stack grows upwards. All of these are rather exotic, so simply assume
-+    // everything is fine there.
-+    // Known examples:
-+    // -HP PA-RISC
-+    stackLimit = 0;
-+
- #  else
--    void* stackBottom = 0;
-     pthread_attr_t attr;
- #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
-     // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
-@@ -117,7 +123,9 @@ quintptr getStackLimit()
- #else
-     if (pthread_getattr_np(pthread_self(), &attr) == 0) {
- #endif
-+        void *stackBottom = Q_NULLPTR;
-         size_t stackSize = 0;
-+
-         pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-         pthread_attr_destroy(&attr);
\ No newline at end of file
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index af680b595c34..f96540a49918 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,7 +5,7 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
@@ -15,6 +15,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
similarity index 64%
rename from dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild
rename to dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
index b87e940d79cd..f5361db361fb 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild,v 1.5 2015/05/16 10:36:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild,v 1.1 2015/06/17 15:20:32 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,20 +15,16 @@ IUSE="gles2 localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qttest-${PV}:5[debug=]
-	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[gles2=]
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qttest-${PV}:5
+	localstorage? ( >=dev-qt/qtsql-${PV}:5 )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.0-stack-direction.patch"
-)
-
 src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 3847eb5d05b8..8ec33c1d9a11 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtdemo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.22 2015/06/02 12:17:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.23 2015/06/17 15:52:55 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Update upstream metadata.
 
   02 Jun 2015; Davide Pesavento <pesa@gentoo.org> qtdemo-4.8.7.ebuild:
   media-libs/phonon is multilib now.
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index a92f2b418731..b88f7ce6ff29 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -8,24 +8,24 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 EBUILD qtdemo-4.8.5-r1.ebuild 2936 SHA256 aa695e2d44301f5724d76cad2f52f7ac9a6b7b72512d816c3f18d79f966a77f4 SHA512 4d60d71301526c2a66a3ba154ad84d3a28e2c1d806346b2c6c200553b5f992dba9d403028d80c0fbf8e1c01837e75413de0df1c043b954ccc6db04b5d960f778 WHIRLPOOL 8e1a9fa8b96fcb6f871897ad1764dc656f3500d8df7beec2a22c9e5d62509a219ad03eb442748243e2b9aaaa0966f892844f486dd759ee314c2167eb7fc0107a
 EBUILD qtdemo-4.8.6-r1.ebuild 2886 SHA256 f5d14640c30cd1a2313326a445d00de9c7ee0c983ab5c50fe5d5aebb6a355ec1 SHA512 c06569370262008c9e673d82958251812d15fa61166c4038d075f6db8054e0c499859df3f7d577bb254c9e835cfbf7427ef6f8d65b0632b391eea9bd3ebabdbf WHIRLPOOL c696bb17bfc04b9ca42c07051e786bddd80ad843d3176f96f5b65549942bfcaa14c86306e46f1a92a7e6f5965da7a983e9e5e76eb5331d21f394176b9c5b1fb2
 EBUILD qtdemo-4.8.7.ebuild 2918 SHA256 b7145f1b6ac99f52fb5b46bd77d5a4cc0d22f0a46e13416971a4f607fc00b1f5 SHA512 1c3daf7a82da81e289fce8f0a1a2a5be1f4203dc445f4ffdceac52a1ee41a68aeb82931184419d6a6b1af46371c5f6ce1f38b673b222546fab1e308ee6022684 WHIRLPOOL 3e510dd7f4e9e642db0ee9e51e518104e4ce8fdbaa0648466ac61e6c99fd44fe98a96205503de31c5a029cc9f1086483ef15d828019bdd66ff8e7eb3cdfc1800
-MISC ChangeLog 15630 SHA256 8de613ae206eb45ed8b1f6a88491c4784cc888c21b67be099f4983b2beaec671 SHA512 a3c36e193e38f0940aa27fb8109b976f34c9cec33650d8c1d59116137b8a3e759ab07ad0dc15a43c05dd1e8e0d28bc13e5b44e751e0ba4629d36e4da1cbb7a49 WHIRLPOOL d53344edef9c7b82f1ed864084f0680814bb91589809cded5ba376479c2873a8b0fc8f8524e4cde0c92f5de01241c2ea13ad87d4f77711cf038dbf25155baf3f
-MISC metadata.xml 1010 SHA256 04116cab1abf7fff82228ee4f99259efddd52610cefa3ddf33365c90d985b3cb SHA512 5dc5c1be78205d432713949cca20ee3a4151f27c4f63ae8c56b8b1fddaea9f99f4907baf51c13347a8718f74876c75673d82821ee4eadb5d8b7cdaea8734d8a4 WHIRLPOOL 40129f394055c62a5b21297d7f5fab47ad2ab842b1bd59919a78dde8a5197d983a3670bec29fa14a8a2b6904a1792bed5f1f055856de2800aa01f03aa026b18b
+MISC ChangeLog 15723 SHA256 12e6c8f97c928f18d0c6818b83c4648908a18db44c5e64eaccaf9550fea3c131 SHA512 ffbb2c4eccbe6661211bc64896bd4dc36c034f126818ee97337e1639a7b34e91f84c45930ca0751a95984f2a68747d5a10f049622eafc24f56f07d1feb3b5041 WHIRLPOOL 5611b1823523d224df0e941869ea174f34218d61918eb0f8cad2e4168f4dee6c7eec0f5d60dc97f3d41c8b01b99fe4249d661b808fab8a72c44ebeffa0f74a86
+MISC metadata.xml 1001 SHA256 5185fc1fecf8e7fb36cee4525ce131847132596ed2c18609d657cdb1c786f307 SHA512 db3d86b55cc63bfab8e457c253d973a82f95af7520a200a576ba73cdfd837e6dee16d7e34b8f057057738e26d9601fa82087011551b8761e8def0ebac670c720 WHIRLPOOL 1819e51c9c4e89f7760f948b2c9ba76bb7ec00d22b07ffef73978fb88356b4b089ab0932429e87ca828b44dd82094c5ab765840adfeba31512e9ef887e8eb8e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVbZ7vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVgZfYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9VTYP/0ScBxtrAlhmrhZHOtWa8wYf
-76+hwcWoQgxqEOeOnniFimZvjpjII/koFCSzPDWnQv0laBLPatTL+OZvICtmA5ya
-HxaYKPjaQlNP0/x5WkB0P2E1GrnIhhkGXsNfsYQlpXJi+kR1Fv67jCxyGxe2/Xm4
-qIGlhPHhsmui5mX+4wmVBJuKGDmO/aO83z1DVN5vR6cVjnwhHG8lv2BRqPQrq7Kv
-SFPz6W4KzVS8pjqCnZhWosbMKpIUyLF9PecfHaYZXZ1ZO18bbHzXUXYF2I+JFQd7
-65w+kzdqHwWwWxyKxtEoXkY6RUxPnP+H5bIPqOuXxEO2Z9uG+Go/0DJi7T/5MiYb
-D12Vvn05QgzdnHTjmOr1EuI4BBfu76fazcO+E0PohirkjG31RfnJxKJ93pxzw9Og
-73BmXvg0hSPO1bgVM8Ov1vAvaImoaQZIFoMgCXo3qeDRbQeD8EeqX6BBUPHOhsju
-RjHl+bi9MwvYVYiu6C8mv9DDNwo87lXL9NsLm+llFgBjJR8lGT1SEpZiRzpy21aU
-Kc7Zskh/d+rt9HG4TaFM/ZBZtbcitlXn4Fz6R2Ij2WZddsm5TbL5wlPXU5r5U9G6
-5B02c9rAf8TnLRW61I/IvueITEAkd7B/rzYa5G/gbjIgmUjvQwgr5QDMzzlGj7RS
-1IlkcuyBDPbGEjiAn/BE
-=tL/R
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bMwP/1rMJvfWQzRXrJ1pt7/v8kvH
+Mg+HSVv1X38gA1kqNMFTmmYJtSvT9w8WCIHdoHl012eIqXNBnIUfEL1WrvhBfPNW
+aSHbsENP/HOo8Xa0rdG7SIotcW6qQM4vz+WRMPCBvc6nu8sT5ur+LeO7iKtZzF74
+zZOWgVezy+KtG8RJgfdd0Zq4bqESxzNg0JluRH35Wo51KDjlNVBAvJjLBhnDi1qp
+euiWEJXQRak424cOQeyq4MsZWg8kg4nBYpMhZSW92D80Q1MGUuN9p/t3aucAa+Ae
+4IOl3Vj1vLuOjLE5jS6u+vhziAHdBzoTVXMMy8jj1SvpRz8ZYRussMHs6m4dgEnZ
+/HyUFF6+2N9JNpDQUulxOu15Vcafea35HwMaBpXme3Z858aSByBkTSXFIxdcUxwh
+XtHlb9oBy1vTMWtw7ity5rrtMK9biwfqL0jwuL6EfXa2VyRWWy0dlTGFuwR3zbjN
+7GnFVQeu4Soqe8DuOG9VE6CmK3ANcMFJJ8ezxCIlS6PMe2az2XvsSRgvLeSQuxHz
+a1qMc3x5gbLzhshTGTAM2WMr8urBc3yPER4T1yjE2G0y2rsUccsndLRdRtlh4J/D
+WiXPw/UUg8lYCUfSS7S7WeIIMZbF73SI0lOZZlZ0kAu/YdotNazosluFwMa86Wer
+ANtKIbnz7Z+YPtiSs9JF
+=AE5Z
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 1e809916ce28..17de06fe1199 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -17,6 +17,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdiag/ChangeLog b/dev-qt/qtdiag/ChangeLog
index d9fcffe06faf..180f5d44472f 100644
--- a/dev-qt/qtdiag/ChangeLog
+++ b/dev-qt/qtdiag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdiag
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.10 2015/05/16 11:07:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.11 2015/06/17 15:20:39 pesa Exp $
+
+*qtdiag-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdiag-5.4.2.ebuild,
+  -qtdiag-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtdiag-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 083eb4a9425c..b5d40af91e97 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qtdiag-5.4.1.ebuild 661 SHA256 42e92dbce782bb7b33c2632146867cdcb1d55a22b01135a2a8c79cafbd57736a SHA512 32b93e221a12d38195d5e9a0518fd336adac9f4770d75403f66bd81346f1a7828d2b33f10587585dd1f15b1fca22f75700d903105e886e9e1f99a47cab393ce1 WHIRLPOOL 43c0297e65fc011004ff97a9e145a282d70396a8088b903cdf8e6054af1e63a7b6a506f645b2ab38539ca2431748f21fb2fec4af5087d10991023bbe28d27c1c
-MISC ChangeLog 1336 SHA256 b367b5157d4bfbad5db07e092c905bef816c75df905486798c4bf478ca09a5ba SHA512 0ff802b96ba656e958abb4a517145bba1604a3bfe760ea7366f06fcb54fc6b0a028fa23ee34f5682af59a27d660f15c99e59aec71717713b38b70801a6381241 WHIRLPOOL 9fa4690245f97d3829c28ff05e917b06adc9abdaa130c25fffc05417996d0128088e7897c900a5c575c9bba7c38f14d45f21b73ce34da6b028eff4ad033a8aa3
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qtdiag-5.4.2.ebuild 600 SHA256 0310597418a90844a545198f2ee66ea6aa93a20511f53e163607639409e3c942 SHA512 476897c9766e2f081f108879b9aa7c4217689f673371ee23fef595ece0d63ca89696364cbebdff5aaa1d9f8ea0c48b0a70dae8d0514c3cc2fad48847e856818a WHIRLPOOL 7ead18897118c0f408cd9d5f8b0589f97b0a0857183a39ae123849e01c9e5a76501e3edc28eb4e88886df820c3247b3e1f3c4a3ba77e2d20379b11fc584c8b73
+MISC ChangeLog 1493 SHA256 bf9481c3451279c8202c0b55b21be254bc2371515bc7d1a7532908225f1f2a4f SHA512 9de4543852efa09fa2d05bc546e22f00210ec5319b0eece6072545cd97d92edd29a902c8e8cf4a7477d05988266e3df140aa3c1e82f12bbba2d82e26c0562c26 WHIRLPOOL 25ed1e5f3fc8e529f12d4286ba7908025de3d521727f6deef2d6789b374b16c78adcc0e481a7cebaa6eff09889a21621408671a3444ec618fd918d7a85f99881
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJNoACgkQVWmRsqeSphNWfQCdEiQGa3KMJonv+431an7xG0Sf
-S/EAn30RR5urkmcnaeO0y6Cy/sw4olHJ
-=drHX
+iQJ8BAEBCABmBQJVgZBIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9XDsP/iXsjwrjkNQiF90MsvYeAbwo
+O/PSI7FemzlcM6nxrUVjw7CCLpS69Ks/pZjvQyjeo0uW5oNDypRjpYkOUXjL2sMO
+ibKusi0s08xZ+FvWnL8YZb9Ae3WIO1chCv1jZkYakbjzuexqvK42uKd/ap2+/lEU
+1qTS1xlGbQI1/V2jdRQ3Zs40H32BVhVMOrlthBbAM8rMRSK9XYLTqLP91TafziaQ
+FQ7/h9YrADR7/pZNjR3TGrn9JotcUQv72Qww/XPUWqzaWoMGPZXIpuxgvFT675P7
+hx229siA5EKOyH3zZLzLrz+z/M5cLQQBgkMsFYidWOPJ5ETsyTislV2HSQncjjtK
+w2G6FVZeSe/86omirEXm6ikTNsx293ApRrl2o3NXIqE9YKPRdGlTo/xi8iyDdrwr
+7QmXdx9glIGdCpoQAsm3wTE1cqkpMY5dbZ1YrG53V6mLUpFvNc/hs4uFNkzls879
+6DXM4h13JPICiUzZ1x5ldooyd1tb9ojXoXzkSAFd9NYN4ralxvLdzoO0ypTj8TCe
+2GN2odhmEbvud7YX+6oyl/k7IPVWqiln/Ddg5gZIwjsLa1RkQ5ckjf+NeMY/UXCJ
+QrYq/FSEYl0nLaP7RFYR66Mh9ry5KbKDQOGXZHms7fhbq/T+TbgYW6PKME2gxYzn
+g1xnQUm3z0m45iREwAFr
+=5Myh
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtdiag/metadata.xml
+++ b/dev-qt/qtdiag/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdiag/qtdiag-5.4.1.ebuild b/dev-qt/qtdiag/qtdiag-5.4.2.ebuild
similarity index 53%
rename from dev-qt/qtdiag/qtdiag-5.4.1.ebuild
rename to dev-qt/qtdiag/qtdiag-5.4.2.ebuild
index f114d8981e58..caa848d2f24c 100644
--- a/dev-qt/qtdiag/qtdiag-5.4.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.1.ebuild,v 1.3 2015/05/16 11:07:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.2.ebuild,v 1.1 2015/06/17 15:20:39 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+opengl +ssl"
+IUSE="+ssl"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5[ssl=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtgraphicaleffects/ChangeLog b/dev-qt/qtgraphicaleffects/ChangeLog
index 233d86bd0ed2..e82680327310 100644
--- a/dev-qt/qtgraphicaleffects/ChangeLog
+++ b/dev-qt/qtgraphicaleffects/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtgraphicaleffects
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.13 2015/05/16 11:05:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.14 2015/06/17 15:20:46 pesa Exp $
+
+*qtgraphicaleffects-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  +qtgraphicaleffects-5.4.2.ebuild, -qtgraphicaleffects-5.4.1.ebuild,
+  metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtgraphicaleffects-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index bf7d2f244e99..4b851eac46e0 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtgraphicaleffects-opensource-src-5.4.1.tar.xz 14323700 SHA256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c SHA512 0f2b0c42692a89e68f98718e259c732f72837f510a7e3eb95d81c6271c852d7a0e8de1bb17ba181be48b0159c4381995a230ad6f9d4ec45311b59c315207c9c5 WHIRLPOOL f551b16efd43341e55e65d0d19a33be47b2af8bf7d743f9b5203578277a71b8b0c350aee395fa24e4d86645e61a6c29db2eab0c535c65278a8ba2aa3a9bb5943
-EBUILD qtgraphicaleffects-5.4.1.ebuild 732 SHA256 4032a76cb34dde6dc6b9d739775ab3f4b5c97113b6589ec77d172ab16db2e649 SHA512 09357c22b25dfe0e02c2a0565227132c58e676b4ff1f739d85aa05f265e9d7788aaad0ca8f107e3b1d0db17628c3d339e487c83ca941da56bf078930a3405441 WHIRLPOOL c74ddaf5ac30c9932b63934bc5a7523d7481211072adc021284c6add9aa68cf6d2c40318f45c1287475b176644a4c4404fcbefd95d156da78d15cf957e8c274c
-MISC ChangeLog 1548 SHA256 77413ee4c3caa4b8f908d14715502f2c5dd9d985b8d48a33517612bf5392e002 SHA512 decc3c1a00218fb8b73bacfec102b0ee0d39f44d9c72b17b9aa0e7c2bd3b5255acca2bae57784e501f2ddd20dd91af78008599d0ac3948b9416a2f6871c7bb84 WHIRLPOOL bd228c015a39de79687cfd6ee5bd95d089c1f765b1cc91a7538baad77d3ecdfa1319714db3fbb8fdb352af3d3950eb599d1f82e227b364fd40026b0afa6cb948
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtgraphicaleffects-opensource-src-5.4.2.tar.xz 14324140 SHA256 ba8f477be1b0675ce36f48530db050d2922b2a0d6ff80c46559245a94aede80a SHA512 205896a2551a2be99b015c4254ec5195f97ff99d266e377caaffe02033d5c0aa9d7509b781f5316074ebe5e2d8e768b90db81d19a2233f98c887c57a25046c38 WHIRLPOOL 4424a57f760cc8d7bbf71b890bf3eea50b01eb2f4a1b36e88c945a47adb05a6a7badca0066552f523c4807dc7ee40ea70dd5f79cc33d45a4a5f3d334152f150d
+EBUILD qtgraphicaleffects-5.4.2.ebuild 679 SHA256 e58e98b3455d37cab9a818060a9f307f119ab26b7c82e596118e027186074d46 SHA512 ec1419c22c221d8e37e394893490e46cde52e509de8b099b9c7bac1bcbdf33eab6b6db3200375f242a55223fe0147a90c008ca4e3615fbbea3fc0a7ac255d057 WHIRLPOOL beedcfb71e5f1b386f13613a1e6c9e051134f26d68259e0abd48a5528dd7108164783dc85dd0dcc962b51c1ca87cb39e1cf164334ac9563a10929d5534b7f209
+MISC ChangeLog 1743 SHA256 4a1e8019454bd305c93ea5956b6744c69ee7609dc22d306aa6c19e8399d768a1 SHA512 b874d6656386ae006f4b5e1a1d0e736de762da662837c1b988708c93ecf623ed1c593d18e076692e4a34df044da4967081872d4258c7c956c59a528f7153d2ea WHIRLPOOL 79c7c225292618dd4c4ba4077a5a4f5313b06ef01fa9652409011887b130304cb89f2fdf4ee0170e337801188cc96d61f5eeec3cb726da97d02591fb0d015cc6
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJG8ACgkQVWmRsqeSphONNQCdENqfwPOip4PgcfFsCHud1Cjh
-fbAAn2kT3/Nu+A7xrbeQvilaQjzywsoq
-=3VhO
+iQJ8BAEBCABmBQJVgZBPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IXIP/i4vd09fRVJlmzt4/0koDXQW
+ZB/du+bM5jTuEEn4fpFwBQv1/L8+jqpLjtcaGKKuP9E1uc9Ak07fLD1SeG7EHYXh
+0MsMbk5lKSAuHO99xj/qAlcyQ1X6cP8EF4gJiCS80eR6FE3RVmUPYWxfCQ31YrKT
+zvsTR8p2j6g3BryFEx0d50vdm3BYvvoPgVxXKBHeiKcN+den+Jhbo5A8vp+sFJQ/
+QTqSTP6Nt4457HucnGQ0DEAUhimmx78Quoir01bcazTKLueoLa3CM8AQuEhenCaR
+WkXTFhXUtAWtrYDYuxMQAmiurO87K/JZMDqPqA3Pj+fQ0HRfmzSF2WwyL8UBuKy0
+yMtH61idlBCBT+NDpa0kx9lNLQqN0y2PfkcZtOySLyFz+2i+lb4drNj67ND9Q3hJ
+RfTPN8mqjfzZ7OHRum4B1eNUd9F9BkIsr23spXHLR8WEij7RfK93vp5iPXCugNq4
+k/AFIyEKx0XdQu0GxHplrYR0Cet3SStRk5sKMVqO9yVy7NgIcNUTIiFOLx16Xc3W
+84+nJ2AlNjVtlbS3981/Y/acYrMQUSDZrcG2TJv6MtWffjeC//hDqkk2N8mK/aRU
+yAtGL19d+BXMVnql9R16+f3CXgUZftq3m/RO2j3mmgaEKlKapLnKPXX9z6jv3rin
+UF149W35FK0DrOd7qrX+
+=O+r4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgraphicaleffects/metadata.xml b/dev-qt/qtgraphicaleffects/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtgraphicaleffects/metadata.xml
+++ b/dev-qt/qtgraphicaleffects/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
similarity index 60%
rename from dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild
rename to dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
index c3753b619608..2951f2661edd 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild,v 1.3 2015/05/16 11:05:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild,v 1.1 2015/06/17 15:20:46 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build virtualx
 
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdeclarative-${PV}:5[debug=]
-	>=dev-qt/qtxmlpatterns-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+	>=dev-qt/qtxmlpatterns-${PV}:5
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtgui-${PV}:5[debug=] )
+	test? ( >=dev-qt/qtgui-${PV}:5 )
 "
 
 src_test() {
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 6c4ca0980f9c..d865657c8e81 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.89 2015/05/30 10:52:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.90 2015/06/17 15:21:03 pesa Exp $
+
+*qtgui-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtgui-5.4.2.ebuild,
+  -files/qtgui-5.4.1-CVE-2015-0295.patch,
+  -files/qtgui-5.4.1-CVE-2015-1858-1859.patch,
+  -files/qtgui-5.4.1-CVE-2015-1860.patch, -qtgui-5.4.1-r2.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtgui-4.8.6-r4.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 775c50bbe02a..9838304aa7d9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -11,24 +11,33 @@ AUX qtgui-4.8.5-libjpeg-9.patch 2852 SHA256 4b692de233f1cd9bf13a48166610af9f7b12
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 SHA256 7119cdc3450e1e36e01ce3273c5131b89c6e4a03f08652f5fa4eb0919d3b4bd0 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 WHIRLPOOL a45f6cfda0fd6f137c091eb82039900ac6f39d2b277ab9125b74e0828e2bb809561f1ef11328af1c5c1c20f5ca06e39e66881219c6101b1134126ca482d2aac9
 AUX qtgui-4.8.6-CVE-2015-1858.patch 2849 SHA256 bf7b77a1b311d2b0f647c4efb72cf42edb66f3085750784388fc7ffaf6a73fb0 SHA512 b7be8cf6bc9706df4f491fb5134a76ade03e1fd1d127d5d9bf228a787ee0f32496da04c937a1d44adcb698eadfe969f0026d626e9c5d9ec623e24541184b8246 WHIRLPOOL 01da12595a31eb323d5c96d85b8d3315a17929f916661eda209f5e2d13b9f7c187423d2620fedac33856ca132a5ac66d22ffb52bc437490ebe55c6d8a4366cb1
 AUX qtgui-4.8.6-CVE-2015-1860.patch 1009 SHA256 4afd0b1ef272774dfa845c2dc1340ce7d468f159646e92d6669e9d8f38f14171 SHA512 e2da2a04ab4d1180f855571aa39356ed74d173e95e7c0561021709256c7cfc85d2b99fd485d724357a2947379de52fad4c9ac7d52c61dd04373b00494de58e15 WHIRLPOOL 821a7552963412cba0294bbe3a7c3d7604c09f466d3cb9b22c7eb10a359359fa32748ad5ae45f86972de7edb1cb676197e082bb715e08c9c0391bbc6ec8f78f0
-AUX qtgui-5.4.1-CVE-2015-0295.patch 1828 SHA256 fba8ea41b0252174c42e4403f9be8b6e275a6a312228b5b37e336242be618e15 SHA512 6101c81d9931af24d48ef0b49ee38c2c912fc28401096b981438eab1d9e16f4bc04ed4153e5a5b9cc10187b3d230ba99c0452b08e90592487d8c7c13b2459119 WHIRLPOOL 3b0e66184e83dcda0711703af500ea8cd6437e5d668a559fc7524d006e1d50d02cb9955123f8ce1da6b2306ca448e614d364c50cbe5d8b771b2aaa4daccbb509
-AUX qtgui-5.4.1-CVE-2015-1858-1859.patch 2782 SHA256 0eebcb1bacb5de3bf249feb77ce95453066a3a958e1673fe3bb1e7c9fb6d862a SHA512 580d53eeaf489d51cc09d26a2bb5596562e1da4a1064909613adb4091d22fdd9814be6bbb860098be1ddac651e827283a59605c0d668d352ba0052cab7f48bd4 WHIRLPOOL dc3c76da488fdd7efc396126b5cbad0f4e63c2a3ba6144e3d11fd770ee8d6b887b2ba388dfe1b82b8fa2f1568ea5a3854b50c49da2f0439f141d7d622be4560c
-AUX qtgui-5.4.1-CVE-2015-1860.patch 940 SHA256 a0664c41b847cb00eb3f87feb89a105b70f65eb1719c58cb72c98e0459b89dcd SHA512 2731430202fad4ff6b117cc0188e5c448ce8cc6f8305b81209a8171fe1f2a3b1c96c935ebc50adaef4a815ead9498cfa4eaaf05083a2271619eb77c0e8aaa35a WHIRLPOOL 4d1cb5a92b33b82d4d03cf31492cdeaa80f5899d5e15cc36bc406ab96971c6e54ce1599807d974ab0d3f5848566073b03e059820bba2bf4ee703d5906f6435ca
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
 EBUILD qtgui-4.8.5-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256
 EBUILD qtgui-4.8.6-r4.ebuild 6264 SHA256 697da660cf27666eeb2b77c9f979751dd7282ee7edcc24dd37ed27259a4aa6d7 SHA512 1c7e5d9a2614ad716989ff8917e216d2ebd7b76a0e717d8f066c826f7b69388d8b5124c7cf279154eb8131b2ef02ad9ad43f065cc334e9de374c5d15c5c64874 WHIRLPOOL cec58713c816734e625e1be0d97dfdcf09cc8c825a8c96f346e43d81e3aa9b3a534d9b57b665d5070d301c11f54e0db475246a456084e0329c42c35fe4ae8d66
 EBUILD qtgui-4.8.7.ebuild 5863 SHA256 9206283348fefbf5539959d2920a31a4d248780c194c86f4f5c8dbeea3b7a3d6 SHA512 8ad343509819f41d4dccf45c3bee06c4b9796f148756b77afeaa5f7aa6403e8ff5c193dce2960f8d5c3d95a1f467b27fbd3e99b74211f3701a2652790752a4f0 WHIRLPOOL 4b77a12dbe556cd78d2d23be411b14fd2ee200bbc2109a3f968b10c3d2f749030a005786d3901929941ace373db2904565c14e890dc37bc5aa7d63c7e9e1b217
-EBUILD qtgui-5.4.1-r2.ebuild 3778 SHA256 41a5e4258e21ab636ad606536139f147dd09b096100add130be726d1e0a0b9ab SHA512 3dee01ac29eb3e7ab3a29629ff1c0b6eb442aba126e070af8c3ec2f6cad98603dace5a12e3e5d0f307090be9075909a8588612db942d2a90765f41a463ae64b6 WHIRLPOOL 168c9f7d1bbb12be82d2a3a6131f9ac2a3f71fe3ee9449c130fc83d043331d54959271914f87eccb8ce85c6c123b4b59e51823c0757fe8488af590452880b371
-MISC ChangeLog 45028 SHA256 ab5cf464b3f21e8049728dfc0c2f46e1b03f2e9c8eea4e004f02e32cd2ecd6d1 SHA512 e4313c903aab263f6c3621afe80ec0ac7e09f74943efc948abbb24ba79e6eb5e4099b903816a76c9ade15f3235f0667f8b121f51cce1b16f411bf727a81e8cd1 WHIRLPOOL abcd9cffca37f8a5deb4b1efb5a88bebb9a6cdcc9b10726ccdd94d594363b7c71310785d2b86896d174ff5493fe8a1353210e8327e6d76328dc8ebe1d7510850
-MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149
+EBUILD qtgui-5.4.2.ebuild 3383 SHA256 0b9b890e1b341c0f459676aff2f262f804e7dcaa680543e7943dd71a43063909 SHA512 5edae517ba6a83d4141196212e173c7d3a933e1f0ee52f10aa56e2667676451a19d938026b2f3c1d5c4b0f69f0fb2b7fae03c82743be419cc6604dc9d3ea53b5 WHIRLPOOL 4e2428b4813c883581e969836f21b4f9797302e413b5cdd311b0fc6c7c3f34d0ce7d9e51cea9476cc980c34683654ba5256972f9edb06de8dca0a19f9a254a27
+MISC ChangeLog 45311 SHA256 f67c793ca61e2d0c6292e021080cc61de7c7340c84fb73b5101c98d4423ff9f1 SHA512 6c5eac753ddd7e01fba27cbd595bf2b7e9707e6252f99b578a557a13b6cf9c265e8c25d733dd3e866b85732b6ab4642f2344f5121414326f611ffb99914ae309 WHIRLPOOL ecf7ac62a0bb3e1c2e2bf66ed2269b530ae68f060b8272c905901b668f9c7dd837e01b95540e0ca1448dd465f14c8104620d30661423741fc461b4e594c29d44
+MISC metadata.xml 1423 SHA256 e4b1b2dd0f615c80e227a4c0d85cc633006264906ec24ede10d4580644029acc SHA512 e86a3f92c6df0d0de971ba70cd84a8751ec7b5df07eaaa46ac87b87f0292c334712e2263b06a5daaddfebb4bb07aabf7b85661ec5a6ed17c07ade5d424dc5181 WHIRLPOOL af2a48984b17c492b6c7cfe1d1021064457a80ba787a2942d207654ad73cb24c20f0164df184aec2852e9b58bfbb030d9380567f196f59061d1dbbedf98dc432
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplmAACgkQkKaRLQcq0GINRgCcC1UMtvPiFcXQyTbfNMsGTLxW
-WfoAn3P1M7Poj0wrfs9wke2Ahs/gHc5+
-=noKt
+iQJ8BAEBCABmBQJVgZBgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9w5YQAKFF6dnHq+0ySiFm2u3oAU8c
+ABXmhcEAt7gcl3s5a5/6xL1HbSuW0dLeK5cgr3ETvx74QomV9fXyV1sSHgcgb2yt
+CixWyrE29v96o+AZUfcMCVIO3jWbJmHW/BB0HVrw9ESeq5NRIEkzyt74WcKfntKq
+IjoLA7ILcv7vJxVsGxRbm8Fc/+IZGw1LNWuAI9YCVtN0xxBquIZUrkOMMYqAMO2U
+dYSjkbPw/uSzbIB3YBxvgf5KT5tZUwXIsUtHQsbc/WEKobpDduZXGQDAr/uZ95C0
+DwMTf+hneoCXcG7yRXDDS2srF3i0C6IuGy8K/E1aBMJGn74rElS+XjsXCs9fCucN
+7SC4t2afvJmPx/vY8ueU3naWQuMPzN/bvnr6Cr1tFGFVirusd2wsOp8E9LDpLFZB
+ckjP0WXgrUSkbS74dMBj6Ft6EPxoUjSP8kyOVzWsjwur6AdIxcDqrAJjmi33W38g
+audSwkiM5S8U7lvIF7ujYn3tQ4jqKAq1lTWZpvlllcOUMZw0CSYBEqYk8FWCCXXE
+A3CqnarwNjBRrJgglX4c4ML8NEJsxUQ1yOM+iAWhMxeOoP6By6wEVEBuxCsl7edT
+etgy8fhnpF/BiUxolZjtdQtv1xNzwiN7uum5GfG1z7x84N1+HMmGRNr+no+xY/wM
+0or307wd9l5ceYuMPInJ
+=Py3N
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
deleted file mode 100644
index 35c453873d6a..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore" <rich@kde.org>
-Date: Sat, 21 Feb 2015 17:43:21 +0000
-Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
-
-This fixes a division by 0 when processing a maliciously crafted BMP
-file. No impact beyond DoS.
-
-Task-number: QTBUG-44547
-Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
----
- src/gui/image/qbmphandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index 21c1a2f..df66499 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-         alpha_shift = calc_shift(alpha_mask);
-+        if (((alpha_mask >> alpha_shift) + 1) == 0)
-+            return false;
-         alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
--- 
-2.0.5
\ No newline at end of file
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch
deleted file mode 100644
index c0ea6c2ee76f..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 13:34:01 +0100
-Subject: Fixes crash in bmp and ico image decoding
-
-Fuzzing test revealed that for certain malformed bmp and ico files,
-the handler would segfault.
-
-Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
-Reviewed-by: Lars Knoll <lars.knoll@digia.com>
----
- src/gui/image/qbmphandler.cpp                | 13 +++++++------
- src/plugins/imageformats/ico/qicohandler.cpp |  2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index df66499..8acc593 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                             p = data + (h-y-1)*bpl;
-                             break;
-                         case 2:                        // delta (jump)
--                            // Protection
--                            if ((uint)x >= (uint)w)
--                                x = w-1;
--                            if ((uint)y >= (uint)h)
--                                y = h-1;
--
-                             {
-                                 quint8 tmp;
-                                 d->getChar((char *)&tmp);
-@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                                 d->getChar((char *)&tmp);
-                                 y += tmp;
-                             }
-+
-+                            // Protection
-+                            if ((uint)x >= (uint)w)
-+                                x = w-1;
-+                            if ((uint)y >= (uint)h)
-+                                y = h-1;
-+
-                             p = data + (h-y-1)*bpl + x;
-                             break;
-                         default:                // absolute mode
-diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
-index 00de0c8..ec1654e 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index)
-                 QImage::Format format = QImage::Format_ARGB32;
-                 if (icoAttrib.nbits == 24)
-                     format = QImage::Format_RGB32;
--                else if (icoAttrib.ncolors == 2)
-+                else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
-                     format = QImage::Format_Mono;
-                 else if (icoAttrib.ncolors > 0)
-                     format = QImage::Format_Indexed8;
--- 
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch
deleted file mode 100644
index 3b9daa56b66b..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d3048a29797ee2d80d84bbda26bb3c954584f332 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 09:00:41 +0100
-Subject: Fixes crash in gif image decoder
-
-Fuzzing test revealed that for certain malformed gif files,
-qgifhandler would segfault.
-
-Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/gui/image/qgifhandler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 03e46ab..8d8c4ae 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
- 
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+    if (out_of_bounds)
-+        return;
-     int my;
-     switch (interlace) {
-     case 0: // Non-interlaced
--- 
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 2800cc4a9dd8..ce6b0b5326d1 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -8,7 +8,7 @@
 		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
@@ -24,6 +24,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.4.2.ebuild
similarity index 75%
rename from dev-qt/qtgui/qtgui-5.4.1-r2.ebuild
rename to dev-qt/qtgui/qtgui-5.4.2.ebuild
index e6ea648c50cc..bc349afba193 100644
--- a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.2.ebuild
@@ -1,37 +1,33 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild,v 1.1 2015/05/16 18:51:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.2.ebuild,v 1.1 2015/06/17 15:21:03 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
 REQUIRED_USE="
-	egl? ( evdev opengl )
+	egl? ( evdev )
 	eglfs? ( egl )
-	gles2? ( opengl )
 	kms? ( egl gles2 )
 "
 
 RDEPEND="
 	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	media-libs/fontconfig
 	media-libs/freetype:2
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -41,14 +37,13 @@ RDEPEND="
 	)
 	gles2? ( media-libs/mesa[gles2] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
-	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	ibus? ( ~dev-qt/qtdbus-${PV} )
 	jpeg? ( virtual/jpeg:0 )
 	kms? (
 		media-libs/mesa[gbm]
 		virtual/libudev:=
 		x11-libs/libdrm
 	)
-	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -63,25 +58,20 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? ( ~dev-qt/qtdbus-${PV}[debug=] )
+		accessibility? ( ~dev-qt/qtdbus-${PV} )
 	)
 "
 DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch"
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-1858-1859.patch"
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-1860.patch"
-)
-
 QT5_TARGET_SUBDIRS=(
 	src/gui
+	src/openglextensions
 	src/platformheaders
 	src/platformsupport
 	src/plugins/generic
@@ -109,7 +99,7 @@ QT5_GENTOO_CONFIG=(
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
 	kms:kms:
-	opengl
+	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
@@ -125,7 +115,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
 	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
@@ -135,28 +124,21 @@ pkg_setup() {
 }
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		$(use accessibility && use xcb && echo -dbus-linked)
-		$(use ibus && echo -dbus-linked)
+		$(use accessibility && usex xcb -dbus-linked '')
+		$(usex ibus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(use gif || echo -no-gif)
-		${gl}
+		$(usex gif '' -no-gif)
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index d9cbcbdbcab0..90b4468046c6 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.46 2015/05/30 10:54:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.47 2015/06/17 15:21:16 pesa Exp $
+
+*qthelp-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qthelp-5.4.2.ebuild,
+  -qthelp-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qthelp-4.8.6-r3.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 900926682861..3021d20a91dd 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -9,17 +9,29 @@ DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD qthelp-4.8.5-r2.ebuild 3226 SHA256 ce6d555b4ac668f9091ba77018041a998b25fdb0420c9f18bf7619d07e992e96 SHA512 1adba91e6c3cfc9bc5f668f3bb777c31f725a3f9960159c3b0843a6336c5ae29feb74afedab6c783793213fe870a0ce4e46ef137e20de1c5a89d7fbe2ebe6806 WHIRLPOOL e2635722fa8a4aea7ae970dfc5bbf9ef4d31753366136c144a700e38c4ee3d94dfe001bc95d737bec2a27039659d04ceef1b19690c762dd7ba5fed0c2bcb6e72
 EBUILD qthelp-4.8.6-r3.ebuild 3303 SHA256 73a38c4b1f4f1140fe9bb1884b440260aafa18605f4809b19e48d2041da3f8be SHA512 7707df6ce231abb09924c7aa36829fa4a3af70a7e75c60a332ff2c64e49ebaadbf416606e7d98e4f7099d453baa1dc422a9fe8743c401147f5e2dcfaadfe1a05 WHIRLPOOL aec4bc466cbb58c004391c23652f4f1dda2dd67d43f99b0db63d82f07ccebfd1e587c66f527b1c5fdc826f3ec7ea35fc0d8a474bd23b2e7a405b44f38677f3d7
 EBUILD qthelp-4.8.7.ebuild 3274 SHA256 8f2da17516a69796d30676736a938683282dac7036cfe16e68c784fa6545b9e5 SHA512 43dafe80eb90a3e20df8d874c3cb3a2407460a00f6bd7e6810d795bab3d1fd657d4b97824d17dd75080bde3b98232f7da5017e116ad87bf46637665328cc0375 WHIRLPOOL 50a2424d3d09f3cd99e542a20edc254c726cd63bf54a8032e293631a3857e43aacad91d751976c3a365b0a6bd8f3a807efc393788fe6338d844a0e559d50de3b
-EBUILD qthelp-5.4.1.ebuild 805 SHA256 491748fc349f9363cd57656e52654c9358a7de84f45c10c2c7a4588be96ed6ed SHA512 b4fef70b78c6474dea5014660f9b06e700b9a075d1d05e0fa17b7ba41e573d15d75bb8ef241a51e11104fe8b1ebc1f7ab7a08f5a017b98e135b6eefa425b9d54 WHIRLPOOL 417b77354e2b72164d79133913c0c6e281bd0ac8e3bdb8bb620230fe189974fcfdf4cc2fd6ec286884cb60f55e06b33ba638f409a8af0906de7d87017010f8c8
-MISC ChangeLog 28141 SHA256 4af1c75d4fdcbdaf04d0ac3b35155c0a7512f11e3c800c83f5a637690a759551 SHA512 b9f1ab0d64a5eb2bfe3832d8ee085387048fc9c2ecdffb00d82dc196192351d58011cd8bcb079ce011c93b07a9762de6d4a2890b10f9f4d39a3bd189c5a40d82 WHIRLPOOL a2239c04a51f77daf24901693bacf4126fa5213da64bb651a8aabd1038994c8854bec52f99d97beb21ce3e756a1515e7d27f3de4c899387e796729969f130b0b
-MISC metadata.xml 619 SHA256 a0279b54456f15f87f3ab0eab4f541e2273a76eeb25219e7810cc0a3a379953c SHA512 c5fbfbe51cc9ccc483f3472fa616ba62c50ab83d731e7f91917cef5fc56cd3d6afd13e250e8b4ecc3f2faff68053cbed79290363c5ac16c9a17caba1c98cad30 WHIRLPOOL 5d509445f34c0cef9ecc5ac0dc3b2f1e54c725682ab1bf0d465b988de71c6c52a30b561c0923f2885de375385b9be42e8c4288cdeb5f1bde088851d317768c03
+EBUILD qthelp-5.4.2.ebuild 744 SHA256 d1796fc8cc7fd8ad40a85208aeac772365e9cfad5f3b764ee59fddf4a6e6d61c SHA512 59ca11dfbbea04d227f3cf63d2ba90a0950b27a18006c6cbdda2ec2fc1bce3160ad23e423f6b431084518160202f50f2663296292ad0f385a7b12802f0d2a889 WHIRLPOOL 1e1dc77e203a0088d18c070aa6a14f1e16922fccbbe61ddcc1dd4bb9d2de0b2ee94f921d335bfbce381698d1facfa8ad473a467d50c117f8ee91247bc6149205
+MISC ChangeLog 28295 SHA256 85b92c3314fc98e53aa262df50dcd0f5486e003cd360fdd9aea03eedc235855c SHA512 007c92a05259e5489d623d3799280292c9ec8438682b25045b3413347ed29ebe59879a2c8c86937aefffc934360d7b7ab2fd0f73c30ce9a5c056fd70dcbe63be WHIRLPOOL 966d224bb208b44b91038ed3e302add05d109df83140d320e3acb195a2850c9172cbf8c5d3adc5f7bac3b12f9b364a72dca2f770aab9019cf5cf14e9e48f09ee
+MISC metadata.xml 610 SHA256 6c1d02293bdea4976334fadaf6736c6aece43cb4c286b1f0350e38a5de533837 SHA512 b4e6b38841f86587ae7c3450b9993bc80f65470846bca9024badf7f0672f2827e1c02980c29958018aa6afb606542af1bc2567da7fe78c644cec08d27b7881af WHIRLPOOL edda7d4ada17570f9f7eda461c8de1de8c3b8b12f315ce7198a18f4cd2f3ca530d3fac2bd6ebac579b48ed96a94c60b5818579a0f3b6f861c170517c9933f6e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplvEACgkQkKaRLQcq0GKX6QCgmKEt9NuXTTzSfyg6Lb9MT1IC
-mMYAnAm2UETL5MV+kV5/K8dTOLMNb7L2
-=ICVy
+iQJ8BAEBCABmBQJVgZBtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9GGsP/AjyImCrWF4/FP42t8j8dgYC
+nXpUbo+AsWO5yoLf471cEhu1Mc1bkZmqPhixbKzVHuLrum7UDgxednRBlaRVy1ZH
+hRvPe+IGYxChA3DubSuqZhWcoNYPTrFUGr+Exg+mXiwvXlCy5KRcwhVtHUpf83Ry
+J9Pi4bKYkFsW9+HbxYK9b9TdiqOw6tNPtG9x7rFJSxAjrrwjjm/l9ca3nBxHe9tS
+rBhlPlyHBWl1ZZ9eGAbF4/0Di/FHHYHUY2U5Nb4pkrDCMKh6GgxWScahRbWSfhna
+5zJsy0vEw9TS04xakVasQI0dCeMz3Cbcp+7fIDnFfpLQ0hlzIh6ssm9KkC0wSt8a
+nZTqQmzT8rxlLxTz1rWPQ+GGKv0+oGL9S90XjJguRkugCUeO5dkG4CNQUZzwKnLh
+sTknShzBgpDNXDiQJL3Qpwhf/tg21eeiY4MLHPUEUu1dmZGrZNYmDi44R0O5vU1G
+ur3Hj+5Hw5yNe4iPDHUZUGzfEGYBqu729o3PA3I3LcFKZzAOVIlx/lGJIwSa6kQJ
+1a4lgbC+llNlDgFZq1cBoZby6/nz0Wgst0VbsH3n63gYOV7uR26RlGujJqdkdXMX
+hk5dcu+BIrxn9M9GDQaCnYB69pq7Jk3TWs4a6DgFb8mdpuiheVvJhCW8CCf+3DsJ
+hwuZwAKpUWGvbkWWsDqn
+=g84p
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 3f6401cf4223..3c78bba70f89 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qthelp/qthelp-5.4.1.ebuild b/dev-qt/qthelp/qthelp-5.4.2.ebuild
similarity index 56%
rename from dev-qt/qthelp/qthelp-5.4.1.ebuild
rename to dev-qt/qthelp/qthelp-5.4.2.ebuild
index 2ac7d032d883..db370eb717d9 100644
--- a/dev-qt/qthelp/qthelp-5.4.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.4.2.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-5.4.1.ebuild,v 1.3 2015/05/16 10:30:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-5.4.2.ebuild,v 1.1 2015/06/17 15:21:16 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="The Help module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtimageformats/ChangeLog b/dev-qt/qtimageformats/ChangeLog
index 0c7dc75bde4a..3d8b0421674e 100644
--- a/dev-qt/qtimageformats/ChangeLog
+++ b/dev-qt/qtimageformats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtimageformats
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.11 2015/05/16 10:49:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.12 2015/06/17 15:21:23 pesa Exp $
+
+*qtimageformats-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtimageformats-5.4.2.ebuild,
+  -qtimageformats-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtimageformats-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index d87011e675a2..9bd65725feac 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtimageformats-opensource-src-5.4.1.tar.xz 2108976 SHA256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f SHA512 5feef279c6c9683a55fe401e7221f1fc91557028751b603c2051f08757f758a48f3f8294847e473d20599bf9bcdad355eecbd9fa7a2bb7fd5cdf79f4fee49120 WHIRLPOOL 2d78fc5c4b345fa4e7cd559feae50a6e73bf536ef42f0269511ceb7fc3a0c83cc49b19f1dedd8abf03a7378a33de0b7dc2af759cf6369b8322ed973a030cc31c
-EBUILD qtimageformats-5.4.1.ebuild 622 SHA256 0351c34fd244593dd8cfe33534347c6398a981e1ab74da1ce341a9a9498e6bde SHA512 354c1f76325654bcb852b0696911abca811256f974500b6c11f585e4b1b63abb46a4e41eef8063d37c56bb65c8a55297f2936346ef718cc2c95d71e666baec50 WHIRLPOOL f54bb0fcbfd2077f4780d715ff563a2407664a86688e7a0f79a55b9d670b3c50e7641bbba65f0f0c5e5e4b56c7237f8a4eba9a03b86d8562423782810802a1da
-MISC ChangeLog 1568 SHA256 f183066b81a17c2eae4901f161ddcc2c0961fc039b11865670e50f8dd66ac367 SHA512 3615a39a43e9bf674793d54c2abcbd9ffbb04dd326377fdd56bc6807cbf45178702ef30c9b6946d2313a6ebd15d90e2d5070d3674120098efc55f08e35a62062 WHIRLPOOL bc90b1c41b7f66c73e2a2081cac64ae0570678da75ec450ebcd99a14bbc824bce1c07ccbb2f52fcf0514ad46eb078ba4f27aac07a5503831f132cffe3163b27f
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtimageformats-opensource-src-5.4.2.tar.xz 2108112 SHA256 8b2b25a29259bc991351fc88d07340d481dfb2cbb450be831d31977a9334deda SHA512 8c0531cc981dc36c88cc420ae5ea9e069ffc217fd3ea3745e6956cf547e17ec8fb244ce2df1735b8b6b750da1f70925956dbded457f8c7f820db53837efbaff0 WHIRLPOOL e183c8c83d66bded1b884a005f4297e665e827512430a0681f615f0fa31abaffa216903be9afb21a6a792317b8a4f1635f332d821a667b6d2092870ea5fde67c
+EBUILD qtimageformats-5.4.2.ebuild 585 SHA256 4ec14521a7d61867b5b441312cc975f4ceaa3451f6a6b56d4c3483f6f886d87b SHA512 8fad89514a773665904749b16a53c4aadb29a3934b9e8eac19f300e26df95d43a7b698605ee5c310281365d204e0d923935a903f1eb390d88c119ebef10e5a4e WHIRLPOOL 355ad6155f8f73abf836e9753a4dc70c73bcb2385225ba1b0261d9e716cb31585fa05f08a4afa21960994396d2a8e609fe2f3bacd6576af9e43738ac3e8221bb
+MISC ChangeLog 1749 SHA256 4e55dbf10e8820237f665b0d64ef54dbfba3f5b191e0be6a5531e6778eca9b7f SHA512 a6f41a38717dc743cbfb29dd6805b9a66e6edb7b0da89d9f5027bd311377d664080b5a638fc7a2d5b95ca635b70cce084fef9f8e329f6319a95202c5c1f17f26 WHIRLPOOL 40509410409b1f455bbd2c201449a5cac9edcbf734de1ce1b1f57a9f734571731881db365d7da6e8febcfcaab34ae2539bfac2c37c0f3d0077dc117dad5993fa
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXILwACgkQVWmRsqeSphOA7ACdHokRy18H3jH+z09Wdpkpk59t
-b+8AnipvjV77r5NiX9KCrDAAPdJIDOlY
-=yyfj
+iQJ8BAEBCABmBQJVgZB0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9O8AP/0NiEdtX1l6KwNRSSIprp+5q
+4Qo1NiSXKJ6RiwpccMly9e/IthIP7/6x1HTT5ytIAbRXwraR93A4jSI3FVQZ+ZS3
+IFn+FaXMDMqv/nDe8EKducflVP17i9wI8i5W9anzwoD9Q4vWR0gvFdGwf2EEcCiN
+LQSPCA8QzaJnUBAmz26b1gOsUDZmV0kHrNhhqBmqJqbohLhppdAVvuJ0/e0YOUfp
+AAttY8B9wQoVjPNFKf3J4fxqRVsbRPUUYFzoj1J60ptC4W03NAIgMTF4MWf/ALVX
+n/1f6BUf6eFwUF9IpkYQDXe0D513pkJ1HMKFBt19Hv2o7s/gP9GFVb+HFmdIEZi5
+fVJ4UvPz2YBg1G5TRXYuITk5i4Ga3nEU1Yb11XJysgWr7Lrrv0pMeh4gZSXuhPpY
+r/8uNz2wOY/Xpk4P4BFuVz6Wuegbl2C4QLqxV7WpPLRSgZwXEWUdplwrpT03p4WY
+xNi74Zbs/3z3A/LT3p06BZiUnuwOdERgTo6TWz+JBFG12kwTrqq8owmxsAj5PysF
+iB3LgfuVvKaNbTNTBQRZg69W6IP9w6cezedbi7qwr2aBY0KO1VS/RCdAYRQIs2Eg
+Vs7VrKPLXf81cETFjc9V35WpZQHCfS47aBu1sohG5bUk5nfhyX1TvfQnUUchqSBe
+QhvMD5otQ1GPTufVSzBV
+=bwvz
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtimageformats/metadata.xml
+++ b/dev-qt/qtimageformats/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
similarity index 69%
rename from dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild
rename to dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
index bfa9c17b8124..b6ffafd53a16 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild,v 1.3 2015/05/16 10:49:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild,v 1.1 2015/06/17 15:21:23 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
 	media-libs/jasper
 	media-libs/libmng:=
 	media-libs/libwebp:=
diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index 4657b7aeff0b..2efabfdf7613 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtmultimedia
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.30 2015/05/30 11:06:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.31 2015/06/17 15:21:33 pesa Exp $
+
+*qtmultimedia-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtmultimedia-5.4.2.ebuild,
+  -qtmultimedia-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtmultimedia-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e1f08fd69136..82b3c1255f4a 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -5,17 +5,29 @@ AUX qtmultimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33a
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtmultimedia-opensource-src-5.4.1.tar.xz 3184784 SHA256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e SHA512 b4a71c86c6a4978509c04bd733fb7c911f3bf309765b726462f9d00ca7a6e3304e80c53b3beb4ffe4c53f53691121e092408142618cac80e1abd6b0106552d28 WHIRLPOOL a462f57827f45cb7078207826ddc0f7fefedc151f47865691129a759b970729a9fd61582212a9211b01583c0c3b94a03afdecc3aae39c59fa6bb51ae4adfa814
+DIST qtmultimedia-opensource-src-5.4.2.tar.xz 3407336 SHA256 d2668c7922412344384482239d34bee66d8ebb6d9fa9d025cc4a5aa990664940 SHA512 8d8757ff9d9d736618cc57e0872722668b6f2455ec194a700dc03a352a9bfbe90135f06fe05f3aeed2981d837b6c9cc338a8d6cc25f5f253016499244ca873d2 WHIRLPOOL 8bcda95d8aba5760a8270d90a46482cb023ec15d7bfcaf4c33591037a5353b8f3d3d3177aa2e794163c48ee571ac98679c3c3e166e91d14eecb0f28a267d529f
 EBUILD qtmultimedia-4.8.5.ebuild 1515 SHA256 a1386a7472171b861981f04e7c484cce090a87efd5c08d73557135bb03e50067 SHA512 6f5d7ac5d7f90c1eac874b286d4fee243caf5456b8ca1b989c4e2ba77fb4816cc85d7dc28f6071eb2cebc651ef3f708dd8b918dc5346d24944cdd0a98230703e WHIRLPOOL 3be8a10021a17b8022e446409f6022e27d47b6edd0e765871f5b9e5c194fb2c9ae6ba3c26262beb82f553c37a908346ee255fc121db026b1eaaa7e59b319364f
 EBUILD qtmultimedia-4.8.6-r1.ebuild 1407 SHA256 74d6158b08e335da2c911973f59739b428300e047f3f6024bf7928ba7ae56b8e SHA512 6f373507dc528abd7b9b075d6b39ef0250a70e58f4f769d1138bf6f3f4466b688cecbc253e11ff1ee3e2497a6ef46dfcc911c7568bdd4ceae06df7d0f1474f8f WHIRLPOOL f72e6b2cd9cd4e0849f1b0d5d58f9aaca463f9c0379800e4cef1a4ed709503dc947a4384ebc9c002a46197ae01a471e25a19bb42bc647ba7626db93c295845c5
 EBUILD qtmultimedia-4.8.7.ebuild 1378 SHA256 2115ddbb3d4d1af765df1ca19416d0bfde1be6beac2d430e675aa0acb7fddf76 SHA512 2e46c6a4ae6269e639c9dfd59248d0b3c8cbc8d3f734880bc3e12c6b09d0d127bb6f083db14b2e4a6597cb4ccfa793d28c09403d7b1876d5e6614672d66e6c6c WHIRLPOOL 851678e341dd070ac78933aa192564b2ed2fab3c3fd0d99bc2bf52069d30c593c2774d4fdb620f84124e14fda3165504967fe3426505e0402cdeb3e05ce6778b
-EBUILD qtmultimedia-5.4.1.ebuild 1532 SHA256 93ce3da5534f1ff0611b3e00a305ad1551abe13bfc67f2a83989d6cfab9f1c65 SHA512 4b3a9791b3757b05f59ce737ceb68b4edffd791fb8722cac89cf973918778f0b90bdf7b95d50c5cb6a9d91951dad5fe141a7a3ed035ee600d25643c8546940ac WHIRLPOOL bd6d2e4aedc51d20b2943c20b69702a5e29e03950b92544841733a1527491ee6f1ee0ae2598aad6793a2486dd0e347f299b333360156db37559c00e6c2cf4922
-MISC ChangeLog 13119 SHA256 5a873c4e056a7a13eeaa648ac8a3a2584c18928c85c44807132e1a733b210ee4 SHA512 567ce2772934b0c0f5169e2180018665e0834c8d2b6a0216a1fdb55b156631fd75caa9b48e6509cdb832345f2c834ed1e9392285849dec73ec12d3d77e69d393 WHIRLPOOL 837a5a306e03cc4737e3c1e528fd70fc0ce7194631ac6737b1edd786137a91cb3acd9ddef0084dedb7b05a86ded6b5327bb7bd0b0d2cf781f8d15b23a903c0dd
-MISC metadata.xml 547 SHA256 18ec86464a544c7e119b97d7ef40c216998e2f7ee3dbac9ccbfadd5bec801d75 SHA512 c657463a3ac93b9c57d403ca68a71fbd8aedaaa81a3da7a685018aef0d39b6780f7755c3af4b82a2d7c68280ded66510b728d29ce10ca1e83119d3314f22422c WHIRLPOOL bdeb48c61775aa2aaf8e0baf3cafd0765b7e656e6b4058b3ec23bd559c32582776c4c5920e312e30e2be1257c25fc75b4c6aebb797bc0802c3c9087fd72c7f8a
+EBUILD qtmultimedia-5.4.2.ebuild 1350 SHA256 041be5ce862c9130aa167818bd44f48589119884e6608a279594b96b31f9e6bd SHA512 55aa8123d48283bc7a623c631ab81a5e2dca5003de63615f0a3b662933adc9a58d613fbff588ff0dd77744858691c42abc03c785aaf92170f268f74419594a46 WHIRLPOOL ccd7805b490c5ab282bcc5fa14ea2172bd66936c9789839066bab4c4b9a73b64c7d4e5c3f615703ef70e344456101191d59654e6b461c036659c48ebb4f5c7e5
+MISC ChangeLog 13291 SHA256 27aa48a63f59015a4fd3ac3b49866e28bf9a4091e44163fbb32013b2fe587b19 SHA512 660f05a9603f12a250cca7252d19b87189635cc638d9c6d16c14383f682edf76f53bc238560040d473b5bdca639f471990cb4df388c296ac56f1e3cac1ebacdd WHIRLPOOL 46a8d4d0abcb4c6a39f2dd02019d06db9e06a5681cc812f908ad27cc02d2a583e91b7aff2f71e5cec0719f51b9fdb86ba255ba0cc68ec2d18cd56d1fa8a32575
+MISC metadata.xml 538 SHA256 ab99738a6b9fe51b40ade897728d65e25832b1c23cc1fa1487bb5a52ae31a6c7 SHA512 3184aff34804858095b809dc1b5f75fdd5af0909cf28d9a2892e7158cb0c0c8b582932c3048304b52303e8cc81e105123d4eb0cabf37894a53ce9eb39d57f5e3 WHIRLPOOL 0f85bae3f7af461e16dee4a7b4ad9996cf3bdf3fe6723277554020ae340b288a1bad9d6766606869f658f75270ff9cf168a0c4149d471eacf4dcf8ecc2ebce7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmaIACgkQkKaRLQcq0GJgFACgmon1hSbbpLTiLLCfMgGGShYr
-cO0An0WUkrW7FB3Z5n1D7Y0F1BiVzIH0
-=5IRv
+iQJ8BAEBCABmBQJVgZB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9mOcQAI5PtbBcAPSvWd8kCi5XlVx0
+d4l8T4Iz61cnQjDfBxao02AtkcYyInPw4VEyWxO5SPdpalD8t7YNWFxk0jRzT8fi
+nCRunM8SEhDE00VeSsP12bM0M8ezfai5vLkAUD3qZKOS8IzdhVrOfjIxdgkcCLHY
+4rqzHf0Iol7D7lLFpH3++VcuV6OQN/Lnmzx3hftSA8jLrbzdJEckCI3Td3LeANgg
+eUpt6uHsiFe1vo823KOfoJzcJFoXulRnkCDFZJcUutGqY5mTc37w1swWsEi1S2sS
+x+OItgMqdFWwg0fSeE+H6VqWEYzQd5e/eiBt7z+ujwGIENqH9uwUulchNjPwe0rG
+KBJumfiWjPY7MhYlHpBBnOPS4iYC8jX56i42uyaCKpq+Q9verhBd7675M+LaboZE
+XmbYr9q5yrtReoDRFNZ9GHAOsj3HTGPTTYDEAgI/DzZNr+JuT7Ji3n2Xm9Tm3MoK
+c6uVFmb2gc4rR3EXyvhRdASA3FoO60b6/RLfiRQpCGswwoMsyg7nywyNXNRqe/uO
+jk16+TizoVrG8/z6UtePRKEDq01GGBeOo88kNma6RUXIzY6LYkNCstdFppDNXgaY
+248EpiJyKlG1hdi4itBIdM2Wpws494jY4ysS7z1ugCzLgNxO1fW3bNh/t0gZ+RWW
+DlicY7crjzOCi5FAt6MS
+=LvQ4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 0f8335216376..b408e5c69af4 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
similarity index 70%
rename from dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild
rename to dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
index 3847a9b3a543..12524c806962 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild,v 1.3 2015/05/16 10:38:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild,v 1.1 2015/06/17 15:21:33 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="The Multimedia module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
 
-# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
 		media-libs/gstreamer:0.10
@@ -29,13 +25,12 @@ RDEPEND="
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
-		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		>=dev-qt/qtdeclarative-${PV}:5
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
-		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+		>=dev-qt/qtwidgets-${PV}:5
+		opengl? ( >=dev-qt/qtopengl-${PV}:5 )
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qtnetwork/ChangeLog b/dev-qt/qtnetwork/ChangeLog
index c2737088d1a1..25f1a14baed8 100644
--- a/dev-qt/qtnetwork/ChangeLog
+++ b/dev-qt/qtnetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtnetwork
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.17 2015/05/16 10:20:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.18 2015/06/17 15:21:41 pesa Exp $
+
+*qtnetwork-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtnetwork-5.4.2.ebuild,
+  -qtnetwork-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtnetwork-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index e2a1f219f13a..536e23a14da9 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtnetwork-5.4.1.ebuild 1249 SHA256 e626a74fec5580fbb821619ab841a68cff05189a4fd9c8f54646b5f5653c25c5 SHA512 cd0a5a19f7dea439113e0ddb4f6620ca12f741fa47151d0e2b4c57ad4a0551fef231c464d87ca7aea0c9d8e6f460d649fb30675d32cc98a447ca78c552783bd9 WHIRLPOOL 4623b7b8cadb7a4c1bc5b24d8e7b05cd9ae4f81e0094161e0ef7eb0aa58c97d45f9bdf6b3508d55bdc7231ef0081b41bb44b3ac4b9ead4cec7ee6fd5108a69ea
-MISC ChangeLog 1978 SHA256 b36e169e6df14a737f8938c2248b107165b13071f04a51455fa1442654fc4358 SHA512 78791aee8adb96a60ccc05608f14a540b9d2059fca6cfffbe29908eb48ff29343200c1d8d5e7bc160c42029e21c8daebb5c7a96af1f46620306d5abc56ba207d WHIRLPOOL 06f4dfbe3eab04f1b8a3863d308ce099918bd96e86e808144b61283c6160542f640af02eb51178d7601028ea5211a79d3dff7d0516b1f92960278f84a9d2fa76
-MISC metadata.xml 551 SHA256 9c7cbd328665053dbaa7413c7f88115de6f8470243e1dbfdf9ae39b5ac3b5df4 SHA512 e7a1721db202c7ec0b7dee7e3f2e49719fe89fc9bd3c85a4586cbec9dd6823e4344e64a3ef40c7203f1bbc1e67e8e881857f44edcb1880d5a3c970c84bd96c16 WHIRLPOOL 54af70162a44b6f3e7fab09b01d88d83c17c77e977b3592944d2bdb0335a03fbdaf35ec19697fe014456cc6e4de0db09310456338ac8f7d5e5890029f8ed99d8
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtnetwork-5.4.2.ebuild 1211 SHA256 7f1d6188f7593737ccafe99a13efbe5e1641f95ed98040b393dd848ed86b8cd3 SHA512 03c43bc57c5327758211701ee461af61eb4ed1eed15432900a0d4ce380e6a8bf28e9b0205202adda09b2615893f48971cffb0db883fe300083608c8449e94311 WHIRLPOOL 41a49c8769801a33dfb445e4b9083f242af8828421c13866cbd38f09e65cb22ca30e72f965b8d83356d8307b636e5f0f0ff23e77be71fb885b2f26d3c30af6ad
+MISC ChangeLog 2144 SHA256 7a645f7bc2fc60d96d9cb8eaa99415f2f52424b237962f31aab15211fea0694f SHA512 e5d35035b9fed93fe83ba7cc585d5a95b61958e5bd5351d7c67c952a392594e2bb21720e15cd1d2b43753fff339d74b248c550891ff82c3a506f2653a49d6c02 WHIRLPOOL 44554447b65fb2176788457da63400d64ada180bc9bcc554fef317a1740eb86824db2dce58e7690a4c4095daf914146869107a043607de3a6b099102ff96d4ed
+MISC metadata.xml 542 SHA256 723cc03b47e56637470d231ad01831a12e9cdafc4bef0d58483bc2d0159fe9ab SHA512 23df9ca49ca18f1df7b91be0a99530121df34cc2c13989f2b05cbd490c88843e52fc7b50b4949c5aae25a9242585d8b4fb3f9535c24163c76229c1a19f591055 WHIRLPOOL ec2d4a4c2ad96a917e5f585b0aebce651fa1d6b2ebdb6e77cdc1a08a64dfbbf3ea80422108dd73801cceb88df7a1a56d6bd54ed73c08fa2ddf0fdfbdce9599aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGdgACgkQVWmRsqeSphNDewCfcfwcQH79ZIQ9I+GMkye+V1n7
-+mMAnjB64eJU0yl8rtvxsyhzUApbSPWc
-=aE7G
+iQJ8BAEBCABmBQJVgZCGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV949MQAJR4eeQiLlqiDBQ4Ndat/Muq
+BihDHuDpjp4N2CYmzjfDCXwvUR2399o4nLEqhtFSJiBmvEDrVSwVMNliA8BxpqDI
+ojsqu3cOJQr3EiNKWbIiI/cPk95d5KTFtt9a7Wkdf9mlYzlzxFNwSVkQqi0YfeZR
+HfQ380pWe+blV3WH5+QdLV2G4bGEn9ba+yghtRtHFu2gg6yxHTWUttKy+QO/ba3q
+V1CmpGL5ie+tU1sV+t2D05iREQGHEZqVEOoJUrQH0ObT6/jsNbtFW+zLGVN/ilJ4
+840/bEZI/2zU8sxpw+3ovDXkDNrirGLbYu1J6x3DVGUIJRDhwHNPa5LLohVkp9wz
+VHv8PDEyM5Ki7OiUkr9nLRjcXk3WIlYdfHxN0iD9P3JPV94PY4VFEvYamxe8viTH
+UlLsTpSoz+7aesRhJhcWteePXfGSBeQ9WXgax3ICWJ4aSlvlFlfsuwditAlFSIRJ
+oiZIWXHTBD7RIXHd9NMr7Fj+ndv37LPyG6E0uO5vMURE28X2Y8dYKyzK69Vr2lNb
+lX2M3RbbIV8UywN1Stesl4tWztFKg50lmqCdlIBTUEoYDJTetwQTfpmsCJXsv0I6
+Ffxd+dg1khu5u3PQ1a0t/LlY+Jlqi0KGZRwfWjMoQEV6xieVp5ZPBfzJUuqhoMpZ
+C3h4Hxwrja41kPfeqxdE
+=NuEq
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index fb2f58fe451b..371b3c0d935a 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
similarity index 79%
rename from dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild
rename to dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
index 6cc0fe4473b3..091183e3d6fe 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild,v 1.5 2015/05/16 10:20:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild,v 1.1 2015/06/17 15:21:41 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="bindist connman networkmanager +ssl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	sys-libs/zlib
-	connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	~dev-qt/qtcore-${PV}
+	>=sys-libs/zlib-1.2.5
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
 	ssl? ( dev-libs/openssl:0[bindist=] )
 "
 RDEPEND="${DEPEND}
diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog
index 4fbbc95380a9..edf65d83c733 100644
--- a/dev-qt/qtopengl/ChangeLog
+++ b/dev-qt/qtopengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtopengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.33 2015/05/30 10:59:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.34 2015/06/17 15:21:54 pesa Exp $
+
+*qtopengl-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtopengl-5.4.2.ebuild,
+  -qtopengl-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtopengl-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 672c62862e85..937c2893fd86 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtopengl-4.8.5.ebuild 1433 SHA256 75d5b483dfe2fe09532a61ffe907760f9e7bdeb56750a852bded1135f88f185c SHA512 7e99694d0c783e70e9bbc001a6ce9703a6cc838c1960f7ec9eea0966347778061770db091556e7100326653062d1846fb9b31b3e352ada1bedee6814b6aa5fa2 WHIRLPOOL 71211727da94a51a8ce3a3c06b70ed23a1b92ee21d52c6a13f4368083dd052479f07c420a620b4e5d5e9e58f037438f720c8a6f55631b781cc82104c5560808c
 EBUILD qtopengl-4.8.6-r1.ebuild 1334 SHA256 b1503a00439e23ad897eb3b709d7b4776c8da6a1a3c774298316a58af771c21b SHA512 e823fbd9ece2eed9aba4914712e3cd50883861070682ca214710ae67c27898fd2ac0b7a9a8ace2da428b3ae52889ad5983b86e8e8247d2bc66f9c8ac237e636f WHIRLPOOL 5c77b565430f674951c5c96d2ca6aab6c37e451e1676a27f116abfe1e79c55e6751a6d75ad75ec9632f4192b81eac03ff65661971188d50ae4d450f6f554f642
 EBUILD qtopengl-4.8.7.ebuild 1301 SHA256 4b6c672e7c46644f4d5e47f0a2d37475abb902e2a27baba53426bd1bce77e490 SHA512 754dfd4130258b1cfc59efe2d2b28cc077426471961842c85410a43ca5d84c255fac33fab1fd1286034efe5bbbeffe5eced7a61e714bc0f0d85f5f0b5a03a731 WHIRLPOOL b2c06beb3b1b428d915d8d335942313a121d49808b59fcb64dd1d76ca8f153a5d058b778370161a542724a9af91398c02c5955bbd42c3f5c55468bc2b29662fe
-EBUILD qtopengl-5.4.1.ebuild 799 SHA256 b4efb47e1f064dcfe39f513a46356f6cf334e73a99c097a3266f45a4f7d07b29 SHA512 17f5e0b56739a86589c3d1cba5288e1090217b97026258939094d291c165b195f17ace91c70a18a890c37fedfa090fa135763ad2f65117e2102cfb4ed4e517de WHIRLPOOL 8cbef80fb661b0e66c600b385f6cb4a3f1cf20ab9542f11c63cf5c5cee3c85b54960f222594d48631c51de595654a6803255ba1e9016055335ce088e06f81ce8
-MISC ChangeLog 21121 SHA256 669ba31db814c49c23514dc48100be926e034392add06b8724b7e473ea7d1fa5 SHA512 ef5999fb0e9578cd1dd564cc990ec9e7d960d80d7cf7e655bcff25e3c561f09fef2d308dd8784150a4269309f4ff16de72ce3246952b549f3e9eafede5e3ae07 WHIRLPOOL 05a06350f4efecf6c1a27e013ba140ea2459b20407f32863e9ef85c7ee75ca2fd06627d6a8bdde26ec6044573acfbb5a7dc7d9c95c0c86f9d5d711f55d486067
-MISC metadata.xml 661 SHA256 993865bb2e2970778cc706a28213060d97355cd675bddb08b2f6b7adf5a8e47b SHA512 0dc90d83be6dc63b1fbcb3f3244078367dc85fab5a682161b109c9868d459f066f21f8ef299a8deb16aea5756ba8e3de3304cbb358b7b797ff38aca8b6476415 WHIRLPOOL 94de2980e75c6c8aafae96105efb44eab9331c4b1281f04b4de541bad06f0b1e4e1327eab948f797095954cd1076eda6ea5cddb7b2ca2c4eac4e4ea263aaa60d
+EBUILD qtopengl-5.4.2.ebuild 741 SHA256 1752ea9f599a3f7c07710a45f769e8032f57c12ff3b4f701ae801ffbb01129d0 SHA512 67aa4c2f00bbb964174171dd8799e05b4ccdff942e583adee88574fc78c55d6ff9e5b7ec135ecaa700d3bf2b59ffb23aa37d41779beae9d4ecc23f437bfac9f4 WHIRLPOOL 119b0a0e948ed9efc50ad914758d3714c8443e8f72e883c71f7b93b8f2f8a7799074bc45ca8740597f5c9a28c3ffe3059bfa1a38e220971b248f13266fb0cb9d
+MISC ChangeLog 21281 SHA256 57a6c9e284ca6620aa11a9904e34dbc28ad83f2379843b2a05832b7f5c3e3636 SHA512 e03b0a9105535db8e88f677593b06cb811e252e9b49db944e4d4d23add5395c853b85be8b5e600ff539e66b557c09dc2a9e5c916d798ee343ffc0c6efbf4708d WHIRLPOOL 3ab3c8b276129687c76c478b3564a7185d05d2206c99f0a6ad9fe883d072f1ad5b2fb89143488dc52fb165885a888fc8ff97e24dbab99966855b6eb9dd45d1cd
+MISC metadata.xml 653 SHA256 be617084e2d00cc605dc3b9d077f4935d2a28a2db8e0183a946de097b4d20f7e SHA512 4da6e8e1eb9041f0e13836562f30ad741ecc70eb2bf61c09eb5b2d8bafa73044bea33e4ed8a432372c2eb4dc613b15077170e2203cd4b9de587771859ba96235 WHIRLPOOL 6ddd93e9435381a208bae5195239e6f85c73652d799318d75ad8e1cc617392d36b3239e3f554f111de82ecd3d078369204a50124e37627bdcafd1f8f1c539bea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmBwACgkQkKaRLQcq0GI+/QCfcduzRQDr+S2TPcljmmHzUMKU
-vlcAn0rRA2jO34+lf/PaCvcZDZKzn+Fv
-=F/s0
+iQJ8BAEBCABmBQJVgZCTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bj4P/jpJyjgHJyOSPQeBxf8jcS0z
+NxjODrVWnqfZPGK7+QV3MfYqdgfZvflw/fY+LEVRUyKjCMYsgXuWRzmzB1XS7YUA
+9dL0I9tb2UfW1G1/TZng+Hv1BI3s5Byw/8cLCOwy8hTe3rIf1C8ZggyjJHvvBbu2
+R/nOLm1aWp1uwN+Fpw/AczcNm9kfH1C3VoWF0jdnpzCk+r6pHB0nKYwAgNtl1ZSc
+IsleY6aF21THOWLJUaMwJx6yIbfdXAg6rVsWkC/eKwfVpEwbBGJLDn399FKrPxGl
+MsYZoepQMsyceRtVATktoNIKMp2bYEarTVAUHkXGAX1OigcilMX8iv23sbob7Url
+7VRBofwrkvWEXHlYizMG/HB6Smp89SoYS6lQSWQnRGj/jmSQRayKQyG6wTfU36Sl
+1hf80D34M4JKhpKWuTgnM7vnkxLPNIqXjaC7V++ikYgjO5R8FfSEq+uEqqfwQ+F6
+xuNtr2tem7lyrZVHEZoVyewPgmuvDifOcfqoHjo0f5+Phsh0f24d+SmtezMGVoA8
+p4LsNXPtk71TW4YxWcxtNSncr1/hzCDuZegvhAyIBnF4LVYtG/Mv6u32YWPNGSy5
+o3vLDTRuHpBqavSxhgDfbuGzS99BijRYFYvcb7UwxbMez0wdXmb8sH+t2YUwUwwH
++o59SGBPtXKsDEq/ffyW
+=SOt8
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 8ca6c7a62878..34cefc306941 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -7,11 +7,11 @@
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtopengl/qtopengl-5.4.1.ebuild b/dev-qt/qtopengl/qtopengl-5.4.2.ebuild
similarity index 70%
rename from dev-qt/qtopengl/qtopengl-5.4.1.ebuild
rename to dev-qt/qtopengl/qtopengl-5.4.2.ebuild
index 7057f16319fb..161ef18cd198 100644
--- a/dev-qt/qtopengl/qtopengl-5.4.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.4.1.ebuild,v 1.4 2015/05/16 10:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.4.2.ebuild,v 1.1 2015/06/17 15:21:54 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="gles2"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopenvg/ChangeLog b/dev-qt/qtopenvg/ChangeLog
index f694c26e8155..ec038f183100 100644
--- a/dev-qt/qtopenvg/ChangeLog
+++ b/dev-qt/qtopenvg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtopenvg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.14 2015/05/30 11:06:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.15 2015/06/17 15:53:11 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Update upstream metadata.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtopenvg-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtopenvg/Manifest b/dev-qt/qtopenvg/Manifest
index 28e4da3db097..768c7218f2c2 100644
--- a/dev-qt/qtopenvg/Manifest
+++ b/dev-qt/qtopenvg/Manifest
@@ -7,12 +7,24 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 EBUILD qtopenvg-4.8.5.ebuild 1307 SHA256 e405d5cf56c124c9a07be7d4e0bd976ff60d3924b5507e362c4727ee4afdd9fb SHA512 4a2f70c4094067f0568a6fbc4007101b9f3d7f6b76b202eecbd04acbc6519c12486b3d78b8c6912676e483d86b8867cca0757dc46f64a40cafafc714f85dd1ab WHIRLPOOL 17fdcf06e7d7f4f88c80e3bd515b127c0cfefcff10437c5eb2bc16860ba68f1bce922d66707c218474bd06377cd8b48d38bf5268b783c9a7da73389a77a2d336
 EBUILD qtopenvg-4.8.6-r1.ebuild 1160 SHA256 d56e4fc3532a0ee6bc613e757a813474cd1951686fe9748032705e1859b3a272 SHA512 cafbdab0d4d5babf450e76322fb25bbf8d9b38c5a569edeec925d1a108b4f109cc71b511f13dd7ebae53203964d12603a61c5a63a5ef2b0bb768059cdc3bc5bb WHIRLPOOL aa58a32cb1e9bcc3007215b06d90dd950cbef3d951ebe5df2af33ebdc0ba26e28ae96739ff51e4821be110970387d52da7e3ce125879394eaceee1dc66168419
 EBUILD qtopenvg-4.8.7.ebuild 1143 SHA256 59d293e7194cb28585aa4dfd914b915c8b169562feaf382b3d61bb07da54ad3f SHA512 ecf0e6dd147b8c9ec895c9dfc416965e8de66fc7be58a3446d76fb40a5fac1c64eefb9d39ca4af50dad150ca3c3ac14d4af5a61df539be6c2f5c765ab344f6f9 WHIRLPOOL 64bf6e19e2b1230c7daadfa81097565199fd2fea3f2e66fd144dd247125627229f8757d1829a0b770cd5ec36fa2a15aa906acda5eb2a5938a56d2df0dc1c7a32
-MISC ChangeLog 4273 SHA256 18784fab9607216b2f6a5141b1540f2148c5c9f4a118e6b70ba057669ccaad83 SHA512 aa0551c61b0c3c0d3e7874f24c4c0bd6b3b720d1cc0b748d8c3330401ee21223acc8c76e102de40a3b185c1f9e4493584b741f7bf16d74189cf9d3441bbab473 WHIRLPOOL 4032aae2ebe8ece11da8af9c96588aa2dd8bda2dae4ff922832c6b25fc9916c1809e544b266474916260f0f240f3601040af128a3bfd67f90bf70ecc72c11681
-MISC metadata.xml 423 SHA256 312ec0845096a21e220caebca8c4a1caafae68e41946ef7ad59fb954804cf700 SHA512 b9127379a2efe495c5661fe6718d53279e39b144a39d6b4d7cfd38c2cf767508e5fb780eb487278b48723aa232aa2511c455949576accfbf94df4649c04fabad WHIRLPOOL a589a5f24a8bb0e8d3e663589429138621fbe2e8da1ef4c34982aa3b81fde27cad2b104abe6542df3c30f3a99db6f64c9277b229e7004c439a8772b3a8712c17
+MISC ChangeLog 4364 SHA256 bd60906d83d9ae64041e7ca9a1ef5991ff7c2aa94f7010e8022ec098863c07d3 SHA512 406535c5499eca04ba1e293626b0fef57edb1fa34a573b55f5240019cf3fb25ef8bf1eaa35b40a74a5dddd6a47947f0ce152cfd07c5f0b51fa37260797496f84 WHIRLPOOL 74672fba60eae7a079c75d521a6ba6350692cbf797e5323017c1ee764d43d2a2d29daa7ef59c6919be39dc09cdd97e135d6299bdb788ac1b620b44be6c492aed
+MISC metadata.xml 414 SHA256 ae3aec39e8aa8319ca121b983d589b1dfef4d08b1c37dddd3ecaab0feba0f661 SHA512 cc816ccf7ca7c1c1b260cf1acc5874a5effd8b3735e8b3e3a1052bed6462ca65ae0b9684c4d4ae76d8a64d591865c54a07dcf8ee8a89a3c96deec654e71cf47a WHIRLPOOL 97f1ffb025cc55c7e5e7d37cb8a6b053df73dc56f7eeddd57c3e678f521c194a4a31c43c9e0a9d1c20699db259e5b8ff300a68b812dc74a616b9cf2b98b7a467
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmbwACgkQkKaRLQcq0GKqegCfXQN4nYNWQdk5yp4lmKp/CsYS
-wWsAoIP8HtDr0XYW4zz1w2Mtgy+WId7M
-=0jqx
+iQJ8BAEBCABmBQJVgZfoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9QCgQALCIpyrwmxxwb49877Y/uXOb
+vHsjnjfR32cNKwZlwERaC3tz6mOEF9jEewTF4L1uXWp3t8Vuh2Tn2OUZdvCphf/o
+dk27/Bcd/0ko4nfbEFkEeXUWjCEGz7J1Q9q6Z13NJFELlLn4buPbS1RoMw/ASsFD
+jkOfIxT5AG0rkRpCp/Sr8kWMGLKbW84T1qZIN5p6ercn4CLBh6e3nkH4B5NcrHHX
+PcYLwxuqZxiTAmsPZDiIysgOcK/7PBqj/PFIltClPe8MKIt0noovzlnvtfcpjiGN
+SyS0K/o2ADayjhqLlqWhSfa8TZ+Sl2vByloW0iZRjBIoKujhG/iUGuccHVxjDWGj
+qRSCseqo2c0oElbyvYMxoXtUa1Te5Fx+CTxLUEB5knK91bEniXwhftmxY25uOgcN
+Dp8gBx0d2ktXlaMIPX9jW7wJ4GMb/wYtbrCwzgAkNuwxqTCgI1SY254y+PsCNYl5
+/heUJ/RePecXM8Tbtpj59BtAd/koHYGFQFgZJrgzvSBTEjIyslb/Zbo4IgkHj2M/
+nsIR+B0+Dl9jGqd4pz+++V0NlRdscd4/5lwHY6Js/Lg96X6x6Qh65Xg5wCqquwXo
++j/y9HUy+IpAMM0nMu9euR1+mYgpSs1wNL5O+nw3CxP1PNuXFdPps37Qwe082iyM
+4h3NTqhH0FQMxU+WmXF1
+=7/NK
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtopenvg/metadata.xml b/dev-qt/qtopenvg/metadata.xml
index 754b8105d113..ac06367e1c10 100644
--- a/dev-qt/qtopenvg/metadata.xml
+++ b/dev-qt/qtopenvg/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpaths/ChangeLog b/dev-qt/qtpaths/ChangeLog
index 61b8d48fff72..43ed6d9575bc 100644
--- a/dev-qt/qtpaths/ChangeLog
+++ b/dev-qt/qtpaths/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtpaths
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.10 2015/05/16 10:50:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.11 2015/06/17 15:22:01 pesa Exp $
+
+*qtpaths-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtpaths-5.4.2.ebuild,
+  -qtpaths-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtpaths-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index a40d01b2dc53..08925e30f115 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qtpaths-5.4.1.ebuild 534 SHA256 8038a2a09bdf8cdbe0320007405759ea6cd00624db54d8b8a2eac64637bff28e SHA512 148fbd64e9e6ac82752f233fdbcb3deb8be080f7f28d4492f67b16cb278bc2f69ff3738d7ddf67439c08c7c66dc5a3be0a268c0c906654cd73dbfd971562d1eb WHIRLPOOL 9fd3f8ebf31edae5c7041a6be95cd17b3f046729c506d65a28e31d1ecbbcdab779da3a59199947338939eae6b09fbb6b9a14f410cd919ec889cc28cdf46068fe
-MISC ChangeLog 1353 SHA256 7233e2a86e146068a70269cd4d3f49c24c4a532ab82b80850bb59f8cbdb9f7e8 SHA512 4b5cf9c3179a025fc4b073b13a83bb47e6471438f56750c48542cc54c5f99c2872db3f57f92f88b173bbba09b159f709299bdff82f4cf12946ba3910b19a76ae WHIRLPOOL 3de0bf1eb1b40f508eb85d5ffea37be4e07bc848322f5acfa1158d554f1c9a62fd64d1a64bca1470ee1df3815419def05bba317644a5e0a04bdddc6699577131
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qtpaths-5.4.2.ebuild 504 SHA256 a0ad977fc60f1ae2a0ade58e5216bab53b1273a91f515f45ec427be3267af926 SHA512 f631952a5bcf7af0c4c471a04b4e2b69666d1ce742ea810713e0bdd37d64ce6e24f87e8c06f7df1f6fc619e30a0639360d23466497f423df82257b36d3ee423c WHIRLPOOL 1a480ff29406affacb6bf1fe4221003af5deef4b793c6b75050363156794aff7d31f78d7a48ad956ae4650a1228f4653b9eaf4583e77f416935d6308b55ad61d
+MISC ChangeLog 1513 SHA256 239f00343be91d5b588c37ce9a8a8113c58a7052d54c37cab68ec1d6afe5b3c4 SHA512 8a9c6af9155acc2f82f81cb38ba5379b14d173d6cfd0cbc398f62a35f7abdbd152889b1207037c52e697c44db460c318d775a38562ea5e8072f747ce5163d5dc WHIRLPOOL 12a137822802c9cf8cc106a2653156a34afaa7763ce111c08a7922bbaa21dd8a98db6a9bf82c2916c13a8a21fe41840df9e26f93bb0e7d94dfd9da6c74b2e796
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIRAACgkQVWmRsqeSphMPtgCfT6VJJj7X11ma7gqbfhHEGMNy
-Qu0An2cXYp7XGSn/QNVlPlvYRdmiC2y/
-=tf25
+iQJ8BAEBCABmBQJVgZCaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9LwsQAKNsS7GnQ1mcJ4XXDO+MEFyg
+IvqIUb7TwlbV5swrgoWxPZp9H6szRlfPW0fN5LVwcdhmYFRFl5GEIkz9eiYvQafl
+dFkh0DPsGm+Ct3za/EEQw4egsXnSIjBBoAMDqyEN8b2dMD2dgUv7JBFhglYSqUSg
+6znduq6T8uEF31zaQt9B5vh7ne9ZrSnEdUpTQ7IVacZkrZWgJTYnNHO3gBDoYoD6
+PNo2gFh1bGpFiCPPbxusz+WUsW1g4L6i2pgTwDxdK084nLy94UikRsp0tUwvOplU
+9M0FOrHqX6IAhBgoNQq6VzP0+uwvwBnSy4ymOig4ijGwyknlT8BduOPWP6iN+1Ln
+B2WwJsZZQsKRs9i+NGWCYi5kD7zR+g8xpYMLNyHUZLv+OyMw3iQfIw5CjDUO4ppk
+gz3aFbi75AYokC5c0aIB9Dml7D4RatK578Gdl92vrYd3F40sPCJQRe1xhA9D60jp
+4sh9qZUQ0IlDpkRrrT4r/wR31oO20EX8HNDW59Nlc41vMr3brcwVz3bD8Wwzcmyh
+Io72lZDiTV+lvnA23i4nfVMUfskCZOuUrkXSOhs5a7OSFj6Iml1jlnyWJHl15eea
+dd1TNqJnwXWrGKBl4dTlfbolDD9uuC5RH6hLko0GXN1fiwIx+6gcP7ISkUDUuKhu
+JdgJurxVVLuvLj5idEGA
+=QI0S
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtpaths/metadata.xml
+++ b/dev-qt/qtpaths/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpaths/qtpaths-5.4.1.ebuild b/dev-qt/qtpaths/qtpaths-5.4.2.ebuild
similarity index 61%
rename from dev-qt/qtpaths/qtpaths-5.4.1.ebuild
rename to dev-qt/qtpaths/qtpaths-5.4.2.ebuild
index a07a03bbf2b2..0d55e2c3b815 100644
--- a/dev-qt/qtpaths/qtpaths-5.4.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.4.2.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/qtpaths-5.4.1.ebuild,v 1.3 2015/05/16 10:50:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/qtpaths-5.4.2.ebuild,v 1.1 2015/06/17 15:22:01 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool to query Qt path information"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtphonon/ChangeLog b/dev-qt/qtphonon/ChangeLog
index ff0cdbd88617..786a1248aa7d 100644
--- a/dev-qt/qtphonon/ChangeLog
+++ b/dev-qt/qtphonon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-qt/qtphonon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.18 2015/06/04 19:01:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.19 2015/06/17 15:51:57 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Update upstream metadata.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org> qtphonon-4.8.5.ebuild,
   qtphonon-4.8.6-r1.ebuild, qtphonon-4.8.7.ebuild:
diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest
index 1ed405b7bdde..a1a5cad726f7 100644
--- a/dev-qt/qtphonon/Manifest
+++ b/dev-qt/qtphonon/Manifest
@@ -7,23 +7,24 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 EBUILD qtphonon-4.8.5.ebuild 1280 SHA256 87453c08ada76fc54e4a71845a51464d3ab2eec7204db76b3037d668a278687a SHA512 d1b98a0e1f75074a9cc37060e638f2afaea4564f69daf0129877cdaaba7ddec0d85b5c0ac0a2f694d0c278d0a7f97c47beb436a56bec77ed96f0a82bdf5895a3 WHIRLPOOL d46668c77de9a0378faff4cfed41a3024576665aaec4e96f2cb1b1c4707e6822dfae4e74332b43f97a831739aeccc73fc57dcce96c97eb39f7e18d9312e08b40
 EBUILD qtphonon-4.8.6-r1.ebuild 1387 SHA256 926588e661d1da40df2448bb29c6ad48200c4887a23443ce4724529d3fbfcba2 SHA512 f887ca2815417b9dd91b333f070514486452c7831f81e92ed5fe96283cf506b9ab16028684620cf17e1ee0a4bc6c9fe8af0f59470f6f86bb3a5fbdf6779463ce WHIRLPOOL d9369c489073943bbb002e17cf8b2aa31f411f4a41edcdc1a88df9804a57e3ce8bca6292c5fdf70a6673f536a5cb9da4858273f29b517bdbe6bcdef3e7b0dde2
 EBUILD qtphonon-4.8.7.ebuild 1386 SHA256 77f331710bd530f3fadb956d05f513348faecd60ee4fcf37ed9965802f4d9419 SHA512 9a1f9f010ff94df3c168271ca27139b8afe7c204c2afbf1973713884b4bbbc8f0937c69f3120f9d981eb96596edd3606877edc1cc3d5fb0ca0afb01bc84d3e1f WHIRLPOOL 75180942e9b3c53be80f2c77b8adaea486b80f8fc48f6be5c465625b3752e958ac77df6a399c83e3e484a4a7c07ba6debe602c08fc4b0c051f5f99e06d1156f4
-MISC ChangeLog 18653 SHA256 fadab65ab1fa6400eddba54bf93b5c4965ac1f54f1d41455df8b5d9d03b303a9 SHA512 247a1ea475270a7605461083a17fca9c00d53cf6ca8d6a3a6a35eab5661ec23fa9b51bbbf0a9abc5c89650772be27d64815e2bdfb56c03df3cf663528225dde5 WHIRLPOOL 3afb52c4943f96bc5fc1a54c4fae90d62bd5be6c73e8fd191a7c9292697fcd394a65db1952d1eca29fb95be4c1f16ed8a9d3d7db45e966ce13687d6a30899b94
-MISC metadata.xml 565 SHA256 5b0a954b3231a70bcb13f1952bb78f09f0a18db8d2e063e0b5a95f1c194b0000 SHA512 c949b3f81f3fde58da0df84e58fb8707286e8cc50dd641c7ef9e34415fa5e0b72054af381874b21be9bf738a332fd063d65cc53c2d0f4189f14790411e982495 WHIRLPOOL 2619154721ff1fd0fa98b0a21964802cd5d2deda57d1f429079587cc5fd418ac41f0b7bcad049dcf20be0aff43ae1ad39295122a1a0de2c1b31211f58480f2e1
+MISC ChangeLog 18740 SHA256 fdda35d80049c10686285a886af52ad6126b7b5e8936dbcf294a6378df996764 SHA512 8d9b5f3b62541c625a4582f7be831c4b727d3113e7b736a797be0e5965730aea542f6ace89648124ecab7fd9c4eb739c335f344174bd765bb91bec91d446fa79 WHIRLPOOL 58d391bc89fbc444e73886cb5a691a9d918fb038353320f7e1992a76d683701238a346e9a8e0e4464cb2743da9a1eabc598dc0f01ebc86d4154a7be592166e81
+MISC metadata.xml 556 SHA256 ea64d36b52789b902e0c7edfde62ee59604e8012b7f41c409346c3a09e12d472 SHA512 5716019ef055a61d13b720382c21ae5cde97afe1fc7af73d200b51173d0db2f03d43b00e61b030f6382b7e8b3d566a4a1201b5ac3aff43b279777968c2822be5 WHIRLPOOL 5874289a039ce1e8624860b836b54595f6d95e1570c1183b58a1e2c9d9cbbf85ae93895752cd78b892dd20fdb72d14730ba12c86585cbd4791190823af1a10bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJiBAEBCABMBQJVcKCARRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7C5sD/0Tx4ocYHqH10C/OCJYQNcZPkKHuOOA/4F53HV3VQAPrEh4gnvsOElfZ8vJ
-4MQo482hxl+8MJsFIyf9z4HkkEevmudcuRQfw1oGYPVSKorpF4Cg2wfsQoGfLWPT
-3eaeRRSQRZ00D3SMbUTnaLVSL22mZWUdBfEvWaapuh6PDRIBvjw4Z19rJMH9a4gC
-sLivCC0ctkGqDSuMe3v0nNHktbuDh8ymM+uX9/XLtv4aBVqvwjc+IcJqFjaGtStO
-2g5HwcynvgSKa6yD3WEkXI8Z8E6Y1cID8zpyoNnTMd5Y78kgF99N0oAs7S2n6wJ6
-cJDKjd7K4EGo0qia3HQwcO7AaBINldWdXKrME5EJn+BvRsDKeabcJFJBTIpFt/zB
-Nv/2Ew5pXucCrUcHPQ9xZfdkMes00cH8/0I9iaBoWSkcgQGESG9r5arWim14zC9c
-F87QRnJW/ZmZzg2p2kQ1sF6t6EL4GocPv0Krym36WNg3nF58BmVL6c5FymNeRwqT
-Ftl8qGKpFXBChYOXNVguImjoYPVO4foyqB03KUFv1XA6hZB2TA1pk7gd+vfa2v1m
-Bj9k9xnCdYPL6R0MTfQOTckb8L9EPUI/KbHdUne9euId6cUvhgqVoVc7/ML50hS+
-GsFFbAbUF7S9XYnfgMxnX/VjlkPzGLMHamFkw1xV39QEB1Usbw==
-=gYHl
+iQJ8BAEBCABmBQJVgZeeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RQcP+gPNw/blijaBXKdikUXex32C
+XGENTkD/E27I35WzbcOwbjCiwYeNOk0yVAvlge+5+bPK9ReToYDmttj2HgVQ/Ma2
+YjcV/VceFWATR128Yb79BEieFkG6QbH2SLD11rLNqXeSzZjL92bsBCY66cIqJ/cD
+QXpnor0einpKYaiIDIuF4ibCOLG+1PmuOG+swjleZ2pfz0aWU1KbzUS1FUb/Zs2Q
+xrV+wOeBJj4XLgi7aJp60S7oNS5my3dB1fscLUrjbACwl/mMlSRH5rlaA3CKDR/v
+XIOJTtzlEXUgejLteoAQldEHkvxZgFrHrN4yptB1d+q9LZDGO4DNkxXjul726UuQ
+gYv2a151iL6WQfRkVa+5RXT7zP5aEmEHLG5n2Zacr6hcy/GmFH+BhmuQ6pFnpu8l
+KbXsXCIhw1ozS2QKxTh1Vpx4jPN3yOjysKCzo1oglH6VF4NEWnr4kELBi5rhRTHQ
+Ah9KooF5cZRDqyljuMs0oZhttIE0jaISW0YfKEJiKo//5gsIrcvNDfeAU4RwUesC
+h7Ium3+k5+khnrPMbG8lWE1V/g/7MscZXzHzntEhh7ITFTO/+QEFQ52EK+6zYT+k
+mepseRSJzzWb93EHmrEfW8PdErGZKS7WPVLYnp97uK6aJKlfrTlXIL3ku/ODMVSM
+dCF0D2a51wNGzNMPRAUF
+=eP96
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
index d05064201cb6..81cb7d93d178 100644
--- a/dev-qt/qtphonon/metadata.xml
+++ b/dev-qt/qtphonon/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpositioning/ChangeLog b/dev-qt/qtpositioning/ChangeLog
index 49a7a8b36550..0be37b3c731d 100644
--- a/dev-qt/qtpositioning/ChangeLog
+++ b/dev-qt/qtpositioning/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtpositioning
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.9 2015/05/16 11:04:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.10 2015/06/17 15:22:08 pesa Exp $
+
+*qtpositioning-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtpositioning-5.4.2.ebuild,
+  -qtpositioning-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtpositioning-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 792d714c1d86..71b1db3708b7 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtlocation-opensource-src-5.4.1.tar.xz 3297260 SHA256 889f0c832159a804be6a730366dd76db53f32333efc1cc88f5c7253206e97984 SHA512 9a88d62af7bdbd10b06baab388a7f2a9730f077e46e95c230c070652b4e79a3a040504559da5f8eb7645f7b13234bb79d7be06bd03cb7e885e71f656784b4a1e WHIRLPOOL 46f2f17f294c1d6424396b91bb5c3a8808efe2a5814d645bef4aa69c79c81b76810dc3b62d11c863c5ac61b547e39a3b011818ebc4f43a5d81e10c05d64bb104
-EBUILD qtpositioning-5.4.1.ebuild 908 SHA256 a46c304879090ca9abf1e1fcf64d6467c88844a60e514465825a5d38309d8413 SHA512 6c8aa2ddda06f928866330ed6e5b8f4e293cfeca3be93c7cfdeee6d04b6889e1fa180162e1f54d04cb964e90e90abf9cf36b3433aa81670a088b6ed99a9dbc4c WHIRLPOOL 71eb1ab38862d52f3a28ba73a5da9cc51f00fed5a954f3d439f3d44b91ee174698858b3a62e0cdbea5aeafbc241b9b2581a906630c2fd3f29e98bbd52162bf69
-MISC ChangeLog 1282 SHA256 d4a6a905bca08949f41eac22006e75169ef1b263c0412e71e480fe4c965fa73e SHA512 2dd02174a69cf1b77d83ff8952f0577cc75e8109669a5baccaaa83dc74427384536e1c36c5dca082036e14dab2091518f45cfc8ed62862ac47641e4563f4bc00 WHIRLPOOL 560ab15aa0500dcc3c33b5e7109aca2a8d28fae02b13d068d93dd87b454ac4ff61541a70fef7fdd0128fe39d7f4bbb0f72071b8658c6cdc8d0f6b95e78f241c4
-MISC metadata.xml 425 SHA256 cb37e85b25f8343425e3886ace756a6d6b1b71a9422d870168cf1b6602bea88c SHA512 ef6554d203c7116e97264ce699bd34e3ac93c3f05835ec49e24a9014f624e0d24a75d5d7f8cc53af11e0bee8d42d8eec77e000e0b8539fb474d55d2850d37ffd WHIRLPOOL 83355318d8dfe938220f5035c2d575c92accca7abca7ecf4bf18f6c7cc86519162e7c294e590a0e15a5808688572a9e80a7115ccb7b5972e027dc2a1a32e39af
+DIST qtlocation-opensource-src-5.4.2.tar.xz 3325280 SHA256 dc4af26e5398222aade1f7e405b6c8c0caaca7de0df910b8da20c5ff058583ec SHA512 89b9983a8dca4948602f62a6fa1447479a84c140b56d452599c77c641107bf495a3ef52b3a80fcf37839e918f90cac0381d4f5dfbb57d97b7a5a08033d57cf85 WHIRLPOOL ec7607f236ac66de959ba01b2132683d94a5fd74d11f6a511691e745c1358654da6cda1f201ebb7e7d0a46a9d4858c386bf254319539817e69e1991f5bfca95f
+EBUILD qtpositioning-5.4.2.ebuild 870 SHA256 2f182a29774d17ba1ab28f417ea078a1f83f13f0a9eb2b1cc1e5f9e15cc41cd6 SHA512 9c88043323913364fced6c4e69d9747473fac757e15a9dd24d892a1f622cd8dcf1ad29309587fdec3aabf048ff4a7ead286803c19f6dd1f0dfbaad80bfd6afe6 WHIRLPOOL 74dcafe1877dc6272d594dba3327152182a8f07d8203784c9604b4390879270e85f45aa4ec73ed2dbbf96d4930481b04bc8b6612724c48667425a9d85bd871db
+MISC ChangeLog 1461 SHA256 da2eb27ad4f07186590ea3a73ad0ec093cc698b79720c452a0b238c9e90709f7 SHA512 bcd30e5d212035b963306e0da6763f589c45808439d919c14e912657747408b2a8e9d4532a2f61bda9299a9525dc6602671d1c3f3ea757fde83dcdaa4d852c33 WHIRLPOOL b40781456f0edb5d4179c057e3281f23d5929b5f6161faa9f63c08c81c2f451b52dcd29a9e822d73d7edfa3c80b30bc53243cce06efa2b9ae8488f74e133f0dc
+MISC metadata.xml 416 SHA256 6914cc2d180d4ff4105c16763cec34054d5d746fe23ea0f6fe54a638b61df503 SHA512 369352e891cc25af466278d32f2820517762fdddfc17d6dfd8d4c3b1f238ee4fd44ff4cc988ae99db2d7c4d2a840cb6860085f525fcdb2e079651f39c84a5a4b WHIRLPOOL a550dc892b84026b2242e16e564cfdd281a40f8578239b96f91cd140cfa8962132bcda0e24e82274bd593cc80203d190d00ab0a7571a30ceb527e7d8d8a39582
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEUEAREIAAYFAlVXJCYACgkQVWmRsqeSphNvAQCY9AdrIGoLy8JSSAvKNIrKHFOl
-rACfc+WzF+4EuOorEaNZ+EaWl48xhpw=
-=BfMs
+iQJ8BAEBCABmBQJVgZChXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9c68P/0zYeRXcWPpFkxfzGrLKVBTh
+owf59vLZx5ReGfTykXJdC6x+WDYJHqdvLv1ZaaDwneQB74KEgvhk63QR6bKIbKC2
+muneL5pQuWzKc9i6eBUyLyBiZYtOgyubdthetT1cUz11R729I7QotsMM+/5vgK+7
+chDUBjnSKIgkUitrMwWZMMwZ3CS8Uz33bt3cw4zUNYQO1YPpWxDlwSlNNfxkFY62
+/OZ3Uzffw+hMDnvaoup7eQQvgSJ5Y/xmRvauY6IhLGAuMT1wwqwXVSEgAwzeYh1f
+jqzcBS7jhE7vm5UtaREjbIuGQwwzo0/BvRh9ZF66aNZfqlP0g6DrgQc5eB0E5pnZ
+H5/UCeRLEvp2VmH6FJAA+2RksTXud7FPfZLz9lrCha/AbZPQqL8qehsUiVawbdcu
+N9Qzy0ddoY9jZ8zpxXVhY/QhSBIFmd1p2cDTwzmdLzmL0aO1+n7D+Kw/r10ydNMD
+S9i7ALTCk+4amEO0fmygXfEJRkAkKj0wAiFABHKJPm8AKK5IbSIND/rKpKXT+EG8
+59rIHusBozbm+7yTJ17G7YcU6xyh6UE2RUEp9XKD+2P8rlQ2cu+S8rmbARffyvjP
+I+/BPiFtEktf/tnE6CwbpQE603+wDvGWvDtB5AEzRWN5T+9slFV3oEQH+MnfCxh1
+OjRYHg0tHrv7HZP2TdO9
+=N9rf
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
index 85e7bf75e75c..0d64dfddc921 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
similarity index 77%
rename from dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
index 2a5b3b53d6ee..ad890d0b395a 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild,v 1.3 2015/05/16 11:04:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild,v 1.1 2015/06/17 15:22:08 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtlocation"
-
 inherit qt5-build
 
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
@@ -20,12 +16,12 @@ fi
 IUSE="geoclue qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	geoclue? (
 		app-misc/geoclue:0
 		dev-libs/glib:2
 	)
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtprintsupport/ChangeLog b/dev-qt/qtprintsupport/ChangeLog
index 15405561e430..2e3588c6b9ed 100644
--- a/dev-qt/qtprintsupport/ChangeLog
+++ b/dev-qt/qtprintsupport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtprintsupport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.15 2015/05/16 10:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.16 2015/06/17 15:22:15 pesa Exp $
+
+*qtprintsupport-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtprintsupport-5.4.2.ebuild,
+  -qtprintsupport-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtprintsupport-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index b05bcd7d90f1..232d64fbb43c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtprintsupport-5.4.1.ebuild 938 SHA256 8714b6e6a2dd184a7647581bb0251f94cac539a5b69117f30de10ae1fc67c2ba SHA512 5e4c0b6f36a0417b72b2dcaf48e635c97486f26001d9eeecb6e0e2ad87e0f82853edda92070b6956e89448ea0518bc3e0e0b968c436ac24f96236aaf3726b1fa WHIRLPOOL 25d306debb7bb23a9a52e773d86ea70b33669d0bc6cc1f1b1f7dfd975ed2f53d7cc50e016fd646ce26947de6954e95e7227c98e65ccaa56e57935dfcf2713bf9
-MISC ChangeLog 1903 SHA256 3c6864255bcf75aa3292049623f9259f10ab3eef3ded810fd81c2056e50632a0 SHA512 5d9ee04473c4d476ce14db1f6f23aba669765e317e66a93ee428b6f528345c9a520f6ae173722360b6d2ba9ac5b4c969c5dbcee48dfb6e841bf85d12716bfaac WHIRLPOOL 3ab6c6f10d57ba1106bff818a9677758098f403bd078bd7337bf17a46ca039e5cd4e861935a599caa1a0cacea39d402c359576f4766093399bf6dba767f80f37
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtprintsupport-5.4.2.ebuild 878 SHA256 cdd97ff374733b7f31e4625bcce9bd10adc876226c8c6bf039f277acfc5ee775 SHA512 07e45ff3a703973298527bf6b4bc1f6ac531e85c04d922100aba415602c8bd1654b16cbf464a2c5fae12bc569f3b28e63786464f863398531932805d26e70527 WHIRLPOOL e50897f4325128ce100a0ce47d8cb7c7b40d22a9eb064e10ebb1b2b300cbb5355f55b42f86acfc432438dd7f2c088d0a9a23663fd3f70e9a7324d6b8a9de7f1e
+MISC ChangeLog 2084 SHA256 e6eb7c01b214ce6b6bcde664bcc62971681be2a3a3aff15be1d7554abf1482d6 SHA512 9a77ec49e312fa31ec63a2031a999df01ec35b5deb600a2c0675bbf2279f270193424eeef08fd5ae8931089d2b59298c85444ad04d4ef0fdf527b0e7dd7b8a23 WHIRLPOOL fa1878d33c231fad7d9c9b2b4bc6205c3dbc79e3c801d1beb90147ab9c95c22d2fef96eef217dd4e73f90167723ecf995ee2976203c5fd80e72eb0630c364bac
+MISC metadata.xml 347 SHA256 2daca71e420a638e048e92c0a71720984c84951eb4b08a305812a03907d3c4b4 SHA512 54c14f38ec21dd4600ae9b056c4fbf6e72abda0985f456b6033018d6d392cdd20a69b42b2f709e96db0551aa5a29443dfe3a9b6d45724243df14ef9e1c45f115 WHIRLPOOL 1d49eab844d3be970c4c00040bd9fdd1aaee2fa58f13fceeadf89a6583a717f03ef8d2f601b8947fa604d241f859d8a64799636e32bdaccc77a490c756629149
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXHGMACgkQVWmRsqeSphM9IgCfQcptg2cSSOGHGUHe0Ni556Ya
-Nz4An19EJrgn41QpmJXWY7aOudAVb6yI
-=ytrL
+iQJ8BAEBCABmBQJVgZCoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Q3IP/R3Ka/TRSA7ooku7w555snF6
+oI40rS77SvNPVYrHtKrVhLDbLVTL+kN8H6ZQF+RPL1D8rKPU5fHp3HUCsOQLKers
+Bc3uY4Pwb4vavvNuqXHCkpatdDYJKQNN/3JhF3poKVJXX5UmovuTHsGnB4U4cl9X
+VG08biw7T0x10sygB2Ug9QeZFt+1DV+rKI6krtxkBR2SBSjDrXiBiCKtJ7DldCit
+PTZhJklOJXC011xjaxh25FpH40qcrgW+cnyN3iyHrMdmgFZA6VekHpLgasKn1rnm
+5+yRDBCH/FNcvq+WjWITlnywWOEl9ijkTnpeA+0hlBobNg8dhVoDY15dV5wpN40X
+heUwsalXpq8mTCTFJNqRsY8cVWPQXMt38GNYV9T7tuPIRO/YLGGJSaw1j0E66H11
++K71BMLRia56R5QciddQK1+d1y1auAwooXadSFLK0TNykFFqBFZxAvI+zGyIbyP8
+IKYnGSUzciQPFSCiuzZI13y8rcMGT4NfZGv4tz4KTT5yh/MPNejNTABFaCqaX7Sc
+mhm7ipb42kRSeufFCsi5haSt6tuT9nOp5pRNZ8Otz2+qa/qWJBBa1PAmEeO3lIfL
+z/RMCSbTdbrIp34Nq4bGJMut1ihFcCr3WGZBIFrO2IwqESXMK05MfACEEhUp3WkJ
+jNdKT0/W38Uvnp7FavjJ
+=TNH9
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
index 39c63597e531..8090c86ce18c 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
similarity index 64%
rename from dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild
rename to dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
index f52f2c0bc740..545d82e3fe9f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
@@ -1,33 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild,v 1.4 2015/05/16 10:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild,v 1.1 2015/06/17 15:22:15 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="Printing support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# keep IUSE defaults in sync with qtgui
-IUSE="cups +opengl"
+IUSE="cups gles2"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl=]
-	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 
 QT5_TARGET_SUBDIRS=(
@@ -42,6 +37,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtquick1/ChangeLog b/dev-qt/qtquick1/ChangeLog
index d31e74eb9f80..ebe4bbe65a37 100644
--- a/dev-qt/qtquick1/ChangeLog
+++ b/dev-qt/qtquick1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquick1
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.17 2015/05/16 10:52:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.18 2015/06/17 15:22:22 pesa Exp $
+
+*qtquick1-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtquick1-5.4.2.ebuild,
+  -qtquick1-5.4.1-r1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtquick1-5.4.1-r1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest
index 4abbde38fa78..27926d180a9a 100644
--- a/dev-qt/qtquick1/Manifest
+++ b/dev-qt/qtquick1/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtquick1-opensource-src-5.4.1.tar.xz 15983524 SHA256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d SHA512 365a57c0b3e4df090471cccdd025224212781730fe791ad258697334df540407cf53efe86ca26d40d8ff6c807860dfb2eacc4e4f7d3745048ed409498d428028 WHIRLPOOL 7a987fe9f61a18fcec5d7f904d28908b9c2785d89308d499eff9578905be682d3152bbc25c888d34a124fd7faf630d578aa3344fb56baed9b7077e94f793dc35
-EBUILD qtquick1-5.4.1-r1.ebuild 1398 SHA256 b2a7c31b96719e47e16f6fe1b4dd5a0261a06ea0a19c0be425af13d0ef55d80c SHA512 0c2518b97e9f9a6ea5ab396e1fdb396ba1930929572dd78cce736fa19518838a95ecb868ca5edc4cf661a83bdc126457ea953d94adfc5bf6ec4173bbdcdcd646 WHIRLPOOL 0461222c5d7fa5441703c1c49fbc8fbddad13be99658f0bdd544c08c010055b9af20c8c8dfe08813913246dbf92d86e39cd7867cd98abf306e6640420974d57f
-MISC ChangeLog 1917 SHA256 00f43ab79c5d40beeee5f91c5128340004f5a7866bcabe5161dcdba68098b998 SHA512 b8fe846f36f9a56a2d386bfce755b2c3299ddc5a76b339b3e8b54888eda51749050ad89aab042b68c6f3914e2585940949db199c9b335b9b03a6493dc1b13a2f WHIRLPOOL 05b2503d390e40f3bfdfa9ca88b2e23247e019e59c9873f5ece94524990562724f33ed672c7ad80f5640cddb5337e8761eb0dedd1c8e2d069e118409a79d0fb8
-MISC metadata.xml 539 SHA256 45394be80debfe5b224d597a6b2a71b4238cf42cfe3923cf9ae289356837ba38 SHA512 644b4bdeda1313daa3444f855364c4be96eaf1f04c1003a1584874e5fb47fd3c477dd16e3abc780a29745fa5f60368edaa41be6c942f5f26f164157078d5459f WHIRLPOOL 9a819121464a7e4bacb7d2c023b8d12926c9d6b3de8d4a09ee040ae60ab974aaabe451e4a7880d6767c95319ef0896648f93ecf88dcb9e13cd1eae9beabe9979
+DIST qtquick1-opensource-src-5.4.2.tar.xz 16021692 SHA256 7773275c796e588bf3b8cd4fc6af8b9a81a98feedc8d910c1ddc85a14af8e804 SHA512 9e2ba69506f948f222a5049a0b8ec4d4f2d48aade7ed2fe27d22cde63e0b40fc286f358b5e81a3d1ce20f8fdb3b14e903442adf6f73283cf2c81cff10c293a4f WHIRLPOOL ca332f20d0d5412a1d06ff41c3ae96febb95a734227c8911279d5eb41e451a27916b3cf1da4e91793c93f9800e9c7633477ef93582f67df052c9693eac9487ed
+EBUILD qtquick1-5.4.2.ebuild 1249 SHA256 ddd1e59edb86b70e6d6d3f2799ccc657fcce82243a07ff5d388c603c087b8fe3 SHA512 4efb204913f4c44ced5fcea081dc0e88193748b44d489c6fabdc27eb7b1da20ba38173f0385553ec1e5341d74903e7b63d48ea8af9796b6ae2fabde5e563cccb WHIRLPOOL c5bbe0e1804a359d30ca7ec933dc9d9cbfc85002e6c227ae8c83ed94f7b295f089e8dfd1c4d6d26d0897f8a5d1e2ec684e10896c2aed68961809d2d78beac1ce
+MISC ChangeLog 2083 SHA256 17d0f91897fd1e7f5d16bba531e25d178853100c2d80f557e3672c7f7cc53590 SHA512 5b87535c6349b4adfffd9e1a70f5810d9a734204e8c6d94e3f15dafe22d4b1671a21fb1b1ef2cf634dc8814216eba3e8a1de531b69b83f4e004fd946f1bf9556 WHIRLPOOL 8022409e18a8b391efc16aef5d4320e9603fe8e0fc4ad7b2d562e2ce0ee22c8512bccef28f4ca9e83d6c20574a322b59fdd66bd929e0cfe25116594b9547a1a3
+MISC metadata.xml 530 SHA256 2407562d316772e0814522c5a4d7349aafc7017c12d93dfc39e49a9f4f08aa7e SHA512 bb37db0c3082c1d12c500c092aab76db15fed020e4782a8bf801bb1e222f3f294a50146443ca306c1774641b74973f103944902c34157b2f8f339df3d47d182c WHIRLPOOL 7ba51df7b0c27e2260119cc2fa7aafa0eed5b5e85c332d95f0c505817c1c64eb83fb11e263eeee78aca27c86796e8707652f0d1036b34f78a2d470997104ee97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIXUACgkQVWmRsqeSphMPdACfTP90MAl44gNy95G7a3PMxJvD
-g8UAniXzFT6qYunF9TPWaDEah9YbnfJ5
-=bkOH
+iQJ8BAEBCABmBQJVgZCvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9/nkQAK32Y08OuS1XOxewIRzTZo2Y
+VfXQSZCdXq+hBEE1Q8KDSbdyslLWFx8w3MGHjU7am14N+q16hSjzm8GhcxPc8sfd
+WSwIT1FQidjQVjCDYlFmCRYJzY3Bmz8Cv30uNIdy77k7hJgMtlqN5fA9tVkGZ0Ar
+TAbIiW3w1pJlDUVlRyNpg3S4R735zXJsTJZgGVYzuYKGwMAwAZiDqijD6GAXZJSA
+khCmgs1DHv2QRbeUIodvPKmf+bFnUfeoG0lSQLkbeciUh166ourPQb2izDgkfKXF
+Xe/eN0glf4ELcoIkaSFwLKgrtpt3SbCAgedHS4Da6tRcTtK9PRmumXi1xIGHoajS
+hk7gjfSv/drKQR9B4iqute1s8jjhvTFPqSH5Uos+KYFvyVbUWAQYVRnaBZK8i7X8
+oWspjF+YOLx1ICJWe+f4n+u9z3SakDSye0H1HA8FJc783xCdKX9yPd8wAtEMYkW0
+ctnUKax3NHGtTx6CvwQ5e8JOhfEHYwH2gP82kya/YhkgEd2MMlGiHzkWT3xPeK7m
+vJjfTnse2yEBnL/oGDDOZbnaBIRwp4L+n2KGIzbEHYD8rOD7QaN9II1+jsjTW3nC
+sfJpGqsSSr6iOmvfB0k94L93gh3OCsjO+OFz+t5YfBdD4oZIoeJl5Ubpo71CyeRB
+h8Jnjc91OPB8rGAMpp1N
+=Mrv5
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index b827ecb1aab4..ff6648b7ae99 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
similarity index 54%
rename from dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
rename to dev-qt/qtquick1/qtquick1-5.4.2.ebuild
index 410ec83009f6..632916060540 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild,v 1.4 2015/05/16 10:52:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.2.ebuild,v 1.1 2015/06/17 15:22:22 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
-DESCRIPTION="Legacy declarative framework for Qt4 compatibility for building dynamic user interfaces"
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,19 +15,19 @@ IUSE="designer +opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtscript-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtscript-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 	designer? (
-		~dev-qt/designer-${PV}[debug=]
-		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		~dev-qt/designer-${PV}
+		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquickcontrols/ChangeLog b/dev-qt/qtquickcontrols/ChangeLog
index f2bf3838865d..28c8d5a558b8 100644
--- a/dev-qt/qtquickcontrols/ChangeLog
+++ b/dev-qt/qtquickcontrols/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquickcontrols
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.13 2015/05/16 10:53:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.14 2015/06/17 15:22:29 pesa Exp $
+
+*qtquickcontrols-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtquickcontrols-5.4.2.ebuild,
+  -qtquickcontrols-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtquickcontrols-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index d78d260a1b9b..c97f167b6624 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtquickcontrols-opensource-src-5.4.1.tar.xz 945324 SHA256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 SHA512 906efc43614bb5117d65b361e1a1b9eeef40f430fbc96220ac6e161cc65e3996e6d942ea675bf2a4fc25eff8a064bd45c4e23bec36915c8c3b5b49a312a30eba WHIRLPOOL f408453d2f1847cb76d311707c5eb68920991a4fcefc87da91c6a27ccf3af2ec991ae635abd229c1003424154a8184ab54c4d5eb09194dc0245079446e3f4aa6
-EBUILD qtquickcontrols-5.4.1.ebuild 934 SHA256 d7e1626f9a0b17af096ce7f7f1321d5d32d308a9b3c002254b097a16d4ddc98f SHA512 d6866d3c9ad2a4d975415a00ad20db036fdfe4e0b4a5d5fb68966ce6f63967193fa02920481e59c79e455b67d23cb558e558a9362cb6833c16c9ca88849624e5 WHIRLPOOL c78511f64bebbfea708d2bafe6a96c9f5a54a7a203708396b1f4ee309a91e232aad325ab45046adedaabfdd8d3971f78f8fe3df40c11cf11d84781f4dafee018
-MISC ChangeLog 1614 SHA256 ef21c9659f3576d995d4a9356940a8d787f2d94d6dd2462aba68ee7f5e13894f SHA512 155e3a113c8bcf36714d2548c8daa6e0f37afc4405343622a310fa4a43e9054fb3a9c21cd62b29e6a511ef30c6971036ffac3cfa0683c3aff78d8d5236726967 WHIRLPOOL 452466429df022fa8ef615827e9c09ea40a8c17ecb55829a5d888a79072ec403831d59e913de17a694380a4823cd7ba55c9641c05f9f9ebd9bc50606973d6d63
-MISC metadata.xml 338 SHA256 daec0476a109b676192bfe6020ecb7f6ed88a23894cf94e6bf387bb4dd88f155 SHA512 64eccd85eef45577c51dada14afbf7f770d13cd4f104c853b8b2da1c826bd126dad27e7c454617eed95864dd872ba6be5e07b9c73fac54e4612ff0fcad709340 WHIRLPOOL b1b9f224ed44d0bad21adbc57d36dcdb19d48d84778703003cb8b68703c4ad8c27f2624ca12aea0a453155c1c197022e751a32778815a014909919c1c63eb3bc
+DIST qtquickcontrols-opensource-src-5.4.2.tar.xz 950732 SHA256 e720d6b029078682d788c0e3df14057cab8a3ba0ecfdc35c9b9bf6dc061bff8c SHA512 0fdcdee97552f4eec0b2d103794984a3c03393eb3f824c7717265f3e74cee5f4d6c4172dc91462f34ba51daec5efd9ffaf31721b693a33bd3c1048d36abe28de WHIRLPOOL 0dcc6fe6cbd884b1f0331331dd9e6d8ffef4ce03d6e6fe14e3657b20518d6c1f3413477593217d910ed76e2a21926dc36f37377bb32f59cbba40bb8f3238b917
+EBUILD qtquickcontrols-5.4.2.ebuild 881 SHA256 066caab128d3aecb1a734728da0b66cf3c6cea96b99c1930943d4b7cf9c20d3e SHA512 4e43c793180c8d00a3337efb480af4ac800594c17ff8d3fba038bf204833504f372530dba8cad7a5ffde09fe656d30b181b2af4c2dcd2d783b94aaef28508a69 WHIRLPOOL a403e2a9671aba13b10bb620ccaabca3bd316aece9a7c321c2e96e8f52505ff483bf7f850392e58fcebf9ef6806ef039b19013758489472c7087eb66d2b5da9f
+MISC ChangeLog 1798 SHA256 d4bb718d045b90beb20a63085ddaf70f122327fe4b7392b97f3a307507182ab4 SHA512 414df915b0ffa426963a1ec739d6ec6a8297cb5d8eb8d6a5dd962593e142ff95f1459902913d802cc206b263a5c9db4f15fd594be2708ac1f0bae9e6d1b39b2c WHIRLPOOL a9921c5083541dccca3e18249a572cf303d18911affdbbce8eddec34172ff24c6145efcdf50b7cc601fe335a285f9db575e8dcbeb3f389e7ecc236e2012674b4
+MISC metadata.xml 329 SHA256 14cfb07306ded1231f78efec966b3c2c304b25fea7b7c2889cbaeeffbd46a9d6 SHA512 d9cc69dacfadc04a625515f9aad4c0fd2f4130bad5cd53d989f56719c366dadabeefe4e054c997717455b8d5d835da69f9dc539261d3fdf8adc2b582459be69a WHIRLPOOL 48b04170e1fa6828b89694b85223138d8cc75e5c5d0ea67b58e06935e57f320deafac82867e810dbf866884ff7125e560ea6024bda798ad894872f571974da9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIZkACgkQVWmRsqeSphNUngCfXqiBRL4K5FoS4RlxzxOYrcg2
-Uf0AnjkJblkcNKnyOUpVltfedoyhsGhS
-=pTtu
+iQJ8BAEBCABmBQJVgZC2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Oi8P/1qcoaEz8wcmrikVSFAiQ8qr
+v2MIV3DwZKmeoSmQRgR06mDuSh3OZEHutw9HzrcB7XD5g71xo1Xltd9OvaUeQmsw
+FQT3Goadc7txN9sj4q/g9+cAGbqhdOrltRejpeoMddtugJFfV+sxkNe+6Vm1bBZ1
+ETY6WVKnctHTLGCawnZgV+oN6nmuuIwh67KGYVmb0Ea1lrMOMCPTjUuuJUNp92N+
+6s/vQ9QJ9UbjYi6ZrCO7wwN8542BXMOCScVgtSlK31pEHr34Hrm2Oj8uz+/STqbo
+CoT2AceLu6HsTnJ3ET4LwksdIX3COe9ZRPRPNH21TFnyGWYU8dJ5NYWmEkKUqVqX
+3kIGNhteBZ6/XLJW+rENhFSRdUA4jTRz5KwfZAIiVsybRmyOy1OQRE2u4wpxuAvL
+i+gYYAiglNzi6zqqpiq+x8N/t5SBRnLWMymg+TVCwYtyFoKaUfXzUXxq5JHS7yEr
+9VzN8BB1R9JOk0iR1zEhylCIJLpILOz7cipNEBKT2ptWGLfv+s1dq9MIPWWvUmW+
+pMsuGhlGK42xaPD4caC33YwiF3ALli5diQb7P3F7JQhJLmAORNvih+O559NMTYaL
+4NvNAkEofLM3rY3qdAbeScgDaMKA7Ef6WP4EEb4U6JeDPpQeVA1co6k+B81uTUrm
+78f4/pecZV7xQnUVgkut
+=PfAI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml
index 2ce5ce322842..728463d459e8 100644
--- a/dev-qt/qtquickcontrols/metadata.xml
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
similarity index 70%
rename from dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild
rename to dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
index 5e7a3a4f16d5..96dd9c6e9aec 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild,v 1.4 2015/05/16 10:53:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild,v 1.1 2015/06/17 15:22:29 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="widgets"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdeclarative-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog
index 671df28688f4..1264a543d359 100644
--- a/dev-qt/qtscript/ChangeLog
+++ b/dev-qt/qtscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtscript
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.36 2015/05/30 10:51:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.37 2015/06/17 15:22:41 pesa Exp $
+
+*qtscript-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtscript-5.4.2.ebuild,
+  -qtscript-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtscript-4.8.6-r2.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 26e8b2612858..869889050526 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -5,17 +5,29 @@ AUX 4.8.2-javascriptcore-x32.patch 1011 SHA256 7a20c0e70285f9506b2d1316ff7d03494
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtscript-opensource-src-5.4.1.tar.xz 2581684 SHA256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf SHA512 e52e27fca2e094fb0367fb7684da194ae185e748b3e8083b123353ca2c0d18442f1028fca3246f3e9532bf6224f2034ccd2f6db15041f2d1887c614ef932f41b WHIRLPOOL 0a0a8b2fbf309dd53d37e4b8a7915e778c3e1a42caecc1e6acc50f7ace73ca57deabb188a5df6e2f0e7ab84555a143d2edeada5f88c9c908f871ff988f7a7e7e
+DIST qtscript-opensource-src-5.4.2.tar.xz 2591672 SHA256 e042e444de4c759b562f6e8097a668b84bea5b9ccd8290d18931a2cc80affa47 SHA512 b04afc3f55291925d9239cd5cf4ea9a3e0b47709f77c757efed13c32530b324be294930c58dd610d4a477e5fe757e325c4daf5890512e63a4c7eaa13912ba1f4 WHIRLPOOL 0df41017c279828556caeda18fac13eba2a667fb8de3bb24d7bf3609eb77e17767c2e4096d3a507d6f3e17ade8746feb309d237630aa82eacab6ab9504d68256
 EBUILD qtscript-4.8.5.ebuild 1649 SHA256 4dc17c15645a319de258d59b57e7c05423fe27bb4588384f55454a8d393b59c4 SHA512 9d472ac6f93b7daa2a0e1fe5d435f808d5016de7223696bb1bedc7f78f2ccb153a2acf1347b55a756e54c01cb74c7d257eb74c8920672ff4894f9f158e77513d WHIRLPOOL cd1d0f805f45da2b84f5223fd909125ec9f14f129ca72f7c843787ae96c987f078f4e7e2bb55c64142eeb5cf8eeadbb371aac4307809871c88e35ead603aa711
 EBUILD qtscript-4.8.6-r2.ebuild 1261 SHA256 986fa052cb65125b8e9b73c3bc435cb7c5bea8dcb37817a87ed882d0cd5dc3c4 SHA512 cc9be56b4be4641c123b65f8b2f0c7d99e16e05d687682de44852c7c03c0a2ab05f2834ea33d46e9e1bd282a1f0c4c3e84556dde6dfeb0462fd83a1986d96c18 WHIRLPOOL 88c2549ce88f8844a5d5aca476b8e600f6b939ce5eb15940508f84f0ba96503bc36df9306835668d5d293ec5386c910fcbe378d3588ef47d33649e169f8cc9e6
 EBUILD qtscript-4.8.7.ebuild 1228 SHA256 daf04d8686ccac496af953aa30afb86d4eef8b3177b6fb97ea2a4877260fecfc SHA512 b6a65d689ccf80ac73fbf717fc6a8b9206bc5cf8f3ed3024af744502a5379bed68219efbcfdb7da2370529b6a04592484ab222a6d22eff9d0089b637240ed5d2 WHIRLPOOL 33fc524b858aa674815966ae693c6f14aa1da9664daa6a2f1cca5afe2f86bf1669e485981e72b91d76c480023e4c6984ab08919e6dd5ab34f8cc1caaa35fd169
-EBUILD qtscript-5.4.1.ebuild 701 SHA256 ad71650bb7c8caba373ae0ee895a866ae5d0dd7b2505f2da8e785775f5487b1b SHA512 fd5c9035096a947c0ff4c81e3fb282a6a0f47f822a1fc617ed17888be54d1219519292a7ffa6ad59ab8e2f460678f4c3c597f16d055643001cd63fc33ffd4d68 WHIRLPOOL 5efa499ed719e099b4dafdd70e2131b60dc38f0ac47bbf02d685eabadc3a41144272ee1cb5a354cddb3f7082654e290480e37d18e20d54408ea2ad91430871e2
-MISC ChangeLog 22300 SHA256 41749a1a1d0eb14e90e6d94c803c44931ad8f12a63d82ff5a56bebc5ceb4bed0 SHA512 98cc704af818570da006a9842c6bcc80bfe0728e4fd67f2aef9128f27698449b6b54ba7cedf1785363561dbde4dcfecb6bf6a6b23f42b4eb4a17c97c10500bbf WHIRLPOOL 6d6f9958199f17731fc6c593dd9af62ede78e2957a6da7042b8ff33886c909d9eed2c8301c8197675db6f57c3332b66e18665e4ef1c5f4750dd0f1284e3274f9
-MISC metadata.xml 501 SHA256 817b4bd1e1634c643c124807e1a49f13e6c45e479020298ea05b0ac0c14ef5e7 SHA512 f9b397c9714b5f42f29e3a3c99a65c0d667ecd72b6ba6cd23f227d504c2bfbf47d26ddc2d3e90a1b54bd7ee4435534de152dff5c43a82a42f324e49fa898b9f8 WHIRLPOOL ea181c97b69c90de23b5e541f476630b4e7e0d5d0e5d880542206607a180bbce132f9a5024de2dff982fc6bf2bd12ef80d0a7d8d843a3cfba411bf1ff8c60e8b
+EBUILD qtscript-5.4.2.ebuild 656 SHA256 a08f9ce723632a9b167fdc451c03a5d82a1fe8e7708b7f775c5a7f7ddc84c401 SHA512 63dea175431a275a7055e0c11e078deb9d4f32cfe037fe7a29fa60d273dabf7841ac48adb0f334ce6b0703a4adc077fec03590eef5772df5332bedc1a2ab7aa6 WHIRLPOOL b9ce8bf7ab99ff18998bd180c8d93a3414f42ef8c9712268ca35b6a4c5d85fd820296419112154265ad3e0bf4f6d6d2dc7b8d20fc60ed6e84cf69df5ce271799
+MISC ChangeLog 22460 SHA256 8bcb6e4ffcf6f26c884ff6d4793a880b2490e6e33a6401d2ae8ae1c359b4eaf0 SHA512 e3e8bf167716636b1cba5ed7b7b171586876c234ee7638a24d928a66bef3d5c7ef54f7e61eeaf381061afd6cdfd43acfeff34395ff4e220df1a454d3239b9230 WHIRLPOOL c62be57f21efc2b3f1018517791f1784fdaa19b2c80ea6aa1990d6a81a0fc4b5ea802cdefb612a3f5768d10453edd425b3268387eeec928e55762dbdca683d71
+MISC metadata.xml 492 SHA256 e949d6d8b6a2ee5654c411cc3e2a7c4b84d304613992ff6f0b7cff1699c06a89 SHA512 96be8ed0e33c9f4c64c8c50e6ab23f3797fcd3733f743823b82708a2b483cd586d07161a3b2e2652599ca5bc02e40ba1937c783d43aa5abc8cd47b40a137aecb WHIRLPOOL bf2b62d6d274f9f0cd35c844b9d053f4e3fbac7ae32911aa254499543da4399f11503e8331b2a2bcd21f5f7812546339fa95d3d539db7674b2d22b01f115d884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplkEACgkQkKaRLQcq0GLl5QCglhveLkDCJJSMzpieBA7bDu9g
-Y4cAn2IxTP8O4Mn8uW5p+DEgpXRUsn+f
-=Gqvn
+iQJ8BAEBCABmBQJVgZDCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9KpwP/33IDhZtW49+giVeuTwdakE/
+ttCYs06I7KhmotS/7EpduC2IjKsAyth2Wfn9FGRq9pET8A1tHxpC9vrWOXbpXoFF
+5P0/ooOMXKK7NGgQhIQ0R6mDdsIzixkoyPpdchwUngje3oLPatNSHOErKyTwqLmQ
+CvvE5W6JJJbu0X+GmvDRowfvJIaGShp2ruCDQSnH4tzlTa5XyaBve2ivzuBx+9d8
+0Ysm9OLvgx4DTF0sYToMNnXktFpFRch8ouJyeU+GXtvV9jrdcTguicG0d4RSHhLH
+DaL3kTybxAPZzJQcGaSf6kkZNGphuVr8HvpnQNKaRu9n/JcWRHbf55Mi+UY0QcI+
+y3x7+9snUr22azxEpFhPc2UYIQF0I3+D+QO0K/VtyvytPmzF7umsNocLjZNKWpKT
+2hxDy/aH0Xo0cq76V9Cp4QhEMrkXrJXBbYtMfcPzy5w2gJKOqYu4qf3nvzNnRQr1
+NfQOXNDKx7bn2vb/7cs09NBxnSTEwGQImgWGbNOY3Sw96yKrckTqNmb7DIuI2Zmf
+fRVHT61+YjhuoO3X2cKWa8yyeh9/oLvlZ7vIwvQhAf9hgdupeRHQT8Zaj4SA/HGx
+tDWMRdFuE5Ap5TMmJgF0Pu4rl8z8XENxyarH3R4+Rq/TcOh0MV429zNLMpsZ0ekb
+mw3B5vAbXojPquogcUpL
+=Ebzn
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 85c8348d0277..9b505e691d02 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtscript/qtscript-5.4.1.ebuild b/dev-qt/qtscript/qtscript-5.4.2.ebuild
similarity index 69%
rename from dev-qt/qtscript/qtscript-5.4.1.ebuild
rename to dev-qt/qtscript/qtscript-5.4.2.ebuild
index 2503e319e91b..633856b2de86 100644
--- a/dev-qt/qtscript/qtscript-5.4.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.4.2.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-5.4.1.ebuild,v 1.4 2015/05/16 10:52:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-5.4.2.ebuild,v 1.1 2015/06/17 15:22:41 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Application scripting library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="scripttools"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	scripttools? (
-		>=dev-qt/qtgui-${PV}:5[debug=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=]
+		>=dev-qt/qtgui-${PV}:5
+		>=dev-qt/qtwidgets-${PV}:5
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/ChangeLog b/dev-qt/qtsensors/ChangeLog
index 6e4c7913a1c0..beb45892d970 100644
--- a/dev-qt/qtsensors/ChangeLog
+++ b/dev-qt/qtsensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsensors
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.10 2015/05/16 10:54:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.11 2015/06/17 15:22:48 pesa Exp $
+
+*qtsensors-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsensors-5.4.2.ebuild,
+  -qtsensors-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtsensors-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 2ef3d296b9e9..3c25ea28add6 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtsensors-opensource-src-5.4.1.tar.xz 2068680 SHA256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 SHA512 89e7101da70c67a3a3394d2e22c741c59dcb1ba5dba930ab72e7b1890cd8fc83620f9617138f968a9f350e5b2137caa458f3135e112842c67f2c313853891210 WHIRLPOOL 41df97ddc5fd7d02744645d38cc51908d5969e2fbb80dad8bed9ce9def76695c11d8efbd6391220a8c5e421903516b017605876f677cb75f398f5de27f3ae1c6
-EBUILD qtsensors-5.4.1.ebuild 640 SHA256 b0929ff153b95ebc429328e16f8a96310a57e788ba4b543b5541f886b82171d2 SHA512 5d1319e722b34e474f52841a212d414841e7381002206963a785351be37458acdf35286e03f16f1be1b2d2823228b09078895a5c650332d514c1d4ce21be9673 WHIRLPOOL 63dbf76d3b2cc60cb0314c568717d5fe437970d991b96988ca067397fddce5827847c5070b9257c988827908eaea9c559e9afa378fc80e5dfacbc6dd33360e84
-MISC ChangeLog 1347 SHA256 62a81f4154886ec0669755436af6c0e609f23f126fe9b60f9ef6781728c5d1e9 SHA512 d687a386a67ba4411837363705d17f4eed5a1b775b793595556d4efc7ef5c43d9ea300384060065add67f0e6277fe3d2793f76ac1c1a4053382cac63426b5f16 WHIRLPOOL 7e4bda47da94bdd48c7aae063a1247c9e2dea47b381c91d1cd443ebd547a34fbeeeffeaaec2a0dca1d308dfe3cce6617d024c9ad74ce1ca63add97a0a2d57021
-MISC metadata.xml 328 SHA256 23497fbb9a498c0d9631987427e939a7b05721e8de06d0767461cd70f7b3cb52 SHA512 0709500b4784b39054809b60d281d267009185804ef971e899d5cc2917ca4bf67a4bbf06270df5ea177e71f6785da69cc22e68e907f801cfa0a3ee1289947106 WHIRLPOOL 753a593d48db3ce884180a3c440bf3c3d800d23df14732850c8252d705f6e2639cd8ba43f180c7b033ac15befd0245ed1f3e679b7b94b865a96d43187ceb5123
+DIST qtsensors-opensource-src-5.4.2.tar.xz 1982708 SHA256 8e6d961df033733a08b3d050515b9aacf7846c643fe5789c42fc55df96dc5cf9 SHA512 6f415bef4fd70aad0be00a097cf6330a1c501a072dc21459a8e7d70c732e7bdf381409eb9b868c46b5ebd7d5285d1f49e5a84dcf86c64f3e06dc553685f73466 WHIRLPOOL 79847c6b8c5dc4353888ea8a345a26a6f1a8490a6a701719e6330ee01562781fd01f544caa18af19927ffd9c1444dfaa2b54295ec344b7d828bc7094ac3eee66
+EBUILD qtsensors-5.4.2.ebuild 603 SHA256 7b0516b3e5896887a3f9ff2628f229a8d10bccaa420b4f2035c06c57da1abc03 SHA512 8b5fbfe4658f221cbe15274c116bb3f09d468bbd31d03096fd82eaff48bc10a13b4a15356c828014d1d37ff19c7589b5e9702479d08248ed7dc0492d23fad476 WHIRLPOOL dd52f6375ae4068479bd58fcb7f1b087cdea3bb70d44cf768f4e6572157d4e15ecc92a2240bc67b68e322dcb1be97b2179a322677549bf40920ee2c7e05fd5dc
+MISC ChangeLog 1513 SHA256 a1997515a81eca23fef5246b6ed9fecf10449f4f9bddf7a253f2b5fbac7ca1fc SHA512 14b52e2b78df0e5144e6470d61cf77b64319b670ce795005b37882f8093bc8f0da825102bb02ecdb7e94ef2f8f14d051d8c374fdbe9dd22cbefe12009373bd9b WHIRLPOOL 967a24201599f86f82ef14d1fb86aeba409ec7578f18d937c6d6f88629326dac928a3772f9e156189bcf12459051f12d299eef6d4a70759b58e44bb85cca53ee
+MISC metadata.xml 319 SHA256 212681205c716b9e41697e65bc084ee49dd4b55ceac610e0f12ec6164fcc9c19 SHA512 b06096e5b6e9aedeff92ae2115250a39da6fd760f512b6be24641d16f2f7c4add35a0fa79a9c7a9ff0ebe0b1b19f41e55b95f46414b06bf6eff0509e164e9174 WHIRLPOOL a271807ee212c50de6df2e8f7ec3c48b9f55cadf37f2b5fcb815ec1d6aeb2faeb1e723c729588bb058e86b13bfb7f82d0a250a5d1758155bc56c44cbd5663da6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIcsACgkQVWmRsqeSphNeiACeLCvnroIKyysCiWpePuWix7qA
-qSIAnjmDoi3c5maHOnr31d7L/k2IlAjA
-=ks9X
+iQJ8BAEBCABmBQJVgZDJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9p4EQAKLXIoBekL2qDvpUnMstfmwb
+vFDzSQbn6YFAbCbNO2BydW9HdVN1RkKcpvh2hOTQthVYWmuj4q7MqBBSNqg+BiuH
+8MMbdtKg+dBGHCzPjqxHNO6Utl2foqzCqM+s7LW6S71n5m5tQS0UbdZk+CKk0Mjz
+Ek8+kphwotoNNQN+2s9HZSNzk82Nv3xx+vwkZm31Oo7VBjt4B7KNaWc5WGCYD0Nq
+6P+MU9ID45XGEVlpFXf8+4yMs8f1B2A459aHEcVFtLZ27W3W5YtgF85Dep6sxlKp
+OEDAuWoZFzv4gwPxWyGXQ8SOoWJz2TuosHvy6dnRTxcQ7rCA667aivkvxpSeNiG4
+HpSXewQbG5oWzIuu/J5F9FjliQRtakwDqF9vVKyX1lwgzo/dPTdleej1LadcNaa/
+aCi7Zj17g4f+xnvRv0FcJcKjJWvzK7n960DEjVUZyJopP5KborkmNK3WJyUC9Pbw
+zWSzPxLjGgSbWOQ0ciDoVbvtXccfJlBfESRPD/l7zZSbxAGIIMxTJ2iGMA4urBO6
+1N0B21kzhb3t4q2qLXNhEn/DfA17cWcYFcXmLf8wgwl0q7cMf+4tIn60sJkYnC6b
+deXAI77c9nqLQUUfYAhaBU1nOvt6G4yYKBhfP67X+EHDVlt1tn0LFh0PeWlU8/dJ
+Lga7hz3vThfdz8t2jcwr
+=0bBO
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml
index add78519aadd..bee66c84d291 100644
--- a/dev-qt/qtsensors/metadata.xml
+++ b/dev-qt/qtsensors/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsensors/qtsensors-5.4.1.ebuild b/dev-qt/qtsensors/qtsensors-5.4.2.ebuild
similarity index 69%
rename from dev-qt/qtsensors/qtsensors-5.4.1.ebuild
rename to dev-qt/qtsensors/qtsensors-5.4.2.ebuild
index 0316238e17b4..689325ce4f05 100644
--- a/dev-qt/qtsensors/qtsensors-5.4.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/qtsensors-5.4.1.ebuild,v 1.3 2015/05/16 10:54:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/qtsensors-5.4.2.ebuild,v 1.1 2015/06/17 15:22:48 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtserialport/ChangeLog b/dev-qt/qtserialport/ChangeLog
index f175a1714633..7f2951776976 100644
--- a/dev-qt/qtserialport/ChangeLog
+++ b/dev-qt/qtserialport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtserialport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.12 2015/05/16 10:54:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.13 2015/06/17 15:22:55 pesa Exp $
+
+*qtserialport-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtserialport-5.4.2.ebuild,
+  -qtserialport-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtserialport-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index fbaaa1ba690e..8959c4d70da1 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtserialport-opensource-src-5.4.1.tar.xz 255120 SHA256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff SHA512 18badeec1a412a692cab4b07da49892597dcdac855c5ef0760f27eb509a4889c69eec1b534778300c1b741a387df3afcb6875c8ab9e371f7c5c69c652dea29dc WHIRLPOOL 2f63357cd48e8ae946dbf8511adc4a86e5ff99e9a60d095a6e1373ae30424a5915138758eb9d15139e55a7e1879d70f291a8ce17b33c7c001281e9d5c458ec69
-EBUILD qtserialport-5.4.1.ebuild 519 SHA256 908b239b646d01ba2ad0d580366f602f71a353dbc86373fbdc8cefa8ee6744cf SHA512 ef89b610f8182a1bf0c5450e96ff8f48c276498bac71f1c81fa28b96cb36981c895b9baeb991f736e0a5c8d44ed3121b70dcd4e3b00fd074fc65bc50c9a3a68a WHIRLPOOL b3696916106481bd3b51ac824c871fb44bb9b0755faa3e7869fe524694572f54f36f987d4e00478b9aaddd141778ca66be3e30f000aea870acb273f0bf02ed2c
-MISC ChangeLog 1442 SHA256 888e959cba5ea5616ae3aa9b0a41020079b50ea0e37aec70843fc43fa247de0e SHA512 6bff92495531e1140c7460debaa50433e9990170f0ec305111dbcccae397e4308ee8bf79cb1656dd03c68256f71ece33e53e2c7574eb6ef09cf01257599b0fb3 WHIRLPOOL 51ca7d55487d95babae1b15ba539b22183ce4b187efdb66b0975bdb34ac9c0f2a8ff3a4416c3c2849e689f3c65f054b53e6a4bd303e3216397136fc8a41c775d
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtserialport-opensource-src-5.4.2.tar.xz 262316 SHA256 93cd414e809beed424eee018338e84742509fc4bc78e5649fbaf370a562ed7c0 SHA512 e52c0d10f51af7546a77372276c20c008c647d1d43c4a267f13e484d88d0cbbb565fd1b93a9526b721357f6c6caaedb458d888c87d6826346d417eafdf5c4166 WHIRLPOOL 567e30cd8f3ea47ef401b7564f595b4b8359d4b1278bd3648c0b1dcaad5859e0594092176cd31bd314093cd39c35e6978a5b98e5916345b38edeed96c5e69cbb
+EBUILD qtserialport-5.4.2.ebuild 490 SHA256 6c95d5a63992545cd343d58cbecd77174bb3913470ac3404b04b760203341317 SHA512 f1cf59ea0ee64fbac2328dcc64e0b4d40f3a987ed213c4685155dfc5cc8b16b1557bf51da9b45902b3531b8112b13aae00ab17475ffae551aaf49f51d9a5baf2 WHIRLPOOL 8771810bbfdfa8fd84c56303cc892a6975831e3e46ec6394ba7841614515fba2b4ad4b6b7188ac30c9c1d1e7b0dfa7db5474c7f100ae2719fe01f73f885ab540
+MISC ChangeLog 1617 SHA256 6fb7e7e280317d043692a0112cfb4146e81b289971bab080bc38b7c0a9f4d899 SHA512 18d6243661825c0ebddf8cea18b382bb78afed2d43d479cc47003cc250e3a7afcaa9e35bc8a8558cb2a1c406114813872b62ab82d5993e1d8f0a67c095b183e4 WHIRLPOOL 87df8e2d2a6f30f5aa9a3e0b6b18f7b1bb42ac0299b9bc2ec7141ff21a0a5d78e3e99925e674d5c81d7455702740bf4723e2f7452c339ffe0b87328c3a07f276
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIfIACgkQVWmRsqeSphMCdACfZzRvbXsCQ/PPZePlAc/EE3Zt
-cB0AniUAkG7rJalR8jgPs6950euw4GCv
-=T1iU
+iQJ8BAEBCABmBQJVgZDQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RWcQAJfY7F7uuCZOsLI7FHkuLrSu
+iP09cBCY00kuC6jMrkQxKoDD2XUcdbgZb3SKx5tImcYDRUBbWVKQFDScfdP4W2Ca
+nmgoltm5uzmq3dc/iKkdATjEWtL6ATacBT2LyQ3tteOeflzwEXJx6GWtTTMsL6QA
+3bsxcIF0DifQ5322fM+BqGLczCeZMQO1tYDXQCB6NvMKJ6wAsTpY4kZDvve3NeUV
+SFawGgK94Il9iv5EkvN5ZU5ffOn6wvwsnxkfLlR2I+1+L5uBVWpOSyHomvn6qp/7
+0QPIXTdKw6tmQEsswJzxm8/Sw9aDAMKhxgk9RYx1llNpWZv3rVJNqCnQqs0Obpus
+4QZCRw8SbyMAzdECQ4VnLt+o0DX9RQGMoVFyM9sTAWv3PeZXVR1UKQcXvR11DD00
++bIs+HCMd5C/UDtSLlhevrxizBf7WOPPGyK6oSd7yGeolhFxeBjyojz9n2nnvQQ5
+1+dZdMYYfhgaG4LUdQbNyV550QOJuyvN4tHb/Tz3XwIaa/Dr1faGznDZAMoCoke9
+jnGDudcej55jcGTGUEnfjQniqtCJMCObJMzhdoXjUtAJ/ogPfORqRZ7E4k3YrmDs
+/qZ2BFT1SIOWMuDTK+wikybO6D0EHqsGGrqw9iZXbKewljuzKwJeWhRgR5L5rVa3
+ENnOo13z15jrmbrF9Qv4
+=2QWM
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtserialport/metadata.xml
+++ b/dev-qt/qtserialport/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtserialport/qtserialport-5.4.1.ebuild b/dev-qt/qtserialport/qtserialport-5.4.2.ebuild
similarity index 70%
rename from dev-qt/qtserialport/qtserialport-5.4.1.ebuild
rename to dev-qt/qtserialport/qtserialport-5.4.2.ebuild
index 49c3b31c3d7f..3b5e86644bed 100644
--- a/dev-qt/qtserialport/qtserialport-5.4.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.4.2.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/qtserialport-5.4.1.ebuild,v 1.3 2015/05/16 10:54:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/qtserialport-5.4.2.ebuild,v 1.1 2015/06/17 15:22:55 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	virtual/udev
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index cf70e86a1b38..d467fa38e89b 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.38 2015/05/30 10:50:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.39 2015/06/17 15:23:08 pesa Exp $
+
+*qtsql-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsql-5.4.2.ebuild,
+  -qtsql-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtsql-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index d92edb1603d2..331361a248d0 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtsql-4.8.5.ebuild 2491 SHA256 4b025b64c2efa0a0c68013336770a70bc50c176cba79c2bd846592bb14e3d29b SHA512 31e89c38831796cb66beca7c07e0359f2523be923eb6a05ec91ddd82452b5b6d6b8efe66863c21a02b4a84e14f3486f9b0d2eff970d2b1995a747d80260a5924 WHIRLPOOL d85c1715c7cce491637873aed8aa6f60d8d5682d7f881721279d21800710f8b5580aa8abc862769b270a102669904e5ba22614bbebc21953e6c5c0f80105fc51
 EBUILD qtsql-4.8.6-r1.ebuild 2507 SHA256 7389ac5935762fe354b9f25229236bb7e5a423a8a355797cc617528804728900 SHA512 72bbf3158a75f22a19e74adacfdf2c2cdb040ee88fbd7118680b75ffbd13eb6a47165e58d7080a388200911c20d26d8593aad742a45b719903f0b43d47e177c7 WHIRLPOOL 5a4cb4de4c6d62a53ba89d96eab7ff82692ec136371aef1cac4d4c3a56ea9d153e841d6dbd7cbb480423cd046525d64a05c985c56205e72014128544d32dd657
 EBUILD qtsql-4.8.7.ebuild 2474 SHA256 2ba93cd91f0846aa4cc43c2a9b0cb543fd0594fe7c1a9f012de41086333ccc00 SHA512 9a2ac2c749137bd6f01a25ec9501f217fdaee55291cd5b745617e81b2753fac8e2e4921da5fc8549d379cf976e05276517f6b8f0e8779568fa29507373dea52d WHIRLPOOL 35e537a438b95eda7790651fed63bb4c294c280696f38a169c8622c7c4c75db073b941b8cb9ccf139d294eb3f2a347f410649ea14e56f7f85d620fcd87cbcfc8
-EBUILD qtsql-5.4.1.ebuild 1541 SHA256 e5b82f390f8e29e1219c53e02dd1a766f210b7604d93d9dc89a7be114ae0fc99 SHA512 9474a802fdbcfcc4cf1eef9d6529c151f6132e919f0d65cef88fa6045600b22bf21b60cde1378e3bf721e8e5a5033e41327d574c18c2fc89d979fd7922241023 WHIRLPOOL 83c99d87cb58c64986a9eae29023e992b41dab10d0f360fc5c3e7071fbda9e755e869aa0326235f0d3171e234cb62dcda21349da0c8634ea75b9640501d69477
-MISC ChangeLog 23936 SHA256 71c0441710c1f0cbb058f8951eb9535eec034b7ce907f2856f1e05bef2abc1da SHA512 f0b7ea7586c36b409c8b8883049d9a62d8feec8e1c50b61d1e25746698b048e34f26c18002e43861f4f20610448d36bc1f49df9ae7262cc6cc816768f1b77576 WHIRLPOOL 68c6d5723b8a816559672bbaf04a2be127bfad5185da7bc34c6550273ca0f7a7f18fdacbe1e4fd558f64d773a8cdde3d9448e0eeca063d22d2f8332d3fb3a64f
-MISC metadata.xml 488 SHA256 91e75b5ca67976cb4116b41198d28f71ea32ba3de262c4b08f2af5fe5e415ae3 SHA512 510ad3b092b9bd46d6b6af1eead24b565fc690ec3b8bf9082327973dc163003711a4d954de0aec43ad91703ba20e85248f49b0e0e4a73a43fab81ca4c2945038 WHIRLPOOL b02a637b20859aee4f7a0d6d78a8250f5b616d6a1d7b35e121f9bfbd6237383393cbec6adb4de07c7a9327fdd9681c6700df3db0dd3920ece0dbd90a12ac999c
+EBUILD qtsql-5.4.2.ebuild 1511 SHA256 cb3985980c828819889fd4b7634a2764ef7b957cbfb86e64e699d3df59eb3165 SHA512 55f25a42e984264881f044a601d00e81508d8f45f845c6bfef1be64d115d4e290793bb9b4472dba3015de99f5dab7032d61fb6f4891b5c0fa3e8e9cd45cc94c0 WHIRLPOOL fb5f4d666883e6046a2d0bf10e39fe7509258f5adca7af1f5dc6659b1136c840b9ca6736ffd5aa40bbd5734162a3578fc6380cfd7448155ac847d475c0c7b327
+MISC ChangeLog 24087 SHA256 557250c3f8dc740187262dd970bd3749617daefafa8ef58e269f92438013ec48 SHA512 38558e829622e3c45fd65e812ba4b0bec8d1fc48d699b7d6afd0d59f95c5dce7a7d1f7d3f4a446c1502931c49cd8eb7f68697d3dbe3c614999d6e2b8d6a380f8 WHIRLPOOL c3112f02b7d0512e1b0f40a38e35e57d9b6cf4445e995d4f6d3fc48603fd52c60f9faee05b70b4a1df4cacde43f0e84af2edce1587841483378ba9d5b5f30ca4
+MISC metadata.xml 479 SHA256 253d93b73ed501e979dbd9f79eee8c8acafce7babb1ff659a3a1d1400ac41d6b SHA512 21540866b06984ecc1a59ec68f67cf0ee63fcd2692481cd4f79b6830f060a477a9ddb5abc3b169ae796dad3f738e3c1d3f36779bb65983149ca84fd71f49b2a3 WHIRLPOOL ad924e4aaeed7ad91078211bc95a2c08f080fd55a757e6287fedb14a30daf3d3c0ea38d0a936ae723a760305663ea0d424fd9fe4d84a5ebd841068d66495e392
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplgsACgkQkKaRLQcq0GJsJQCePgdVTSUg+LeZgBYc6XzJObBk
-ulIAoKvNTyI8WDEQ6jN+nW31sAk6uAa3
-=6VFV
+iQJ8BAEBCABmBQJVgZDdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV93BQP/2Y4WhaWvul221zRIJwU5siU
+awGfEKS5h0PbNeYu70re36YQ4KAlHfAMFkqrueZsVhOpKh2dpQIOvjqZ8VnSAZEC
+6nwpe4XBIquI9sZ8qMR26rgGZDa7W34doYy5XPFuGD+eNpK3ikwdUaUinE/NxWIs
+Q3akicAFG8YyV73hUXEWfO2MuAFInBaySwg/zxvfaHk2LefJ+RFnrIEDpdkCBlEi
+K9Nwu+xXMOaZyAB581zNYrrEbbiR3SHkSBs4IwxVToq9v8gxMan4LVE/KKIsYdco
+2LEo6CCF0iLtMAzZSciNr1GWdLfVFdoCHvKjRU1CLZiLMAmwb49gtDB4MMImHp5t
+s9EJHMFsqmmfCyrAAlYurzE7kYZV0EoikOSVP/tCQJdgvYYDt14f7kBrmUg8mgWB
+Y4QagDSw68IlZ2a4WAqW6KwdRucdtFjwEg0PVX2tLqRGPkmNfAMCCtOEC/QuQiBU
+fzPil4DQYIfhvbwjFUMmJmF7ePcFQ8A3shKMnPq2nrLwki+2z7u/5tHtRH7pG2ur
+3N+JYrAhD+mRebGoji5SBfQ6/0BDhEZidGQnbVLYwRpcj/PcDwYJcm9XYwJz8vGi
+hB2fN50aJVloVK5zhOx6OMobDybmvdkqlCEYi5p+P5shHb1qvuccjlD52FZFJTxh
+xKDzddm8B+z9l73NaWjh
+=/P9T
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index 1aeb285a697e..dc8562cfec93 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsql/qtsql-5.4.1.ebuild b/dev-qt/qtsql/qtsql-5.4.2.ebuild
similarity index 87%
rename from dev-qt/qtsql/qtsql-5.4.1.ebuild
rename to dev-qt/qtsql/qtsql-5.4.2.ebuild
index 149948debace..8e4afa138e1c 100644
--- a/dev-qt/qtsql/qtsql-5.4.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.4.1.ebuild,v 1.4 2015/05/16 10:28:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.4.2.ebuild,v 1.1 2015/06/17 15:23:08 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit multilib qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -23,7 +19,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql:= )
 	oci8? ( dev-db/oracle-instantclient-basic )
diff --git a/dev-qt/qtsvg/ChangeLog b/dev-qt/qtsvg/ChangeLog
index 588750c3dc74..b841d8297090 100644
--- a/dev-qt/qtsvg/ChangeLog
+++ b/dev-qt/qtsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsvg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.33 2015/05/30 11:00:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.34 2015/06/17 15:23:20 pesa Exp $
+
+*qtsvg-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsvg-5.4.2.ebuild,
+  -qtsvg-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtsvg-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index ebf7362d614c..74629281056d 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtsvg-opensource-src-5.4.1.tar.xz 1758812 SHA256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c SHA512 c3fe482f774c1b8d1dafadf22fd731d4d0c8b6c06bd4479e08219cb9333236ea70558e59448657bc2f960d7084dc88a83b09184647de6981f702f4d42157660b WHIRLPOOL f79ee7d7496b03a9b377fe0d8c94e820cb1f582d1b5774e0eb96e3395192c2dc00f70990f0ff6af8adcda955ed457051d762e4a9aece467ea165cda4c3fa7ced
+DIST qtsvg-opensource-src-5.4.2.tar.xz 1793936 SHA256 7f2a66a9bc55eace254505475a31b4d53f0baa74b65a81da59bb93122eb35eb7 SHA512 78d389a02b8f713b34b34b464f4b7886545baa01c6eeb99dc03a7c467cb1ec72a16dc1eeb03e1b1b622354eeb873aa6a4aba2f2c9b603c2910ba84949a5311f7 WHIRLPOOL 4a61d94cf9ea118bc51562e3cbb0a783f515d80ae81092e98fcf17c6d76b6f94376c7313271e937b145f057be99438fb16a66bc62109641437a96154316f5705
 EBUILD qtsvg-4.8.5.ebuild 1492 SHA256 2a63796f92c2320f51f5981618079b3e1e34baecba2a65230f35695e4743138b SHA512 b1642d376047ebe9b640a2d2ecb4886b69afab0465700f1d38885f7951e547825f8f55d2cf25e8a14544151fb1990d4968719a9ba00311be1287184927e3e0f4 WHIRLPOOL 4606c6934b0e858e1107821216318da23787e3d9d2ca71414f33fe975907deaf8109b53b5d0f6d163c6194ad4147bbffbfc6f54f4c1cc95fad79cf48b54c2572
 EBUILD qtsvg-4.8.6-r1.ebuild 1375 SHA256 6256bd45fef2ce561e380cd9ea07f818e0c3882aa8309f89a8ee36050706f70e SHA512 364b6a24b3150bd2f3a527ec51b21a01ce10d7fd7f74782468e46ee381d95878350a6f4cf8d480b48386ec41ab97bb0c54e063181fb02bbc349fa8bb53a09237 WHIRLPOOL bcd203bd1c62a5d4797be0b54b449a6a9efa945a90ac58af5b3925e16c594a8412a173832f736c0f12e0b9709270440e0017096152a16a9098759c7a18fe0c44
 EBUILD qtsvg-4.8.7.ebuild 1342 SHA256 5f19682311a3befc33eb06bfed1a6ae5d1d97b693fe0820937cb02777ec14ca6 SHA512 b65be88b224da07bca465e2ebcdc466842c5fec43daeaadab7a73705566fccc1028c058b281be6acb35a17f58437ed9c3896dbf06c1000d198aae774ee269eb4 WHIRLPOOL 4828a6a7f0d0ecba473fc0af5428f598be3370ef71b6bcb1dd273f49b9becfa012fab579763f56480569d07b0401e3d22d4bf322198746ec1aa64fab483f639d
-EBUILD qtsvg-5.4.1.ebuild 615 SHA256 0745548995ae5b4cc7d41c04cf1a17b6ca72c1428e30f9ddcb36d279e11e3fde SHA512 4e19e22655e78c22fc1d4848de781abbbe9a2d529b7dde2a8af49068655856ba5b27cabc14e235b57ee709ac434859b5d6c3b940260669c43052a807df41d521 WHIRLPOOL 7eb0b75a40232cdbd7cdcee340320556105168d281cc4b6623f89049f583150127e174d8565b79dcff60aa6bae410722f263df44606f1570d01ad5d132fd3729
-MISC ChangeLog 19491 SHA256 aa4ba50fbc8f53b115054d82f0bf7f911a970cee592ac6800863d7343676b36d SHA512 5f7a6b3a74a405db6bca3b2c4b82f1275cbf3fd2d6ab85c2bbcfc9dd28164c5177a316ce621d446e69664f96df486e580a5f1b9577672f76ab17d5de6ed9dde2 WHIRLPOOL db7825d41e64086375fcffdfb35a9637f12681c790928c3671d7db844a444d20172b1608e574a5b729e47de950c42f3277a98c134d41c2d3c8b29eb89cbf1c36
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qtsvg-5.4.2.ebuild 570 SHA256 ab0660aba77b0373640c7d61a9205bb81426810c5dc4c011e4dc814d3874a691 SHA512 021c936e96e96f40a1c3fa1d992d16a972c13d85837135b7088921dd61e35f4983d5d59723e4ec95b5e049d29364cabbc5f83f1ce5986c45e4d4da7ac8e897da WHIRLPOOL e357ceca5dfe4922f9efb54325a1eef474db943f992dc614ea8f83f32df45c213abbb5f96a29c30281b318f0e9961ae35a9a5b0f95c04887b15c5a3389890b54
+MISC ChangeLog 19642 SHA256 1d186c3f6552a200434164aefbcdb12fd220895e1cb4cd2164f41cf92d01c51e SHA512 c53c8800fad8a3d5b3fcb57a8061f49ec162c2a097a6f70bb95f23ba0a9aa73b62954e592135921be09ad24da979452bbbd9b91e57ddfa2f0c21d9f6f09e05fd WHIRLPOOL 26e8ad7090abed43e35a15b36bd6db7dcff2d1490a8be91c27028838df0c94aacb406369f3d1af48202dc13ad0f6bcb10c5fa57bc3c378da7de50cc49658639a
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmE0ACgkQkKaRLQcq0GIUCwCfYwKmrgcTZ287uWoDjZ6MP7nm
-8Y8AoJU883p8NM6CsBBJr4D80lyiEyrY
-=WHtv
+iQJ8BAEBCABmBQJVgZDqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9+mIP/jjaORDhTwlcX6G8GFkTEJtu
+AmZt5P7MqPFaKJDMimfg0QafVHn+Uu+W22q7RmI5TgPdXg9meN6T6CHsUd6uKHuF
+UuLR+t5x4Qdi3oAlPGOaVMYpo4cbUB9pQeeuh8t03kcC/o1T1SwmOvQfVa95qYy5
+BoyQNwHM6lRIu4J+8MizRgLY9rYHbpI4uUE2WxiZFkbJLBG9FvX8JV8g0dyM3AZM
+7NqZLRhN2XgEanUtNc5tiHA5U4k5R1AfM09SI9aX583YvrJEtoIL4oZzim/Uspn4
+p/xEWHfrlTdwAlXkyQz4LRh9qw8SAlXJT7b71TP/rLnETj5nVeUcQ0ugQFJYXN6v
+5oVODy9J+yZgHlThJ/LePfM5Re90F8j5xnJOZstLXGYojBEPq61cnUVAdajsuM9A
+fS0sQkySIaJGPc2MG9QVfajUBWX9v0iK/kx0c7yttmN+KQqLqIYW8GF1+VfJboZz
+VsA+K2eyAlAy6nHcWftPf3Uq/PLV1hr7a7qkJKfafTFC3oFfgUX52U8klqw94IJo
+Vn+voESDIFPQpDumKZ7+IkGStUtIiixpaxjDFh5vJmoaUWPYJNtZkarREWCY9qAC
+kwM6vLPxhAnIDATckIlsoY6pXh4QdRlln/GUFFXrwUOsIprk7lthVW1+mYbzm6n1
+TQtvErzcBtFWB1wjPnds
+=87Yk
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsvg/qtsvg-5.4.1.ebuild b/dev-qt/qtsvg/qtsvg-5.4.1.ebuild
deleted file mode 100644
index 136886c4e809..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-5.4.1.ebuild,v 1.4 2015/05/16 10:57:14 jer Exp $
-
-EAPI=5
-
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtxml-${PV}:5[debug=] )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.4.2.ebuild b/dev-qt/qtsvg/qtsvg-5.4.2.ebuild
new file mode 100644
index 000000000000..922b1ca14c60
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-5.4.2.ebuild,v 1.1 2015/06/17 15:23:20 pesa Exp $
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtxml-${PV}:5 )
+"
diff --git a/dev-qt/qttest/ChangeLog b/dev-qt/qttest/ChangeLog
index 98d3dda47719..24602fa7fac3 100644
--- a/dev-qt/qttest/ChangeLog
+++ b/dev-qt/qttest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qttest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.33 2015/05/30 11:07:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.34 2015/06/17 15:23:33 pesa Exp $
+
+*qttest-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qttest-5.4.2.ebuild,
+  -qttest-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qttest-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 89f4ca2fff5a..a7804c8c7530 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qttest-4.8.5.ebuild 1235 SHA256 9af9796bbe211556c571dfbbd5df2345537f8256d14575e4f744129c0584f518 SHA512 06fd671a287d1ed6be3ea851900b7fa8a33e322f6a174191d7129dc617e389c38f9802960ad54b589561c05c244afff5f1aa70a8cd654038c0341238b70113a6 WHIRLPOOL 65b770349dc32825c820385f0eab705a0e5b4115633487e03b92fa3ae9f31f6355719624a5f41b402b0acc404c6e48d20e9f51eb2ae49fb86f82a0e98bef11a3
 EBUILD qttest-4.8.6-r1.ebuild 1156 SHA256 122b72ca383e3abf01f53962e5ce0532cf46780a873ef35fd79e104012f30c7a SHA512 3394a7297348bd6efca64a680d303061ce9eb4fb686b7a9e3b71c26f3bdedacd28a7fc5edfdcf97dc106aee70bde272f1433f59879bc5f4a6348181621c35d5e WHIRLPOOL 96af4ce6f6fafae572db0fd94c77332c142ffdbb1ce1eb48723facefd0cd53fe1a5963068b0315503153220bb9b9a062a126b553bb1180e31913e2fa0c2402f3
 EBUILD qttest-4.8.7.ebuild 1123 SHA256 20121c56fbd8fc959eed875a8032db35f36c67e0849781fc938c8b13d2bced75 SHA512 566991355441953df17cb51ec57248e143498c307cf7baadfa4e8535ab5aeb7b638cfa9ef63609727b78d737ea68c906760684d1c0f29d113f80a6fadadb6b87 WHIRLPOOL f9f344d36cd37b51ca6a1d7f89bd0caa82f6f7cecb9da8df3b4787b836ef327d5cbe9390d9dc39e5a9d6d942b87e315ad4a6c123c5c602525d04b8cfa1138872
-EBUILD qttest-5.4.1.ebuild 643 SHA256 ea77b476e421500761a207ed81bc340c2bdb92f55b5279e843dcb8894f002c23 SHA512 767ec2ecde59b401b21ccfc678c0bf720e059b79de909d664ba66afdd86e7643b4afde7517cd0a28ab991bfe4a0b4f5706d0f544b0cf87805566093174072a6c WHIRLPOOL 623ac3b5556a6cf1100b78b90925ad03058b4ebbf1f4711ce24b759e573f5bb292dcfa1d45e79827b7da68f7e20b19185d76adba18cd7b215b9dae7d06f0587c
-MISC ChangeLog 19578 SHA256 cf5f51d1ff53c93dd038d05e1ee54ef0373ffdda53667b12f0356ad0c7e7f50e SHA512 1dbdd9b2f712bb79568dc85d55ac84958a8b232c8f9f82852776dd5927cd01976f5796ce4eb0a601c5ff82aee202bf0a450e53970e8b404697bb19a271cdd1c2 WHIRLPOOL 4bd909ba06921bdfd057778c400ef94c66b548537de466768a6c76f8a97519f6d217ebe4b388ac7edf8e32ff5b9515232ca0f7a15b53790167a4df450f0d30c4
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qttest-5.4.2.ebuild 597 SHA256 c8f35a8045c7d1583687cd83618858657934c4aefbfc8d9c54505b2c5cedf8f5 SHA512 50ac38329e2a3c0bc6026867f61534de3592e4fd72c9cd2c4b78f8d66809b9b9972facadee61dcf9343c662676cc37f88b2ae3d16bd3885edff2ce5576e529dd WHIRLPOOL 7310b3f6af2e065a70d06e01df2827408c4bf7ecab0a52e99b9eb39492519b936223174cd4fba1abeaa594a7f6221610d274702f0ea0c9a029afa24e52b994d4
+MISC ChangeLog 19732 SHA256 534ff616380a301a967cf4e483ae96d1be92f50efae8da9b63194cee280e1e09 SHA512 3000aa7fe3a94dd449a47142d0faf4cb7968a6368a6ff69d6e1f39d0e9ebc6f0ef3da174bc23b009e887cd92fd2a5076df272f63001af93dc925e9454ca2f215 WHIRLPOOL cb79bd14d6a99cb4cc56aaec368efe15fe85ef61632e859a9a236b29ab1552f20834ccbcf931a37c003e5d93927e2ad601786f0a2335c36764fc2f200dc71d71
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmdcACgkQkKaRLQcq0GLhwgCfZ99tnUDTvOnWW6QJxBAB9K8D
-xcEAoI0hDiETiqrFGEvEmV2ajdIWKq/y
-=C+7g
+iQJ8BAEBCABmBQJVgZD2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9EOQQAIsTvcPPAemLk/r3QDqlw2uo
+MwkJeS/hspbA1VNL9rx9bw1u5W8DEF66psejOM9q2bCAZ1N4CqRNkYbFT9v2QFAe
+ub5PBDgb+zb955/KALbZvhpJVoH9TXo+1cipMcOZON/0FDb1aZ3M90IMqeuFS2Eu
+vt53XDJ8XtowWfwJCH3UuVDnutMVcQWti7aJc01LXtmF1BbXQGUl6I8h+lQAXw9I
+IIv2aQA6HsZwmAtLa+CWQZV9UP+sCgE70AlvdVTbxmY8j/k0VnB3G3m8v6/XvawP
++xicUW12i5rOPUi/OqnZjLaF/s0wZoirbTeFIKqZur9TcYZFPWPU21DTE0a2LbeO
+25cydE8wjAkzLIxWcWi6DWx3hSM+bxOCX7wEXFmB++/ueRI/4mnT5Ywh6+UTxYAJ
+yvnEDOnkdleiYjc+Hoc4jLTKlJbsFs+xpgt9jP53JR0YifL7kvWrqOgdbCu1Wn1A
+fM4fqZWMg/36gsQy925zWCKAmrWShywfWGEHUbjlb4I8b02yqESZvY6tzi0xIQsS
+vixTENfWjZc8RPK+RaXMP/ccFFzj1+O9Y/dZSyibnLhPmd2I5gbSnrVkiTB/7F96
+Ys4JpNmHUweKZ8M72kbHlmvMCA5DaRMwYkposB3Ov/DQ53Dko6VVw2yZAs2e6Nx4
+g+SDWBboAAcBZjxXS0dB
+=Usig
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qttest/qttest-5.4.1.ebuild b/dev-qt/qttest/qttest-5.4.2.ebuild
similarity index 59%
rename from dev-qt/qttest/qttest-5.4.1.ebuild
rename to dev-qt/qttest/qttest-5.4.2.ebuild
index f58b26e3e4f4..0ca0d6d589b7 100644
--- a/dev-qt/qttest/qttest-5.4.1.ebuild
+++ b/dev-qt/qttest/qttest-5.4.2.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-5.4.1.ebuild,v 1.4 2015/05/16 10:22:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-5.4.2.ebuild,v 1.1 2015/06/17 15:23:33 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 DEPEND="${RDEPEND}
 	test? (
-		~dev-qt/qtgui-${PV}[debug=]
-		~dev-qt/qtxml-${PV}[debug=]
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
 	)
 "
 
diff --git a/dev-qt/qttranslations/ChangeLog b/dev-qt/qttranslations/ChangeLog
index 109e9001b151..ff70342eebff 100644
--- a/dev-qt/qttranslations/ChangeLog
+++ b/dev-qt/qttranslations/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qttranslations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.23 2015/05/30 10:47:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.24 2015/06/17 15:23:44 pesa Exp $
+
+*qttranslations-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qttranslations-5.4.2.ebuild,
+  -qttranslations-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qttranslations-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index c217b9382d3e..b6f500ce1c94 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -3,16 +3,28 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttranslations-opensource-src-5.4.1.tar.xz 1071784 SHA256 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041 SHA512 901d4d146f97852755806b098331a7893ac5847a95d3a1c6eea518cf8d9b64369a073a5179ce52f61921c443897f2b6eb942312fd834c381b1a5fe1d209c3ccc WHIRLPOOL 875d2e6960e0d2dd4ae2a514f1682e8b941e0901c484b2c93df0cd8564395f6e1930d66ab228c0ba65515da5ec673231d47602357f3f4adea0bef9b1482cad6d
+DIST qttranslations-opensource-src-5.4.2.tar.xz 1104996 SHA256 9ab6ddb730b1862781991b4ccf53ceaa3f21e9f8bf1c5c49930f7d135832942c SHA512 550e0fcea83155fd4e7e483c92c53f18c733f2fa6c5f179957e0c9f25692acb08975be63fd70974bfe3db7c2efd069e5e915410a8bc34870a26628ce4f99f021 WHIRLPOOL ad9bc0f0bce2e2a41308020ca41d6a7e8c3c22240bb22a1e3187a12645eb36ea4403f98bcf6bb2af6a68c37233d8c38828bad11b831cbde7aa60f0a3b8994711
 EBUILD qttranslations-4.8.6-r1.ebuild 1025 SHA256 a95260081247cf7c6985036ba24a949f588749ce355b96076ed90955dad64448 SHA512 54d096eae531d3c55a6e9e6d45d1f262540d0236c7b47be5b20902a0316d285a257cfde210fd6d9c736aea8a42eade089d22872ec971d4655a792d8706c2e95f WHIRLPOOL 61851bd392bcb4d3fac315998e53963e85eed1c31ef9dda0427fc62c44d7d42c541a6821aaab36075e6c2c33e696f4745bb7c95ad78dcf29408442c50e56baa4
 EBUILD qttranslations-4.8.7.ebuild 992 SHA256 cc582e09de0be0f68a1fdabdde13940dada3b36696d9eba97519eba621dc2059 SHA512 7de358fc9722d4bceb4c371eaac0e00747aa02895529da526ad1a7349c7cda588a320088aca913064af2f0e616843798dc49366aa707396fd234a7510f004a52 WHIRLPOOL 717cb414b43841cfc3514d9d0f034ebb0bb7e4f4b306a53543869529d420efa410067c51b4d952546c1c607a4422caefbc1325be66777b70af9a2c85fd328910
-EBUILD qttranslations-5.4.1.ebuild 511 SHA256 eb34a16d34817aa4374cf5c7e2cc1479dbda44cbd0617d0b3c95e101dda42826 SHA512 4f35d695e233ee288133a24b2f9935ba74dd1e7fc2d31f783eae03f2d563cf3d8ead5672dff37c87e00669626b5cc27f894ef76b037ac67afdf44cb969cc2df3 WHIRLPOOL 6b7cd2333cf6c4475deed210524982e83133b6a104f67aa58339a5709ba3f9aabd850c476e068545cce3a14c842025de3aa04034385a080e64462e636e91a435
-MISC ChangeLog 2818 SHA256 06ec1b85dc1bf1ab3feee0750c09aa0501b9cec624bf5f3ed3ff2bd088435f76 SHA512 716754ca537cc6e117dd72f9800d428f7ae96f9a3dbfeeec87088e6aef5e2c6d130760ec1e5e29eb64b40b3d6bb7155b9cc06c0cf895a72b5099c487a488f4ae WHIRLPOOL e33a4b23e9a475e4f6790713e871fbaa087e866b438befb4cdda284621634e23c1bd69a2b93a5ae53340ba0799df3a46d421b14bb4c5c79f1e8d5eded85e6b56
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+EBUILD qttranslations-5.4.2.ebuild 490 SHA256 f90690785adcba76c86eb295e33d021077928aa059095d0d2d63bfae439838de SHA512 fc21a4bf47e5fbd54d940af6eb944a85415f5557db7d7fcb71d7995575673732638f99f6196afb40d5247f34296e0ed715808387f98d1923e18e0c86a5e6990f WHIRLPOOL e4ab20a36be0629e9aada0851391f2239da4a8ddc84df3be4ca5f00f2f886b4a01d4c43dbe3e0d7800e26f67d86c237fa92a6983f26649c29d186e80733b2ebb
+MISC ChangeLog 2996 SHA256 55d86bcb0196fa9d07b9106c3cda9d6d724d96e34b1552be2347d8d5a4b38735 SHA512 742b1440a870a9e327cdfb4a55ad1b10ddbffc34b239a875ee24c62b085f8c2831be3039bfc943bd74b6498840978e7876fad97d30c77f7565b4b9361fba39be WHIRLPOOL 6afa8302cef85c55ad6208e78e3f60d3a6697e821c4007bc78db1c3459af87fa21624c7b3c5ecbc98f4b4cd59368324d6d8dcd7b51c2923af57ef1deb4c9e5ef
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplUEACgkQkKaRLQcq0GKo1ACfQ3UgbvG207xKpXr3ZL5X9mGu
-zVUAnRV1IAtLoS8zFztVrLLgx8CcIYoQ
-=9XOX
+iQJ8BAEBCABmBQJVgZECXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV95pwP/3U1Et67xagxU4/NFove4g/l
+aOYv8Zj+vrlEJOmxEzinjNQ1WJZ5ugoeQDroRoEv1Hcl8saMYOHaxGPESez9UlAA
+Heav5hnWkEyfb1uv7JtoMMZDcEd5+KQqR0SoAeXTVYyyOxK2rQNfBn0QJYz2QzLd
+/X9pyJKjdeJKBdYZdZyt6B3O/lTS4pkzogq/uucLv5dLlpF8mngCqYXoOytyMyH7
+srPN6C3yMZuNqHlc2/9xuK5fX0rWA6DtLKKra6cNy3djTSBvND+EP0wWwanRs/SJ
+TGi/g9ZquslHg1Kfu5A3L5nGzj1594gnQcpxw8Ofa2wEfdeHxYPGSQvOFbs+G5DP
+snpUsWMgHmB2063lNZdAnctDCN5tgbLKpHQUAYcbQRfrM5SlXJPIa7GqeGsW7Zdy
+f+YFDu4AGjq007tytnw5AQN6KmhzrQIv07YbpmAhcjyH7XiUIKs1srTG2MS96/1+
+AWzuMALb+HwDYzNX/xl7g0xLn81PyDIwu8yE1JqWRKfse67aBw0rJAJELlBuxhK6
+ilAiZjxMQ00kUMr+8eSxrndzfvprpWnnT4LRFLLO+RJ0qr7HP7bPD1Ma7rYs2oZS
+4dLisVRAgM8hwbOc0WixrDrtdBkMcOlAO/cj+fm5n9cv0lPvXca30w9VNUuN/cBu
+pUBJgTkoxnYRtaupEkaf
+=XeE5
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qttranslations/metadata.xml
+++ b/dev-qt/qttranslations/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qttranslations/qttranslations-5.4.1.ebuild b/dev-qt/qttranslations/qttranslations-5.4.2.ebuild
similarity index 75%
rename from dev-qt/qttranslations/qttranslations-5.4.1.ebuild
rename to dev-qt/qttranslations/qttranslations-5.4.2.ebuild
index 6ad219ad83dc..9fe93fbfa360 100644
--- a/dev-qt/qttranslations/qttranslations-5.4.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-5.4.1.ebuild,v 1.4 2015/05/16 10:59:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-5.4.2.ebuild,v 1.1 2015/06/17 15:23:44 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Translation files for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
diff --git a/dev-qt/qtwayland/ChangeLog b/dev-qt/qtwayland/ChangeLog
index 5ae93797ec72..b313761caef0 100644
--- a/dev-qt/qtwayland/ChangeLog
+++ b/dev-qt/qtwayland/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwayland
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/ChangeLog,v 1.8 2015/05/16 10:57:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/ChangeLog,v 1.9 2015/06/17 15:23:52 pesa Exp $
+
+*qtwayland-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwayland-5.4.2.ebuild,
+  -qtwayland-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwayland-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3de08929855f..02c7e452ce4f 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtwayland-opensource-src-5.4.1.tar.xz 247724 SHA256 653b5e600b1cbf3275d0858415570d2a2611823a4651ee911e684dcae870d792 SHA512 c9802a3eaa4a8a7beaa0da3c3356b8f94b4daec5d35462f3b3575a7988b065d3a9265651595e557903779e93d4fc70f4e15665f80e482d1ef26687e648cc1263 WHIRLPOOL c3176fab22c20a9b5d954fc4a6b4c8c56a5853fe80b7dd3a0f7da02bf999faf4d8a3e926e7c15c9dc9527bf52fb5eba45531fd925de3f7ad27f260149a25309b
-EBUILD qtwayland-5.4.1.ebuild 937 SHA256 29b0a307c3b0b00ae6344c93e50cb4100d59576b7a3dcfad1d6b6259ea382827 SHA512 b0aff65b90ad26cc91167b806b37a2c92dfb7b807f8bbbb466385f8a5eb941be971871cfa07314bcd54a1f7198afaf34ef5b20b4f63b2da19022c4c4bf8c0629 WHIRLPOOL 541c2f85ed5c399e6177b8222f9b4b1413e037ce2741a61ccd8f232af4174dd5e523cd58f94379b58255a19cb9196c5c9ba54ae509579d8753e6cbc174854d45
-MISC ChangeLog 1104 SHA256 40f62136162ee0c23749857f0c25f9a7edf9e69e8c3967bb1ec28d0c0924379c SHA512 bb6a7c6f208774157907e3862c9fea7c16b35b1a5d31248713f001693b7e29159424399458cca42d9cc0eb0de9d46a6e15e01cf4429e2627842a9707faee3c71 WHIRLPOOL 85a433571fcd722dfca02564e04e4d670fa168c6cddd9456582bcfba161769d1ee6b10af8fd6b86125557c5f2c8d687a84a59ba84e342d764d2d7f5649801c7d
-MISC metadata.xml 484 SHA256 bc7ed5fe28813b845b1899cff01313f13aeb5d1359dc09f4f20cb629b7be224e SHA512 bbc154accf5b09b7abdef9ae4c08e8e1b191297a997ddc306262d269bcea5d8930d2fb89c0815aa1b5b7220a22ef081cdd446e0b048a3fbb915acb8d80543487 WHIRLPOOL e9f35de7ca87385fa09ded63961178c9d0c04012751d01ef4509fb4ee3689dd1e45b050a5de96550c275832ee3e1188fe356f326cc85179b582efd7aa9342252
+DIST qtwayland-opensource-src-5.4.2.tar.xz 248468 SHA256 e04dbeced39186ea39078bfe78de2c4fda4da28c4af6170fe0f48283ddbcf592 SHA512 45f41a3d02c26bb26136303e1b6155397e65eb0e2a630aa68e53fe4d772a7f4e5c96f4d567a62fd84f681becd64e462fbc128d72b9f6403a505455656e5db9f6 WHIRLPOOL 79abad30df883922414b8cedcf3b34ac17e5ff2f5717edac23f0938f78d8dc93d599a1fa265871313ed2f82498f8d389c618eed2cdff560daeaa215c8eb2ae42
+EBUILD qtwayland-5.4.2.ebuild 886 SHA256 751285379f13d0e832cfd5f2f9cbe2b201cd1005f51200e48fe3e14f18cf46f8 SHA512 b707dcc6430739d57938a7d1440d4ed516068190fe6268760b9b6f54a6a33d40d6182714255498583bdb1cb48ec195794b8e915a54cf67ef292bd9b1305f5139 WHIRLPOOL e4c389559c46614424bd4655e24a57b9f493e1884d3cc0fa8b8aef333dd547ebc20e708deebd31b6084ca3b8721f051578040eb13860f4d6bbec3a77676b2f0b
+MISC ChangeLog 1270 SHA256 7050817fd20620c2cba03a17449307a031d7b446e17855eb4093e1be7cf2f330 SHA512 120f419e9e672d2402e890a503d21df0445d6514deffb907d08cefc4f7792f59d9c3f382a1181989241532eb9a4bda314bbfd5db1e57be79a2c91a245fe06028 WHIRLPOOL 16142dcabd8cbe9e7481b1f5c2018975d4a3de36361d2ebee76d8cde860260d7591b93a2d61358760d9d7f994e4946d5fa20dfe70e728092031f0cd5cb0e5f0e
+MISC metadata.xml 475 SHA256 1832136d04f1aac5236cafe785a97d19c110adb5f1c2fa1118ecf1ab7f460548 SHA512 7042a087ac2c0989091fc1a2b37a362ac4217caa6e610094c32e25b03de2e419236b6a2b6adfb9bd6f8d4e071b115df22e56b7a6f6cc56a035653ef116756502 WHIRLPOOL 2e6690349fe1baa613c956c8942a9569b49ae9bf3307485b17fc00d230a02bcc2295ab282499bd3f93d9d16c0d4b59ab0657942376d1abcbeffb7f945fddecaf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIrQACgkQVWmRsqeSphP/KACeNItXb5XJLOwJh1Zw4aryUIT2
-BL8AnA0pMZdFGduayP7ujdNhhqCzypZ8
-=GkuW
+iQJ8BAEBCABmBQJVgZEJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9PEcQAI9ZfNFO1VTjrxGadEPvvHs9
+B22yrCjb0sbv8gqVYgr8QWFJQ6QL3W/3udE7kraKiRfHGHNltkT7nVbfVfr/b2dE
+OQmYSGjdJ6Ajj/4PjOVhvKONh1+2DPPcDIaL0OpZZAUJf3KtUOyqXgJYAMBRWvXP
+JzvmiezYCAAeevmByHK1Y8s7mvmldrU31tSK0+7ix9pDxwrZS09Npo6MYhWCXmbx
+/j49IPaACtHTTYuOQ3z9xbokb9mtK3THggNnpHEyqsoylnndcA24TJHIbYScE55C
+Jb4lhMPBVRKs+ML8o+omskprV2b1H9V3U0lhS2a/RKRqK89JLNTPPaTPNYfuns8O
+x/g/RmT0VJJEPmfLdG+4Owl7HPGMqpJET4NHNfXloLQcQHuc03RRzDzj3bwbF9vJ
+36dy0rwybXFKjCrf7g/qXUBaz3R1GGL9RjpX0I5/rJtKp1n/N3NGB/ndrlPgPy36
+47wYK7XNtljLPblmNutgCm/4FaMZW+BdmdO4Fz19Xy/tprBEMaTIGztq2P6nHWCl
+3IBU5YAHsk0ZA9NM/Jz+4YycXDnLn6xV2KMz5OrnYYhCNmB3CJoR4gm4d8mFqOtK
+AsU/rlfxOlDmc67uioj023qv0XA0xE2M6siZLfcfsYpR7Ni0d7jfoyHEfb9XTWSj
+CHPE0OqiBnLTJ76IoFvd
+=FmrD
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index d4273c871c2c..0f135c2d9872 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwayland/qtwayland-5.4.1.ebuild b/dev-qt/qtwayland/qtwayland-5.4.2.ebuild
similarity index 74%
rename from dev-qt/qtwayland/qtwayland-5.4.1.ebuild
rename to dev-qt/qtwayland/qtwayland-5.4.2.ebuild
index 88b47a281275..6366cb99d5e5 100644
--- a/dev-qt/qtwayland/qtwayland-5.4.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/qtwayland-5.4.1.ebuild,v 1.3 2015/05/16 10:57:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/qtwayland-5.4.2.ebuild,v 1.1 2015/06/17 15:23:52 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,11 +15,11 @@ IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.3.0
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 	xcomposite? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 3ca098eff673..e0fcddf0aad6 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.37 2015/05/30 10:56:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.38 2015/06/17 15:24:04 pesa Exp $
+
+*qtwebkit-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/qtwebkit-5.4.2-system-leveldb.patch, +qtwebkit-5.4.2.ebuild,
+  -qtwebkit-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtwebkit-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 47d239ef95d1..864e77a0f8bb 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -5,20 +5,33 @@ AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2
 AUX qtwebkit-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e
 AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
 AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
+AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtwebkit-opensource-src-5.4.1.tar.xz 33457544 SHA256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf SHA512 592a3ebccb4578eb0183d1ecd5aae69c7f03482aa09594fc06f58e2c2b82b5e916e1e951012fc1c8e0cea803c4d3e6db64fad41bbca70eb18b8d9d3ff2eab828 WHIRLPOOL 8a42720dd53ce583d48a3b7db1268c092dce11dfbbcf7524f50350145569c2b24b62b82a4715229294321ae7ce719ec56bb448eb7a7be9b2f7792ad1d8d9d7d0
+DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
 EBUILD qtwebkit-4.8.6-r1.ebuild 2381 SHA256 732ab6ee9b3d8cd853f263490979e113b3d2174344c5c6f5d18b37871cbe73eb SHA512 502b63e892f578e0361804ec8d717587afabaceda0499fe1dd7c09a6457ac72e6b1d708dcf719bf3452ae15b33a948590094054a29a47607231fad4433b7773e WHIRLPOOL 723fc3198093afe0c3e96c4d37aab84b5f075b00275a4674082554a8977de96af0b2b2d07a82ad44a4170bd962535c84f6a13d10b6f7d7688d0e80b6b03dfbd1
 EBUILD qtwebkit-4.8.7.ebuild 2352 SHA256 a705d3bf6a7ea7827bcb2f7f36cc54e78a0dd0f2366bf64c0effc07a1eb234d2 SHA512 430d003f3ce6ca9132af7715423591aa92b0cb684d47c7c9ce63c7c817cd16fcdc89029dd0572a1c033a58a576fa13a4d840cd9c4b36c188f7945a5264e1add2 WHIRLPOOL 53adb551d9bdc4d3197fd10e74b23737a6847129cfcc2afd9aa3eb63e567414ae3cfec736d37c997c8941a4ed10e94d2ce4f922ff65bde0e8dd307ec24894fc4
-EBUILD qtwebkit-5.4.1.ebuild 2713 SHA256 b7892c4bc0922572c1775c5b5cb46921b11843c2be9d70bfbd64f65e0012fb77 SHA512 b0f3031ac45e005f870d4fabad17661552206d08fb04960000cea8d0d6d4e3b491164915e2046239ba033894d235f9fa2c25c72858d42277a1b51b55db3c381c WHIRLPOOL 96411955972cfe4ab29039e81a37596cba752d1a85a55a0e13a55e9aaf3299cfc8e14da92635eb058f1eb29f67b761b52580c176e7cdd4dd8c059e003b46b02f
-MISC ChangeLog 30607 SHA256 c6e82fb2e16de023067dba327568587425cf6b978e3e47b056f806997b0df9bc SHA512 6221674d9d9c627060a64b3ccdff047c2d49b7cf43a8fa713cd316ae52028baba0dc912363bf462a79ee1904e564683dadc9b9482f1f716b0e74a16ed88990b8 WHIRLPOOL 72b70a222f9268643a83917c6a0a1e9f0926dc7f79a186665d921d760bd02f0735f9ea30975581a6bb862fa582110ce549c386d8bd7d1e2f680d6545f5eac86a
-MISC metadata.xml 932 SHA256 56460390f89a7b9896afa2d2410733c2a618bdd2331fb08eb950e403a36b8959 SHA512 999056b09f39b7bd7fd798d3296d7945af1f4bd8ca397c3a085a7fc2af32daebb7be75df4d322fb406051b2025e97a8b2fcca242ce13aed065d6647bc10c49fe WHIRLPOOL 1741a97d3b1bbff53c7e48df2e634237ef81375362151f20403856992e84727d3be6b62612a159ac0888c2c278bb1d6904b66435ee5a3171058da07d3ccb5cdc
+EBUILD qtwebkit-5.4.2.ebuild 2800 SHA256 a0b1db959a60111c9d90c8d3f7f021180dbebe00d81d5c33a9d2cabcc098014f SHA512 c96b58c9e9c01889350689026af29ad173d2f59bc11d4c6b379f79e157c8d86072a0fb63a6aad0b33ae5ad1205ad15f8227ae18fc795acb97ca6699bad02f0a5 WHIRLPOOL bb7916321604d1428f7f2f1dec8f57cb715193ebe95251f3a03481f6ecad99c71558173b938242da62275f2f77e4f7307d5ce5d3038eff7c89b071a039104b0e
+MISC ChangeLog 30813 SHA256 dfa147da3b4bb4b50017b3e50c98aa40dfa52b4308e16e1e51c5532e04b7223e SHA512 12ff0c38d685b1400e063ae9abe7d94dfde2f934c000dfee6a268dceb98694cff5448e7d4555dff4f9c3eb76016bdca86f5e13d92a97f22f9c0d70cbe55c5491 WHIRLPOOL b81fbda07d1adaf1f86abd1a8f5ae1f41560c686457f8dcd3d4f1c9545b97b0accf1e4522755c21bcc6450e1d29ba5100507156f58ad8c21c531bf35a38750f0
+MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl2gACgkQkKaRLQcq0GI2/QCgtGgb+2JfOBXN23cD2qfJUfuH
-FyMAnja5HN8V9x/e06NIgDJeCqbOsa/m
-=L+jL
+iQJ8BAEBCABmBQJVgZEVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9eMAQALPa4oKSIjW9nz400auUMUUU
+HxUaUPvMkVjbG7l0Qv4oDYIP3EYaU94vxmvLDjD3nwC/pjdxXdd1f0GaktoJfJ24
+R6NOST2e4ddss7itAYjyDqe7Va0oh8Gn6SCax1CSz4J7epC89iSSOpk9STx7JvKJ
+s4uvDZf0att4vHjQ3bzVmP7c8weYb48A71XyVXJCY0goYd1usPFfndTTBVJQ+h7o
+T6qNBkwsWh5/+RDFKIn9scEdI0uloVxSFU6P759ShMroUNpO/QaPpP1P+CtklQma
+2qkeBlp3lDe2zqdeNhto+CSKp25o6TNNg+Zi92aXdDBXyJ5b6Xf2edE9uSABJEug
+AtMIhAbehVsbhg0ofsB6TliqSpIclxbgdeiQQqsL2T0A8qii0UOA/uTsS1m2ZlxZ
++tKC933qIojzX/MPJbYgXtIH/szr8zgRYTCxkq6M9NvfTJoesrGYxX/WDloSSR0p
+lRC+nexlxLzV3xmLeE7nZ+qraAOB5gLI0BOPg1C5RMTOrQDSVGLrPiuggHC8oSK1
+ovObFT6/EM9bYYAZXEBbJb8AlxBQBJqbqb2bNmTCIT6nTzf97DxzwzjxJKN3rrY+
+7U0j1tidbTbZJLjvHf8h5i9VDntCnFWMcrX8lB10zT5658uDAwgrgMxbvh6qaUU1
+wBh9mAtFDvfAonRguWMD
+=mJAb
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
new file mode 100644
index 000000000000..0a476c646c52
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ 
+ int main(int, char**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 06b10e2ec97b..0ca02a93e967 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,6 +14,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
similarity index 78%
rename from dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild
rename to dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
index a7b64c34316d..429c9c21562f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild,v 1.4 2015/05/16 10:39:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.1 2015/06/17 15:24:04 pesa Exp $
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
-
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
@@ -24,16 +20,17 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	>=dev-qt/qtcore-${PV}:5[debug=,icu]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5[icu]
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
 	virtual/jpeg:0
 	virtual/opengl
 	x11-libs/libX11
@@ -49,10 +46,10 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
-	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
-	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 	udev? ( virtual/udev )
 	webp? ( media-libs/libwebp:0= )
 "
@@ -65,7 +62,14 @@ DEPEND="${RDEPEND}
 	virtual/rubygems
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
 src_prepare() {
+	# ensure bundled library cannot be used
+	rm -r Source/ThirdParty/leveldb || die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then
diff --git a/dev-qt/qtwebsockets/ChangeLog b/dev-qt/qtwebsockets/ChangeLog
index 8dd5be4f05d9..1ac18f04ea63 100644
--- a/dev-qt/qtwebsockets/ChangeLog
+++ b/dev-qt/qtwebsockets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwebsockets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.12 2015/05/16 10:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.13 2015/06/17 15:24:11 pesa Exp $
+
+*qtwebsockets-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwebsockets-5.4.2.ebuild,
+  -qtwebsockets-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwebsockets-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index ecfabf262e2a..8bbff8339607 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtwebsockets-opensource-src-5.4.1.tar.xz 74784 SHA256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 SHA512 f9dae7833033338c6f46fa11b5f9fc032e34a8febcdf9b1281ee080d65e0a92a10b15ac9b4de138e85444091cda917ca47defbd124601ebd197b54119d141bbc WHIRLPOOL e6dfbda86f26cc3b9c65414984061465ea2aae713716af64c618b63f03ce22e8f6baccb20709efb52d41161cde72116969097cd257f884769ff7a7f5f8ca89a4
-EBUILD qtwebsockets-5.4.1.ebuild 688 SHA256 0a3ef0ec33fbd473b310e3932910832961c7b745be04f827916948282ff63d18 SHA512 b18ec2707f6f7f40b523742d2bf93ccd7db7b35c430bc2382eb7ef324fdc99d28157fc65cb15c4229add3ff8ba4d178f57307f8215f20b63305a268f26583508 WHIRLPOOL a4cf532428cf466cf9f5abb4cec8d377a36a4a0bd2e3d94324990b059f0a1dafb8c1ef2d22bc16e568bf70802c4c93fc627d3a2c8ff672a84abc58870d6aeb13
-MISC ChangeLog 1713 SHA256 37ab29db873f266179995b90e5c5c6054e15561f8d4b8e832770eb702624910e SHA512 a90473e2eaaffceb1da3778d2c669ac0c4eef492331125c38f8f3123054ad67322838c0de6e85a6887fd0d38f7f69211e81313ce53a200010fc738aa22eaf62c WHIRLPOOL bb577d89df4b58af989dfa73b97849005fc0911b8aa34c6bbb7acdd0b4e7cc1cf17a9b8ebce500dcef893037c4e71cc6a681ee479d0fe68b2ad50d2c5d128f82
-MISC metadata.xml 328 SHA256 23497fbb9a498c0d9631987427e939a7b05721e8de06d0767461cd70f7b3cb52 SHA512 0709500b4784b39054809b60d281d267009185804ef971e899d5cc2917ca4bf67a4bbf06270df5ea177e71f6785da69cc22e68e907f801cfa0a3ee1289947106 WHIRLPOOL 753a593d48db3ce884180a3c440bf3c3d800d23df14732850c8252d705f6e2639cd8ba43f180c7b033ac15befd0245ed1f3e679b7b94b865a96d43187ceb5123
+DIST qtwebsockets-opensource-src-5.4.2.tar.xz 120636 SHA256 44a61a8576190697fb1a112ef982cf1da86c6d1744335d7b8e168f3190a26153 SHA512 e1d81269122f1d80f09ad4bfb8724ce26f172100e5e644e36841c71ca75b48277ae2191a49256dddf48ab8520bf1e0461f0eccdd3ffbd050785983a0c33899a5 WHIRLPOOL ed21e667e725481be8423e9f5727ae1eaaaca7079f9e7c67e33afc62fbb12caa84c2327bf4f6fdde2ced4c05e2327312639fc8344a421e9bfb13c7c5d324887d
+EBUILD qtwebsockets-5.4.2.ebuild 643 SHA256 467db51ef3d1d92b18031a99ed11241754d761f3fc2ee973a98cb5b2c32ad23b SHA512 aff46aa4e6d14beb0f49e8a1d9a0cb0fc621af7fc5840ecefcd80bb0fa793fc467a4cf75de1616ea9340f012f6a9bb584df7ea8bedd970bfeef76201491dd03b WHIRLPOOL 12d9e986e4bfb82487e194e88ba9bc544794000dccfebf8c6952c2cac51a4994860e7df0b2b8e095578217ca857e9bb2b267375d3bcdde9895b748b3aa62d012
+MISC ChangeLog 1888 SHA256 b067019c5acc903d2d9146c938600b272ec184f34a557ffb2a66dcb6b127ac14 SHA512 6371d43e51e96137226e6c023b8c12b28274d5a0efd2a08002057bcb52aaa05f4ce2eae7c82c83f3a0605db1ffbd8c4ce4d51574a647ba4338fac8fcb4149401 WHIRLPOOL 0809c595aaab5c29fa1ab697134226d6b608273d361e4e5840d40745aca5c656889635d0120c2a1800c4c50b9fac000bcdb5a0ba7fafa8dc7419263f09917bfa
+MISC metadata.xml 319 SHA256 212681205c716b9e41697e65bc084ee49dd4b55ceac610e0f12ec6164fcc9c19 SHA512 b06096e5b6e9aedeff92ae2115250a39da6fd760f512b6be24641d16f2f7c4add35a0fa79a9c7a9ff0ebe0b1b19f41e55b95f46414b06bf6eff0509e164e9174 WHIRLPOOL a271807ee212c50de6df2e8f7ec3c48b9f55cadf37f2b5fcb815ec1d6aeb2faeb1e723c729588bb058e86b13bfb7f82d0a250a5d1758155bc56c44cbd5663da6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIugACgkQVWmRsqeSphOCxACeMZtGP6pj4EGE3SdSFtTlEH6/
-YcEAni55MXxl7sRdFkJH0dO8XYa4cwj5
-=/JaS
+iQJ8BAEBCABmBQJVgZEcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV93X8P/2JmTmG0iqMZjDuyU5dzXYq9
+y+tENOTTfHl34100oxZNKqifPp1htCpOOTYAVYZ8MDy8h9jo7Qv5rzbf42PEfLND
+uvxQO8CwntugS5aJ+ipek4vGVpy2XKmizT9zEs6fS09W149jHW7qrua3Q4iz7xJw
+HmJJ0TW1rAaTTYOMwx9WikJB7nqGbzoJIigrQyXh4e50aKB5u7rj0astkCVfUBRP
+rGbpE5JskBEQ8DkyPGMWF8lEJHj3iPKlp4j9JKt7Ido7R0GL4CEYsPuqZskQ24rq
++dZ5eZo0oP8Uk5McmXaXwoodKfDnHaCqY11hfjLZHoyWkHTA/cMMiuLxYUOo/AW1
+icQNYxf3bZ9BKni1urLbQJxUw3F4hDX1VnH6x3Z7cfFwd5Y0EOL4j0NAbssqfU4V
+IDcf3dnxHjmJUnwUsV2gDFXo+TY+6onNNrOeHj1X9/Yi5jH/8mqmnLwixycrLQWL
+IovZwCtGooL4wy3yiS1YLu58Pb/ck/KESamkdebUbsBjlWCai6SdAL0jQOi5184k
+O4N9vxeBLnvQ50Bt0i/OYhxe9nrjSgcrEsEh1nf3AXekh48u2pypIFqeJhSnE2sn
+lRiqlxS6a3v+Ol4Q3kpHDoxDffMWaxAbkcFThChOWRbw8qBf1SSaHeDu+4bMAi6T
+hZdE3szYxaOTxnyYyShY
+=Em7E
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml
index add78519aadd..bee66c84d291 100644
--- a/dev-qt/qtwebsockets/metadata.xml
+++ b/dev-qt/qtwebsockets/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
similarity index 65%
rename from dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild
rename to dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
index edb0bdb0252b..086b9f18301a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild,v 1.3 2015/05/16 10:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild,v 1.1 2015/06/17 15:24:11 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 8a6d31ac51aa..d1798386f001 100644
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.16 2015/05/16 10:26:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.17 2015/06/17 15:24:18 pesa Exp $
+
+*qtwidgets-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwidgets-5.4.2.ebuild,
+  -qtwidgets-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwidgets-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index eea6650cfc1d..8355cb53fd93 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtwidgets-5.4.1.ebuild 1197 SHA256 6c0a6db047570e41a1cc690cde0a131ac6ff585d57552720a2cbc62b4ba31f49 SHA512 f4cec1fc2be11d2af616912bf911ff969548231f022ecbeb9426e86b6cfe655171f2dbdeaa53fb80f91ee5dcc4308656cde21f0cd0a0e9cfd7be01ec002a5227 WHIRLPOOL 1f17b29145c6b6ae08f91e39be9f2162e43120420e6f77774fcb8124d02c62868e094c5ae9cd6e37f121be1c8d2cc5038d1cbca7120aabf4dc49d4d953704166
-MISC ChangeLog 1875 SHA256 9a4c47d7d95ee12b8d3593d81abf4440dff00246aacb4faa6888f2bd0395f0f0 SHA512 7034c02fed3b63db386ebfa0d9abf1ecda89b696f46740d6f823f073100b9f81e144d5fc63ac57221ff24610317c6dd43eafde3346c51eb89be9800236ef26fb WHIRLPOOL fc6d7ccdaa9a5ce0bbaaefc108aa3928a43e163b50e49195b390e44bb7f9acc5db7bd7c2aa073c6d83b02e6e2314a340c1ad1bf38300fe40ea8ee5b9ed7492ce
-MISC metadata.xml 452 SHA256 5d837e121d6ab379e09a64c79985530ced8d9a8b655845ba34d60bdc0a9173f7 SHA512 548266812ee648eab15e24b302341a430833dada123c05324f57c240e18ed2e1f840e0597bb17270592459492d67d9ad5b7b774553e5525a3105e02292734fe8 WHIRLPOOL 1fb249049750f49e35f9b98db921cd9ba65051bfc5364e594761278109da33081432e251c7666361aba0509621fb7d5bdaff8ba8410a631abe3ce66343717943
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtwidgets-5.4.2.ebuild 1001 SHA256 1e956494c0e7a881a0fd35320583c54ace28a985922396aa76814e5395e60b5d SHA512 359d11da7c51d80420ced85574f0cce6012e347111d49ee683cf42f60127b8030f100a369bd6a580ad38a098557bcd576f2a4da63ed8f03bcdf780e7733e2b11 WHIRLPOOL 6841fefeb5414bc219dd6b672e082b2e3c1a82289ffb3c2ac42a868c1ec7b819b887484e4b72586d4cd8f731bb535a27c2e69aaf7521d0984934a51c8426d8ff
+MISC ChangeLog 2041 SHA256 b54b9c3395759d344d133797b698a20b719cd3f5cc6d68b571bb105ea1473aff SHA512 7d4a16e8871728f2ed4e32b9ec4020f10a0ebc6c70b098bb05905acc1aff774ddefe5f3c63f4a8f8bfe1b65ccaace4533c33b7e4bdadff2920477f487af8accd WHIRLPOOL a9d530e97e5e593050711e1166ecb1f361471089a35621f10067b77db97bd1cd9be5aed77f8537e2a67ff2f91cc4e8939cf8fdda6e17941f890eb265cc822dd7
+MISC metadata.xml 444 SHA256 e33c8c020f218081d739663be5c92f6131ced627b97de83938805f3b9acbc4f7 SHA512 cb74078fcbfa4faf00b462005def18549bd69e58f4c58d88e9e5269f04f5b6122b971ba5144f158b91dd28802d592818c3b618e11002ed185341a83a7864a46a WHIRLPOOL 24e9a630e196ecd3ff389682cb498a9eba37c68ab8d4f997b7d7ac977e8c998bf5f4b445330ee44428c292e52bb4f5b94176fdcd90c244f5f642a0ff2c6bbbf0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGz8ACgkQVWmRsqeSphOOVACeIkuxawuGhkbVNvHLrwYWplZp
-h10An3kkvKsUi0brXot2jKwcQ2QQ5XyC
-=ChNi
+iQJ8BAEBCABmBQJVgZEjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV92moP/3E1P6ilIqgW23aMTIaPAOl6
+wKFUesAvx6Y1Lf3Mja9ggNFfakZoANwOBeuI7+AxnJTFzN3SLLwLCcVpweFZtn7q
+s4TlgK4wtOJk6Pu91sEWzqrKRJ8+bo6Njgjr1loVCDgE9SYU2PzgMcf8xrPjKIPq
+iWAI9FSRmGIaeRJf/DTgkB0SvgNd91tosp47VEGeosOllDsLDjfy6lxV60BnnM10
+RmROAYOTW0ceHGkZBEPgo+AfrFhhtK6jMo1v7t5o6c9EL/mBEwG8L/lI0avvQ8Lo
+wtYYMPx+NMc0f5kvNiE6bzUwW9HeCrxge57gYgjTPUg4MypVamMhuBUsilXJm2LP
+iBgQH2kmTQ0lNOxM6JSATjX7Y1aGjY4VeLTb5bIdQYTnXCnErhQPkGSaf0tZCP4Y
+SXxssabbrHp1Tj2ye33o8Cw+yqeqt+bMbtGKqWzXAItrCe6MgTUmYxJAlS3jZGwg
+4Vh+KQfTK/nVlN1/oqrXM+8dUbDmWXqgQ2DOpgMB9ExNTdi0ymqUm3P9+Jdu5WUK
+jF4oWI7qwxYcSsgmbYmDqnuiY8Y27iIERktfn4cdnC/VZsgMNTAdMtZ9oNYxWCEh
+mjETd8rhXQuspROS5sLInKyKydPmUn98nH3Gv2oqdni6s0CnCA+ub4g7G6ipKQRd
+ktzZ6t2fcxtvs/OnOZiZ
+=XKPY
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 1fed4b142e53..4727795ad761 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
similarity index 64%
rename from dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
index c034198e5fc3..f640aa9c8c95 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild,v 1.5 2015/05/16 10:26:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild,v 1.1 2015/06/17 15:24:18 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +opengl +png +xcb"
-REQUIRED_USE="
-	gles2? ( opengl )
-"
+IUSE="gles2 gtkstyle +png +xcb"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,17 +31,9 @@ QT5_GENTOO_CONFIG=(
 )
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		# copied from qtgui
-		${gl}
 		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtx11extras/ChangeLog b/dev-qt/qtx11extras/ChangeLog
index 2993830930a4..51d2b0f7a2dc 100644
--- a/dev-qt/qtx11extras/ChangeLog
+++ b/dev-qt/qtx11extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtx11extras
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.13 2015/05/16 11:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.14 2015/06/17 15:24:25 pesa Exp $
+
+*qtx11extras-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtx11extras-5.4.2.ebuild,
+  -qtx11extras-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtx11extras-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 70f81b825987..66f11e708759 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtx11extras-opensource-src-5.4.1.tar.xz 25460 SHA256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e SHA512 7133c5ddbc6403c4d88ce162a840d8d8ee022efcd9b06a0bf495ab1554449c3194258a588d8f3b6aa3ca83ec42835ec9cac6056ab7a8c3d1d59e7222962b83e2 WHIRLPOOL 8fc9aef74fc174fd1cf7abfdb5767db16bf6553d5b2cdd3767fe3edd0f2a13fe40c74feea8594abc901a5d63a113d6abc2b68564e2b339d7c33da6b942ecc57d
-EBUILD qtx11extras-5.4.1.ebuild 577 SHA256 8058935261653c8ee1dcb6265a29134abb3076f40c222cef93740f3ac785d4a9 SHA512 c9e055e6468dc9f194d1f1e97d1e22f9c3756efe166c78b365e56fa31158bad3c9a8754a114e50c8301588903228a2c0ef25750be59f80f27dbec78ae1267b47 WHIRLPOOL 73c5a3a484cb48edc103d880ff3d5650172e8ff272d63d5bc80d4b26b26f23c11a30537cd9b78ac4785f67b51c57aa209431773ab1908c08db766f94654ccd7c
-MISC ChangeLog 1542 SHA256 797d0b25e5db5c111b8e4358ffc1f302163da6c7bf7bea0df2711304a7402fdd SHA512 06866a7cf6cd797559b5e87e775fb72b34d5f2d403ff78a04b8e361237ac620917fe524b5e2881aa3430af99fad45267635165ea985f37912b0aaed6bf48b244 WHIRLPOOL 2671ce261b19bd973186a4364acb6cde0630a32aa272a408724f9fa07c4df346bb3c88a957ecb684213dfca4427975f6ba64cb640d41488b2edc216c3e187cf2
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtx11extras-opensource-src-5.4.2.tar.xz 25484 SHA256 f6ff62df88810304937664aa5a0b0ad4fd981ed0e30920d08fd76dd525f7fe49 SHA512 c309d6d2c5a3a802656b2414b676ba3d105f4f0e2ceba1d7e9a5e0d2f64e2e50306252b132e38b6801a6db597f33e27a1682f6db24a4167b127d17afa7ad4d4c WHIRLPOOL edf5eb006f5fd84e95acfd504337334ef16af4b5f181197d88e9247b74882866a74810609e6e3089d32f9057a1e50b427c205c2e33f63edc4dfaa3d518769dee
+EBUILD qtx11extras-5.4.2.ebuild 533 SHA256 6148198570ba18e948d8a14f0902def3e4c70643ff8001695350143e9416fa42 SHA512 e73ae77c195dc2813e967f9e77874285c0db77e243b3e348137b661d99fcb918fc6d53609e15c8c2a5299bdf937256e42a79dc2e8b935395a442920fca601946 WHIRLPOOL cf1ff4895a403b049ab7c44a3d16da019a36cac5c8ecc357d3046943ea50c671f5b54beb0442647ad17a24d88aaa5fabfcaa8d7eb69ebab63337b9f654c94f40
+MISC ChangeLog 1714 SHA256 bce5dbfc3b42970ea6e600010bf1065dadee71dfb6bcc3bc689d3ac30658c0a4 SHA512 424d8eb6577c02514cf0b7fac20f018047fd02bf71122dd10c93116b52ec1c7383b40d87044c25ef3e055ce36c5decabb9049f8cb75bcb619bc31b9712b9f3de WHIRLPOOL d6d2704441026a82085aba8fa267e8cd5f21daf3276fce9791bf2640e42aaf262cfef9f9c57ab4099a9165b6c3b1f8a570c587f27edcc9e9d1bb7727f284b58f
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIzIACgkQVWmRsqeSphN/rACff1wlsNF5+oYMaMEkemzvVBm3
-4O0AnRet2tnyztUHgfPM85yqwDPrEw9N
-=TvaS
+iQJ8BAEBCABmBQJVgZEqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV98+MQAIsLYJWu7FP2m+v9bNQLUT6X
+lMrcl/3QI7SPc6bNVZeOcgiXBHWZd+UC7KFOkiP6aBkspGy0wb+qF+ovvznTZcJC
+YmBPXp1AnGODgOmSXAj82nXkHgnM60n1qB5HIcn/jTx94MpsHtBndt/BqxkjBP/l
+6EiZ36+XuNca6T27wPMAAA5vLVAe6Nyd7CH6sCSSHnUVJQ9z8tSpfpCafsnnT/IE
+gTEvrjolss1Vlr6MoJGoJzHRbg7NAwb/cIhODJD8zCkhLENgtvhfUSmRxsdUI+Y6
+Xlm47vZBagyZ5r8iY+My5ug5nTp9w7M9Q/wZSUmgUyTu4KEUjlxvdqIuIA/buZYs
+o2SRCPbob8nCFshjghoW2uJi8O3Hpov2pOy+irUIlFu2qlotOVlGMUF5hN4YRKAm
+9+42+dBVTNbvyhuPi4AUoI6gFBJc14J5p4/vu/Qfl+wEjReoknXUhA9QFXSjLjcg
+d0pjhRo9fec31Kwm2TrLnkt8Pb+G0iqPTlj9cCVQdcJfUazUgE0OrumZcv2lnSqj
+Uij1pLIJPlV8uYc/ieggTLAJk6wQS0k3IqEoV+J8YBtzSqkd6YkUuoDn8teSaiP0
+Re48SHHJ4tJ/LnBalq+gpLUCdyx3Shsws9wjMww1FEot5PrO/AuKimvg4l/wtgPY
+qb5nNa75pA/jHj9xEL4F
+=vovS
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtx11extras/metadata.xml
+++ b/dev-qt/qtx11extras/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
similarity index 63%
rename from dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild
rename to dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
index 1e87b2ecef47..15dc01d2f31a 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild,v 1.4 2015/05/16 11:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild,v 1.1 2015/06/17 15:24:25 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,xcb]
-	~dev-qt/qtwidgets-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+	~dev-qt/qtwidgets-${PV}
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtxml/ChangeLog b/dev-qt/qtxml/ChangeLog
index 6bd66957b851..d075cc59a663 100644
--- a/dev-qt/qtxml/ChangeLog
+++ b/dev-qt/qtxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtxml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.14 2015/05/16 10:20:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.15 2015/06/17 15:24:32 pesa Exp $
+
+*qtxml-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtxml-5.4.2.ebuild,
+  -qtxml-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtxml-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index f309f1c2eb9b..30da4327ba15 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtxml-5.4.1.ebuild 597 SHA256 ebda851375d10e4980173c3e9ae4874d4bf21e4bb28537ea6a30cc1c56faea61 SHA512 43324979ccfcb8fcfb0ebb2c1359488d4411c805ffe4a8333e6236515c310d2227833805a5428ff216ea4ecb7ffa4e1ba63f8347723d597a62895e2dfa6e29b3 WHIRLPOOL 3dd05be3bba7aa890b70b2ec49c6021d59b39c2ef48eeae3a06b311e0fb3ce4e701543430ff65f82a1fb79f4da624af593dec6bd70d0c9d5f008bbf660046380
-MISC ChangeLog 1430 SHA256 c01fa17edae56b6f217e0d63d7e09981109a101f56e39015a573519d6e4efe36 SHA512 621221f44ce0073902f5e286757037603e64a0e0389e4ac8f9178719520137b98fabf4e317b2fb61c33af7552a87a8dbe48e0bf4fcec868698f10dd23000076c WHIRLPOOL 06ababba492d211358322a038026a8e880caddba14d52ca0ab8ead3b9f09264650e08ea0901b0ae83b0ec57baaa55b81ad6ae2cc3f816e6c384cce5958279cfe
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtxml-5.4.2.ebuild 559 SHA256 a9359e2082ccaf7b943313a5cf7d746735570ca206be2cfec1dc72a11cdf7257 SHA512 510485636518db6e9855441cb3dad02eef88c90a8671e60f7a0ed5d920e596418780af81d1369979ef959e326d9dae5f372f97c7da64d1c6998a881e76d434c0 WHIRLPOOL b58b7d3c713859a94c4925af663125429f326ac6385381f3db26ecac7c425016c2c8b9fa0c589574ebcc264a070932ae7aa93ea76719b5bd321c1c799cd948d0
+MISC ChangeLog 1584 SHA256 18868bce2993dc5d1d6df89daa2afdb7f6d6b52d97531ec2c9a0fba03c341f7b SHA512 e411c3f2577debd72f00467c4d3d2d463702078112ff68e3ee3cee0803ef7d59fa07999b37dbd3356227f462cdd40022f85d6dcbe0b11d6cd4028ffdf42771ce WHIRLPOOL 0d386c3c9cec7f43f47e2d431824ad0fb1d5f0d92489229870adab652ea216b649d138a985de74c47425ee71352e3e2ef9cb1a112078f9f8c5471a2dc047574f
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGfYACgkQVWmRsqeSphMLxACdHVcH4LERadPhNJGPy09VY+aL
-K0AAniV7A7Za5179fySkm2yc1eSub0p8
-=XBIY
+iQJ8BAEBCABmBQJVgZExXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV952gP/0vmu100GYIiSnOFM4xsXr3K
+1rlFsySRgC6szekztSlxtMaK+9+7dBjM+vNkxjancUArxNqxgsx6vPBFQFLNw764
+OzKyxmUce7fD1wX05f9RsGwDzWGV3Ewq+Rmm5iTGcvBZf35rrwmpjTEuhJGG1gL4
+HyYg9s32Azx+RVGlN3dpd64Q7wspSMkoCYD3nveOLV0Fc6Fo5yZP1/I2t9/7TSE7
+0FPXsihEVZiLqyYJHGAMtyacfNZNev3tNbPBNNMjMw+kfvARgdb1qojB3Oeemu1X
+SAFbE17ah4oIR9Uc7PcvmGiY92xefstDi7T3O1p0kS6UZcp3EsdI3uTcDo4F57L1
+T+91sZCCBDidIVbMyALlZ2lGHicnPoELVaSoiDDEArWWgIyBKys9pNevtILI/3X7
+x2qFbhgI0m2GDWxr4c1zK5uTOiRGV7pqS/X/OVmix4szzAAbklLdQC5WpwcFdUs/
+mIDYQdr2ZiJmCSPcfTju0+wa6TpPnlbSMjq9pC8ixV4dijv5HPfZICO/vnN9/ZEG
+7QP9hkAc2smz1gZUZ8zzNmGc2ufTckWLUXXaZ9wBkNgMtive0PQJ1AuLxGAIlMHw
+JfpRrFbXxMIDTLf/bTk//+hQY3dDCMGyp6WwXebbbrWVa4g2bauQRgjBgziKd9V0
+bW2IFGcsC6nroWofj9RJ
+=rsq6
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtxml/metadata.xml
+++ b/dev-qt/qtxml/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtxml/qtxml-5.4.1.ebuild b/dev-qt/qtxml/qtxml-5.4.2.ebuild
similarity index 59%
rename from dev-qt/qtxml/qtxml-5.4.1.ebuild
rename to dev-qt/qtxml/qtxml-5.4.2.ebuild
index ef8ca6f41ed5..ec20ba95c827 100644
--- a/dev-qt/qtxml/qtxml-5.4.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/qtxml-5.4.1.ebuild,v 1.4 2015/05/16 10:20:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/qtxml-5.4.2.ebuild,v 1.1 2015/06/17 15:24:32 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="SAX and DOM implementation library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtxmlpatterns/ChangeLog b/dev-qt/qtxmlpatterns/ChangeLog
index 53327e78f4be..ebef238e6843 100644
--- a/dev-qt/qtxmlpatterns/ChangeLog
+++ b/dev-qt/qtxmlpatterns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtxmlpatterns
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.33 2015/05/30 10:56:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.34 2015/06/17 15:24:44 pesa Exp $
+
+*qtxmlpatterns-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtxmlpatterns-5.4.2.ebuild,
+  -qtxmlpatterns-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtxmlpatterns-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 09fa11a120b1..083e55ced3ec 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtxmlpatterns-opensource-src-5.4.1.tar.xz 1307228 SHA256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 SHA512 c6728cd780ce583c7fbf6be32b7c2359ae82d3f81b948863442cde94368488e2650c97e8580327d6980f7f7858e61408b0eaddf5a35262a64688627b4a6d1f9a WHIRLPOOL 4f2b2db66cca7d1c627e0f26bbe08200a1c3edc96177851d9ed3b8d86959d2f5aa609cb177726b6caa7cc2f3a5b989ec73d49a9c21e8870471f1d4d10edb39bf
+DIST qtxmlpatterns-opensource-src-5.4.2.tar.xz 1315912 SHA256 aa7fd8aae6f53f74a69048756197746a3e0ac7fc53f8678b8202c470b1fd272b SHA512 7909c395807395e6635e857d99ecbc39d8b0d253b93947398a72899a2434ecd4fa99e229aba404c94667690a0407b76eb651723b0a1dc0b1fb4a47707b44707e WHIRLPOOL a72813a70aee52c0ff9d700c43abaa27d5aba0d8e8b9cc541c3e9794dcabd7458e8253eae90369fd86e4cc50f0a5b08ec490e35e333a1b954af5dad2eb65452b
 EBUILD qtxmlpatterns-4.8.5.ebuild 1075 SHA256 c33c5f8360d91c36f8ec9d97c00ccfbd5dc5e605d21da27de47a538fda7f614d SHA512 e5cfa8cd414fc6056a32a73c0d45355ec649023a4a7660dc21b59148e75c35cddf65f31b290d052f4686d0f5f3c6dad1f4b0ea26f8ae3bbeb25b56d42af33dc1 WHIRLPOOL fe19f8437802a8617f088c2eed8d554cc127e68151eda0fa3ade53b36a760b55fa593f0eb8811ea1dd58894f7a1747c66d01acdaa17389b678d7005026f36813
 EBUILD qtxmlpatterns-4.8.6-r1.ebuild 936 SHA256 c5ec54d075029fc3f65639d65d4c6cecec1aed4fecb67508a3673a8aab1977fe SHA512 c49b714c46473a2b19187b91321ba8712a0407162082375ab53452a04009f16c5be60101b2ea4b2ed2a73f148d48054b43b97fefeaac451c6c64bb15f57d8e86 WHIRLPOOL 587152976267babab90e14a5dde8db1cba653a8d7977b81022bba011f58924552d3970cf1348f5d7c5f8a3772bbebf4b2d56d9d2ddad98f72d1f18e0676c5a4c
 EBUILD qtxmlpatterns-4.8.7.ebuild 903 SHA256 82915224f77c3ddedc1364ff11fefd41f0216764be0b61e016737130a1311573 SHA512 c1fd5ec844766bc1076c73dc09caacf0ef56f564a75503dac5560563f5d4ef284f38e5909cb01cd2f54822cf7e4ad9d92bd20d65736cd580e3d275a65ae92e27 WHIRLPOOL 8dc903f0eae18342e89d790abf76505862a4a7c14861b54e30fdd1b0db6dc350c2fa59a5f693db057c9ad46144522acca9a123e98fee2a6ba1d2211f1c9ca417
-EBUILD qtxmlpatterns-5.4.1.ebuild 558 SHA256 f14314e091ba563ca8a366d026756b9f6ecf274ca72ac74bb116a47f8381f23e SHA512 c13888d9e52ec83510e47dbb0c3433847349334f07a8e5a8895d930e5d6dc7b3e21038f64c32305183c08996cac88d72b18352eaaa6204a9a074d67f2dfa91e0 WHIRLPOOL f5d8c562296f7c59c7d91e653026758b0c681eae5c1bc7398358627c0c473bbfd5870c694cb3d437a329b1692c293dd94ace38b42d5dff1756bf35a29ea6ca1c
-MISC ChangeLog 21515 SHA256 4f5a61ca336d66ba99fc8daa4fb9c3e81f76e6b52a889aac4e906fd0b5a6bff8 SHA512 c19544be4a5467fafc491587c6e899bbb3401917611348ac5a239446cdfbc7357539443d0b42ba3d1eaa514208a5fce6fc31bd3392e9a05b71d02543ec5d0470 WHIRLPOOL 7ce97108be7e1de827906d32c512be3f5f74502ab5cdf60d1e608d2a2bfea470df017a8282fe8751066546fe774dcb6f9b0ca35efe18ae64f08a3202564c50b1
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+EBUILD qtxmlpatterns-5.4.2.ebuild 521 SHA256 f9aca8874d1fd6fc8db6a71bda0cd04eee0cecc2728e3145f9ca53e118548ad3 SHA512 28292f11794b1bc2e9cecd01cfa20f5eec0864678009451b51829d3440310c89fb384f784ab0a573cfd97a9d2992673897013e94a36ae920d25b68f85172285c WHIRLPOOL d91f29a4132c802e0b8fcbb88d0cfeb4b8d20843dca3dd1894cc10f73bf93a120cb40899e5462ddf5ad24c0a65908f9c3ba7ca02934ea0ff35fa23c114c16841
+MISC ChangeLog 21690 SHA256 cf02594e0dbc8ec84e1abf2bb830bbe8f5e9ed4fe552f43d0b10f6bd9475d003 SHA512 71cdfb3a7e94343632ff2b021320c7f2aa8b6d96c6f6d446b08d2e4e8f5ff1517327dbc18094a30fa5618135bc02a4351c8c8d2a71d794c50fbf2f5a1beb80ce WHIRLPOOL 5cc2fe85b7260988a31e8c44e129d7d7fc93eed7ede5f6024778e7274baf6d19fe52bc4718cdb05bc8d590de908c88588a8417e92f8a13309781a94e34d0047c
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl0sACgkQkKaRLQcq0GKgYwCfULTYmEbtk2qYP9hRR+9LxEh+
-SCkAn3mEzjemaSBht4oXUxIHPFIZdVUj
-=9MBJ
+iQJ8BAEBCABmBQJVgZE9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV991cP/0uc6vgvCoXV5RwWgUHfDvtZ
+9kAKZJ8AwBHbdSSn7K7Spfb0FGHj1p/YvqsNon/sz5P2h2hMjU0CgkSh1a36f+9w
+38/HTq74nHwqmBsOxAinQeV8FPKdQhb+ZsH3CFJQJlNhiZUvsOKOMv+erwbAa0tD
+9Ws8TNZmQUkKVt6BIWF4HbYYa1o2ApKxYBZVYJyiOTV0JMoUBHmgz1PJUNT8JdZX
+LFmeQdHauCP+/ZTqeJNjWiPLenvVISk4MZ2GzN3xn5nsb5MtqEx2TONlWAexnI/r
+A1FlH3GZnV5R9S5b5+BdR2XYESSA246Mqbig1NGdgwLTRiTh/prc3rNF3JuRqHKn
+9Ir3mFM2i6fevfTz2LqfcxJygeMc606DeG9tMx8+RLscDgiByAsbYQJB9296Vla9
+MkrdxVJGwHGhfqdRpg8OXWyhHXjNc72CqPrnpcQNeDyJKOtru/jlHlpIekdKWwiL
+lrsPDS4hA280lNtRpembL1jaAVktUM+JxlD3nKxtUiKSexZVAwJQ+HWCZJFiMcK3
+F2KIEZy9m1MxHUeaz5v+kpJZIPDOekZMc+HTLdgrb/4jmXgo6lX8+8nTycV3ZzJ5
+bxoO8zvb9oIu9QSZaYRrDyDrjrFDSEWWT4tChckfUCzVnaOXjUSk14x7gQ9DQDcl
+f1eN+2alVSBYJCTzH0OL
+=q4oX
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtxmlpatterns/metadata.xml
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
similarity index 65%
rename from dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild
rename to dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
index 45653da0a56f..b9f1d58b6bba 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild,v 1.4 2015/05/16 10:35:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild,v 1.1 2015/06/17 15:24:44 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="XPath, XQuery, and XSLT support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ruby/bundler/ChangeLog b/dev-ruby/bundler/ChangeLog
index 68a2d64c5cf7..16bdd43b189b 100644
--- a/dev-ruby/bundler/ChangeLog
+++ b/dev-ruby/bundler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/bundler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.96 2015/06/11 14:25:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/ChangeLog,v 1.97 2015/06/17 19:34:05 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> bundler-1.7.13.ebuild:
+  ia64 stable wrt bug #550314
 
   11 Jun 2015; Agostino Sarubbo <ago@gentoo.org> bundler-1.7.13.ebuild:
   Stable for ppc, wrt bug #550314
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 03c5395a15cc..41a65286e4aa 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -5,26 +5,18 @@ DIST bundler-1.7.13.gem 307200 SHA256 a3c7f6fa006c62c88acd21655eaa31dd6731cdd5a7
 DIST bundler-1.7.3.gem 299520 SHA256 d2cfd2cb30a14bbaab0cef7917d220d6285d6eaed024e445680b47c816592303 SHA512 2e037837fa2e9fdb85b7a04aa4cfb79b4be64dab4a4cd45af55b2b2cab69c1c377543fda732db26b32c1c4a8dc8c82e609b908633887a61ca3ad16a00ea22557 WHIRLPOOL a01a46c89a20eda57329fb30e4711392632a68151aeac935fdd8ee51d62bac0b0a08835c69798f31aa655a87284bf1066390c9e38782111cf0d5f3b6fdd6e688
 DIST bundler-1.8.9.tar.gz 290462 SHA256 9ecbe18147b990e8c5c7f299e9bc7b63eb274f54b05134ad334e0abeb943f733 SHA512 2e3378e2c329c53eb6e578b496e1fb332c4f96eca58299e59dd8cb7f5d3b78f43bc6bf96c452cbeb99a0459c016a824248f907b58dcc2081490e4f59ea7a32ba WHIRLPOOL 887a72075093405dd5c94902865589e4946d70f1cc390725e8ae35f6a36cdc2bdd05b9c27958a5c2497d6f42011791c2432f15ab45e1ccbc8c7f0d7da37799c9
 DIST bundler-1.9.9.tar.gz 301352 SHA256 ddbb3d90a2053a3ed833b66fe3c839ef2c0d7e6326cc522bfa7e2c98ece8d421 SHA512 d34929c4200290850642574c8a5ba3ce03589511173a19d57eaa48d68e8345963a9494c9ba7b89a5b0ec55b22222a260ad6b5564a07286a62a59fe761468384f WHIRLPOOL a3887a32a546371439144bd8f227a06f5b625bf2046da3b06c4d500abb350c5c72d6a278355b61ceed5d8044b3c0c4e0dfc6750e57288a9af5d97236a7f27a5d
-EBUILD bundler-1.7.13.ebuild 2101 SHA256 d8d8c8d425b26f104d198d8083c3b593c308ecd3e76da29c2cb8deb3b358d38a SHA512 1a4bb0a7e313f81375218dedfd71c86d8e422b23490e59421a82415f6ad2e8a2db7050c0f0613ffc0cd1e52d0101679ffbd26e58b312b42b4b86581ffd6cb6dc WHIRLPOOL 606a08eeb646bf83a2f33e31ee5156a45176de6c7b4cddfa32f279fb68f1ba5223a47d64b29cd0b0b5826b05f3d3b19900ff6e38b2bd4b6e56737a672f1186a6
+EBUILD bundler-1.7.13.ebuild 2104 SHA256 122f4154ffbba8ed9a3c86b5f1906161d623dd1384bc99b1377b0ecd042842ed SHA512 9ce80dece962bb0198c4f13d47f78cfaef6be7d048c06be7d21171f4f51fe2c1ce72c23b65c8aa29869ebd20c7abb6b90c50037f060d96764b213cdba699eb94 WHIRLPOOL e9919dc8d3e3993245ec61544e63193a75635d20c1b71fdf638f7c0b8d4763679d00b7aad3fe028e510e16a0ed774f74fbbaf821925c9eadb2e76067680d935e
 EBUILD bundler-1.7.3.ebuild 2007 SHA256 5c2b643e89b6248bb053f01c2b97d17886d49242ae8c785f7e4c482e5148403b SHA512 8df81517179f8ba68941d67349c77851110aed40835079ec8ad966f3f40cd593cbb9229ce532250c20615e99d39402a25d0430b3206d77eb9e85a4517a67b70e WHIRLPOOL a3e5a8e7de249a8d7fa56dc3cbf5e23b4d33e7fe6346f104724cdc3fc6597b49f931fb09bb1f391536b10a3152efc57ef863294f64072eeebbf73164bdf45fe0
 EBUILD bundler-1.8.9.ebuild 2330 SHA256 8949e6da6f94619f7cf0125626817252a0524d36f5f4d8847231d48ebae5bf65 SHA512 12ebb2400c9717c467757986613283325b0b7b28e0629cbe8b9e4d32fe805699d430ec3d26b552bf0c6ea27ca524833a00f7632b29d9129aad526ca241dfa42a WHIRLPOOL 1dc432f583ce884d9c513e769239d875e4c67dbb5383734c7b124235465a305971f3dcb972122c462a40ba5b7229f373f7d4d5e6b8ef6350f902f2e10e58e204
 EBUILD bundler-1.9.9.ebuild 2338 SHA256 6aa2048e8f5253567061b5434a1bc69d74efcfb2bade0097a6ae0b73cbe1a36b SHA512 c7755f3591559cb50bf3b9d61057ab53b0840ac53e88425f4cceea9c8507406408b6352c300f155071d5d9b548c54a8fd990a6e2f7de5b64022cee18f58e7f66 WHIRLPOOL dead466484003e2892e8e18e52397f97fdc8f1ca5f6d740ac6e32c5cef9fd4020f7671d00944545232503b89451bf7b17161b04c82dd8af90b0428c7abec7a87
-MISC ChangeLog 11978 SHA256 96248816e66c974115d08ecd6addcff5e9bbb077a6bd0e096aa364906b72e4c6 SHA512 8811612ed00adab178db648882aadca8aca9a5f2f7a3511526264d73e80100c1e938fbe7c1f590fafcffb9a3596caab3640788cee6e72cf3e57c3ef8e918f437 WHIRLPOOL 5aaed786ebbf55b7238b812d3d07f89553f98f4a3222b901f925b9404a70c968dbc58d9d492b63237453463de888f1ae435a51180a6bcd6413175682c2891654
+MISC ChangeLog 12086 SHA256 eaab2ac4999db465a7740d564d31556d205da6b10d23a55de6e449f981b1b7e5 SHA512 78a8cf30b58a6ddc2bad56d62a7dec82fbb278228707c53f4b668c105f6c121b668371e7827e453e2f38ccd88c5df23eda6551ad485b9e802bb8af06419f8c32 WHIRLPOOL d44e8065d41af95f8156a2f82e8d1e35c6f087d61bdf2186ccb067fc8f9589c49565b057c079e94c067032f471a211b3ca42a49be511ae06607f6bcce128a3b8
 MISC metadata.xml 244 SHA256 7204703e4de8ad57943b9719fbbb5fa6fa166a46193b9dc09a3d2fbdb8ad36e4 SHA512 4bf2e7ecf6fb291f0175148420299780c3d4ac11b042b8dc339ff7c1bfb9274b9ffcd805ed94e7796c9ba813baa3691ce418ea2b0c92f11e21db2584a15af6f3 WHIRLPOOL f7fe366db01a90a7610471ec1e18c40ac93f1bc6457a7cbe8fd01b35ef574c83860ea843d09a70174319ceaee8ebe0bc5ddad469b9bc3c06cd2b6529a791385f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVeZpfAAoJELp701BxlEWf+wUP/27zA3oLFopRB1Myob4TZx/o
-nRvS00oXxDHCdir3DuTBeV1h+UD+OqrA5G2xxtWHXHU7cbyjb8q2hzKX9JCLVbAq
-2a4Z4GWrmSC0xflAhFVLK/cEMzJ713uL+2gn8pAQ1kWqdepEb2y+sNs3s29n4f4E
-e2uMb3sSyXCce7Wi1MR2tKarkvW9OsxMXqDCyNqhLDt/sGFc6C163gGis+92g0Je
-yIk+BwlhEpYeBsOCi7aGN9X/5c68aLWsKCCsO04gJD6cnrjOgX/eB+vd1vGkg3eZ
-xFJ9eKl/tHcgqVoBSXZm0Dh73ANmsXeBy7wPhAhDOENkiEfiYOPWZESFTEICACzT
-tYm7cmmv4IejYOWwFDnrgJkBbEauqGNIpytuoae9yQxv29SG9LtR8xkRbz2QUYaR
-FOvhbLc2Q0SDCkHTINDdSXYQhX84CO88viJmYr2sncqc80yLwM70OYENUiZaS3rf
-vXSEarH3afVjg3rgezI+8SjRrsGn19Qnp644WLGFoBg+vndYLzz5ck0qDqH6Hme1
-7ar/HKVp6/3uc8ygFv0wnr/wv+JaWQ0pElQelRbAPMQflUcya0wMwOwYhsvCTv5g
-RdWqAbqlaCgFe4MgODsOGyzcWMer3V1LqrPQvPrDmoEuz6sn5gRo0ret34JrFOwP
-jPvq4vmqQfQCDBwnmMxi
-=rM0E
+iJwEAQEIAAYFAlWByywACgkQG9wOWsQutdb+MgP/ZHrkOtcPt/ukO+wJvWckiByR
+ande7RMrDiI3C7BfikeF+7bWJsaAjUrID067sPVIMuwc2e+dT1/zFZcT2uLDbKa9
+tN8cD7KerUm1FC9xBWu2KvtGLSfFHpDTKXrvr8w4UkIFmkHYajX38pXvXEInpaBw
+v0u21AwaWEDSreUC+fU=
+=j/Pu
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bundler/bundler-1.7.13.ebuild b/dev-ruby/bundler/bundler-1.7.13.ebuild
index f10b3c83630d..3270cc879543 100644
--- a/dev-ruby/bundler/bundler-1.7.13.ebuild
+++ b/dev-ruby/bundler/bundler-1.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.13.ebuild,v 1.8 2015/06/11 14:25:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.13.ebuild,v 1.9 2015/06/17 19:34:05 zlogene Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 3fdb4e34a322..35037a75b579 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.148 2015/06/16 21:19:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.150 2015/06/17 07:21:38 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> rack-1.4.6.ebuild,
+  rack-1.5.4.ebuild:
+  Stable for x86, wrt bug #552324
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> rack-1.4.6.ebuild,
+  rack-1.5.4.ebuild:
+  Stable for amd64, wrt bug #552324
 
   16 Jun 2015; Hans de Graaff <graaff@gentoo.org> -rack-1.4.5-r2.ebuild,
   -rack-1.4.5-r3.ebuild:
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index e6cd7183c9a7..d4d8a2cfe9d1 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -10,17 +10,27 @@ DIST rack-1.5.4.gem 216064 SHA256 401f8725be81ca60a4c8366fca674a9f18e9bc577b6ad4
 DIST rack-1.6.2.gem 227840 SHA256 89278d4842d0ecdd1e79cbf7a894dc86f976e6d25debc6814343298fd19ed017 SHA512 0f0cdd2e55bb03ea73ab6ba339ca6027b2072425323b685b3f71c0b739276ad8009ec7f00b0f3f87c07229ccb70325473d2ec03a1f82a3ddc6e6d9f5545948ff WHIRLPOOL 4897e9d2b6fadd090375a899d93a95f33269db02c1d5f78816deccc3fb4b3684b89409a106306e117412757c50643b6ecd574c89c1d7951d866f20f33b9598fd
 EBUILD rack-1.4.5-r1.ebuild 1671 SHA256 fce1e04a45c5cd2f9e8a58a99632763b4953a7cd2aec88fa552f26c2325298af SHA512 c939ff4d74777f5bd538e9dceb3ba39d9a67734bf1775129d0281d52c55402017dcf25c84eb6e03878e876d7487e7f92176b9e99674117c29dc33d13eb1d75b4 WHIRLPOOL 0830ee8bf07bf6eade519fe5f06e50f40df0ad145b42dea8732d1d1d131ae45cbace3b80b3f1adc704192f934dffe7430b0c3db8f9c6b838bc78141cea0357d1
 EBUILD rack-1.4.6-r1.ebuild 1680 SHA256 bc535624b5e0d0fb22f06e34c9f5590504debb3c70b7c18d8a60316a81f47305 SHA512 7dd1ef58d6e4b0461700ba354e531a4cde14dd87d47352895dccfae62a7f7e7a600b0bdf26539dc001c20b942204375b4ae3f32f76dd135bddd6f86522eea916 WHIRLPOOL 467527cccbde60439b162c719769056ee7e35b6cfb9b333430d7d5339d08a0507ae2bd3c138d5ef7fd6b5fb9f02ed76ef97c1113bc637673c5f1a1a464621307
-EBUILD rack-1.4.6.ebuild 1663 SHA256 b38dba77ba0d7cdd1e5e572ef308d248b2e2838b104d04510ef812effffc2820 SHA512 6fe0b9a774de0aba6f57c4573af8aa5fa6b0543d86dccf439230cf1001b8d58485f551cf7ae4ab06e6a32190fc19e117d75d97a626397998bbab7fb06c5f7b4c WHIRLPOOL c618c34aef5bfd1b3ab89c5b76fb64213adeba3f173381c1cb1c89392ff154a68ce91da7b2637439f48dfc456afc9819d817afe737fafa0f45f49972f53d4ca4
+EBUILD rack-1.4.6.ebuild 1658 SHA256 4ee5af11b2327c02de8ae98bdc44cecc00adcd2bfd152c693921631772e93489 SHA512 48d7949ed66f6cd96e5db02d99536e35f36a8520cdb2be4bc7427eb768d0cd42cccafa7f6a1ac31c14606539ef925cb670a0a9bb8e7672f78033a7bd65dfd0d5 WHIRLPOOL 5b12407e6fc7d71c2867889659e210678ae1483374bbfb7983dc20e91fa2d86c13853e1fe27ace4a552f2f3d8f64e7beea2636d8be67ea086e6def5440ae76be
 EBUILD rack-1.5.2-r1.ebuild 1520 SHA256 35b28beb2e60cf1109246bc6d456f86ef2dbe8f724f3ad24665ee928e2550f88 SHA512 a23c785e44a9212b8346c5006eafdbb8e8147c8b51e6ab39a46d574227763ca98421a2e1d3e70cf305c89cd6bc41d69bc058aa7bdd321b7042c5754c8d777eee WHIRLPOOL e84288ac67320e3cab65f25888348ef2680afaeab45ab12810c862ec0957351b6910ff5e1c26c02606ae1ceb4225bd581a32ddc8aed2c0b3c305686a0a322c22
 EBUILD rack-1.5.4-r1.ebuild 1513 SHA256 96e5bb86496e05eaa987930a7f47aa3d50d543f590a64b52658d69f89d7e3821 SHA512 bb96484dfa1378631d95893d5df10c310dae9d61564f7f00b80fb17784353f905b6f40097c7b64082e25a62ed736bb7b36602706db6dbf4f6ae5d4f215aee1a3 WHIRLPOOL 4e88c11f159cc186e71f5f48ac7ce1ee30e3d00dbf31727cb0ff742ff79c3183916f2ce6f889fd9b466727f3aebac39a7765fdf374cb1468836b317c40c16d8e
-EBUILD rack-1.5.4.ebuild 1496 SHA256 f2312bf4d49846834e2f67d144ea4db0810cea34aec9a61a32553324de0a61dd SHA512 f013ae18a75c982debe69275164cb11b71ae26fa6887498a875bfb40ca99247aa20a2f9eb196e46975737b1df41513c261c8c5a14bd0a4e9b2694f59556c1413 WHIRLPOOL d1ca15025b9c64e40e1acf1ff0131b4b64e913d0040a949ca0203293ed0e1b68e3296551279713432d5f466e99d6544eb75eac80201ded38797249c6b7a8935b
+EBUILD rack-1.5.4.ebuild 1491 SHA256 35548ac0ecb930f7cc24ff9d30f6257c10c0a6fe7945e92a791c9e9fe1909853 SHA512 79b87f10563937daf3e5ce0e51474b6228cc85e63ac3a28cbca1061c948eb8b5354dcb7dd61e7416d93c3e188f4eb8a48642fecb201712ee6b2d163ead06c13b WHIRLPOOL 94c4a2311e912fc9c54a3ada6d6be6671ea45957f1e2ee91d4666fba683ba4efb39336d1e051d0405db65904f13933a34f6e2255439d08c6ab541b809d3beadf
 EBUILD rack-1.6.2.ebuild 1698 SHA256 89b493e5508299091a64699f6f8988e61f16151fc89b4eba67475c055f50f602 SHA512 364795f35e2ddd79948f3e01b4ce4c7843dd5e48b7b0194b484746d590ecbbaeef127ad464a7376daaf6ebb0700b081c27597b87347ee1233aaf850b87a375d7 WHIRLPOOL 1a44eae0132512d75454400b3a1b7a9a40cf22d4776a231cd77d2656ead860631088f9058edf97b8a3029a2c4fd7fa921ecd2007331634e4faf362c34e3615e4
-MISC ChangeLog 20928 SHA256 a2650a6193232d50b74cf3a311010a3c121ff53d3c833ed6dda298e7f58b8e4f SHA512 d5f514b224dcce55f3c766dfd31899849b2a07822f2f46d6fe9fadf387c2b18bb47e5c18ca780ceb5fd91027ddd9c704ee82385ec5fd06095fcae4a5acbb9208 WHIRLPOOL 76731ac5f34f46c7dd0870dc6fc08b4e44208cca4083b03be6de6a1b81807c551138c9d2c87a4656ec54c81af666223246057b10a28356192b6922e6145703b2
+MISC ChangeLog 21175 SHA256 77651f47e241be904a87c918e501974a93c81dd27867f58e2d9061f4f95f60c6 SHA512 84e7e8871991a7287d7a3d4720a815743e360731a6a92b91f37622c6a1e6e66cd38d9a0b023f44ffa81d077ca76f7808278ea6e22db003fe2c0dfed0331dd030 WHIRLPOOL d8b9c22556517c54b37a62eaf087742bbf73f2a6ab81f313f4d4f24e3cd8c63766682d610d049a2046f25483bdf693429c98e3d429e1061dc7fcf67a7279cd7c
 MISC metadata.xml 370 SHA256 f9714dd2a4a9e60fa008d7c243a4d97d4e73786b8714f0cbd2108551e08438bd SHA512 bf9353ed39af73c7f86fa1f7b781b6156afc890f62f2d5f95d1f6803bc4e7152969fe097182007ac7d3d108916935db6887dc4eef91bf9855c4f81bb14a3e2b3 WHIRLPOOL 89ba48a7b72ae2800d95bc4bcc5786a38f35fd5d201626856c2d07bcd04f018bd21525ca1d3b8248b98f73bc16b4d65747d79a5362fceebea05e250ce1e2403b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAktcACgkQiIP6VqMIqNf7gwD9F1ETJT6lI04ToLHsHtINOmwz
-Aqazw9JIQ1cmW68/2uQBAJYbMmC6Q1RlFt7gsN66YsaZRLjW64msEug3+teC1PY0
-=MoxF
+iQIcBAEBCAAGBQJVgSADAAoJELp701BxlEWfsukP/1Ffl8w9/O8MuBgEW0zc0W8d
+fpe47+zoSr5fsiEuz5MR8+Ao7yCKGdEsAoB/qFEHZxKBjxgvQvte/1iaW5OduPUP
+jUjMvVUc5QrqrSqyOObCrPnGVBpUP25v7bi/OuxM18HmuuelgXi5lTexsm1eN/qI
+z1+AObmIHyQQenVVrEI4WcGgEtfEMOCrwyHtkzSCIenPzmnH129DkcHRzrT+FZW1
+06eIhKuZbKpH6NpNjLko7hxTzNF2Ay95Gm+xxJrgqqk8SFpQMhdh8VGzNVz+j1Y1
+C9lUFPeI3M3fB/X6F+l+SkgNmpNDZ3I7B836e8hRKuCjayczwlyV8WO0M1eyE6nx
+ZDZyb8L/D/g2GR37njJKalTta7Krwqzp6GFx2iVVxhXRvaT8i+nOE0Jwk/MKrDun
+o4I8MJ+EN9vRGEFYS2kRxJlwWiz1zOKYJmRvo9HNeOGyPuKjlNuvSGiCoA2gWVv9
+zRf2aY2Ilx2m/+ZtCojneOMd9b+e/n4pAsljD3dgz+8b4MLUWQznbGsj9O/CniPF
+NVJUzKbdNnH3iMZUmgHyVYDO9zPVlOHXEoxqDc3nhh27li9BsNAXP0BxxXnu4JJv
+qCmBcppN4y7pmJS38xyRDLw3LPauG1mbM/n9hB0VDqeR3tigOkobUV1BTKMfHz7u
+dKgbK1zD1LRIzIX5WfjS
+=p6sa
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack/rack-1.4.6.ebuild b/dev-ruby/rack/rack-1.4.6.ebuild
index 2548ea856e8e..61e6fd435d26 100644
--- a/dev-ruby/rack/rack-1.4.6.ebuild
+++ b/dev-ruby/rack/rack-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.6.ebuild,v 1.1 2015/06/16 21:16:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.6.ebuild,v 1.3 2015/06/17 07:21:38 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch )
diff --git a/dev-ruby/rack/rack-1.5.4.ebuild b/dev-ruby/rack/rack-1.5.4.ebuild
index 6d61207300fa..52ccbf6b581a 100644
--- a/dev-ruby/rack/rack-1.5.4.ebuild
+++ b/dev-ruby/rack/rack-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.4.ebuild,v 1.1 2015/06/16 19:59:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.4.ebuild,v 1.3 2015/06/17 07:21:38 ago Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-util/android-studio/ChangeLog b/dev-util/android-studio/ChangeLog
index 2bf85d6990de..469af4043abd 100644
--- a/dev-util/android-studio/ChangeLog
+++ b/dev-util/android-studio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/android-studio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.19 2015/06/16 08:43:42 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.20 2015/06/17 10:38:42 perfinion Exp $
+
+*android-studio-1.2.2.0.141.1980579 (17 Jun 2015)
+
+  17 Jun 2015; Jason Zaman <perfinion@gentoo.org>
+  +android-studio-1.2.2.0.141.1980579.ebuild:
+  bump
 
   16 Jun 2015; Jason Zaman <perfinion@gentoo.org>
   -android-studio-1.1.0.135.1740770-r1.ebuild:
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 39d369f6b0f2..5227c00acc00 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST android-studio-ide-141.1890965-linux.zip 259139652 SHA256 f6c083902156ab83435fa91ae0743d9a2ae64e8aca1396afd553a44071366906 SHA512 bed422287003072ea4d65c05724fce22d3e847d5d292d2fa53cf799e344c2638d721e1e0c1c2b1444e1a52931e96f83499c5f9c6fb64e79aacbbf03dd1c10b61 WHIRLPOOL 58b542bb7f0a4375a5281e500ed74542c17af10582f305dd56792b7efb666a1a316a2d8fded99801d219ceceba919e527272b87067531a0a910d34197740dde1
 DIST android-studio-ide-141.1903250-linux.zip 258634089 SHA256 f79756f27f6ddc14f90a52dbeed5231b4a6b382c72aba10e17ab1403b886c09e SHA512 a0baac0fd7406c16277f09662b798c2340725d0d11333aa1834c095e2041d74bb4e75096dfe146491dfbb330d3a17b5c00e70cc1a921fd230c18d7b3e0d6e9a3 WHIRLPOOL c4fd53b7a20039176fb2cdd47c2da0d73148108880ad0076528390802a4113993b9719e794943058ed5b8382036768d7a7bc47d9034a9554d95bec33335487af
+DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
 EBUILD android-studio-1.2.0.12.141.1890965.ebuild 2166 SHA256 6eb5fa72abfa1ad0c66c95027987482426bfeaec65bc2196f373409246afa5d2 SHA512 3f101025c9ea963a9894bdf05244485d9ffdc6e2d8f0d70e76660e23a0600ec8084cf19272caefd8ccfb62f11a994fbaa396a44f9990de3c265bf642b30cca5d WHIRLPOOL 491048550578f480f5f68fca5ec27ac34dd6a385fc058c03b8e1f154f812c08de78cd2700a3632498b614370857f101f0bb1c5c00c3f080e453ff9c7d591d4b2
 EBUILD android-studio-1.2.1.1.141.1903250.ebuild 2173 SHA256 4fa920bc4d9f5c86960ac820cc434111361352ee1a2c1098a678cfd25c633684 SHA512 e35d82184aa170eb42fda176dba39a1dd2d5b0fd93c44c35fbdda3a335e2596d404c6bcb3c6e6118be419c656c9467f69095e17db60eef57f0ecf83e2bfb804a WHIRLPOOL b61d98900f38fa8a12074b14e6a1884d9d3dc26b37a6756fe4e56554412cd5e85d90f8d57133432a79e0f14dfd09e0d848e24fdd88e5c47a7ecc01cce1716f91
-MISC ChangeLog 4095 SHA256 6f14bad7880cee7eb3f83a7288261e678776f316cf64a86eb7e6d3a256d502d0 SHA512 1e60662d119f9cbc29bcc67926f3c502fc0f37b8325ce06ad9d7989e931737213b3d65a29e20a90f7696b001ada676c53852d0a5102337f7ee71b32cf6facf3e WHIRLPOOL 624c4e994b273e8b4df1bbc53004601de6e9f986e7055a8717cd80f4a41ef595e8364e5989f6f2e9d690227b18e32609558fdecb2841a8dc12e4bc3da4733df2
+EBUILD android-studio-1.2.2.0.141.1980579.ebuild 2173 SHA256 5802bd3c8e806a75a8e5a89bd06ba513e758f884c274aefe188f479ea889dd59 SHA512 d6ab5e8ba79e1cea804fbfc479b37cf686b1e28c9e10ff34fb9207b9cb23aee0c494f59589c180b6ec10d129aaeb0b425b7091dd87e116f711ff4b828b6f799d WHIRLPOOL 5ef48296ba7d45a905b353d5c2c81256d4e54bf0e2c30cee71203b8ee6ad88ed6d5cc1c4d2c05740554f907e8c1014542544910879dd898f679f9d5f7993f471
+MISC ChangeLog 4250 SHA256 df9f23ba8229edaf73b01f36677b909d9d5d55823e11c9ad3d5373b2cd617d50 SHA512 7e77c01e8855d4421f5f7c3ca39d82576118d2ce787b69a8b2de4d1484f048d2b6cadd3d5e17e7bd29268f1717a4b142c76d09c4205f129a8e44b9d396ae22cf WHIRLPOOL 405484e16f33a925ec9e1cbea2aecc363108b264457334c2636683c8865a7fdb27b8316481720359af38e7121ee7c62342d3a4e15405ee206d38617976eb341b
 MISC metadata.xml 206 SHA256 47bf381c9ae4c1960c25221eb56a669422b55d677ab87d7ef9acc479af2b6c99 SHA512 f440c5f78fd09578272a46c4135b483eca70e6e1ee76fafaa9503fbdfcfbec6f5ee0cce60a00112927cadbfc3bbbc0d54bc4e3eb1851b4450ec3cd83be78fbe5 WHIRLPOOL b3f47b1a1e0fc0468017708da5c6f3d0c7e478f362a1549b5346464082f77e9a5f5270b411d840cf7e272380e872d7ed5c856ed28c5ba4e042f5c6e00b103e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVf+G/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVgU44XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VQ1QQALtH0qePW4tbggO01RKsR1Ys
-+4TSvKnCJTG+Hw2iuJAJSYYGUo6cZRj/mcpuQb4dZVo/NXzxO5jpU8WGPo6fT1y+
-Je7I0f41EqrC/hvCjAZ/RMPEHaLZVDwBv/XqIz7Gm1syZrrVZp1VM2nxAsoHH4TG
-/cyNPTkW75SnjR5HtT8OorHBZXKPQODfJYx7xlLrg7dBKsutWWEGme1L0YmhjRLp
-Vuwy27aKyG2+CqQDO4YbxlOYuysmQQWpAnb/OocrBbHiBV5nIjrpS3EQMem+VmZX
-PVq67FKN4u92zdNOxgvej44L6H3O0DZ1kJO1istxZBeZOr4oh03zg637Rif+gP+k
-e21MBL+PmA4FgH17O9AF61cTSTm1rOqtY+xAlErsZ5zW4zknHS1j4fzk/70dWPSD
-2AflFnOX0cT9VZfoNyKh60kAddLNJCI5HBYk/BGxDDXH4RTulvpSc8OFdvZYBdvT
-+1FMVfYFPI5E+72MGhxpFJcYPeRA3KftN9dS/uPGsCflVOfPA+r2HUdO+aQz9Q5z
-cOlgcJiLn9u9BBy6KUrer+Hn8n2B4oFqBxQwmhFh6PKYgu8BMJfis4WWmo9hev/B
-CIfTHox7YZzWkB8WbES7IfxKq45J/n0U6m91PIcC6/KmsU9GWXpxKl3VgQyDNjYO
-hM3btqd19E04ZOhOW7E0
-=gWrb
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VSYgQAMiPKVrSwZ0PHMM7BtW/xzET
+VTX6kjYZAGC1wMy6nad9mJPoVTotZ3ZXNI22B5emIIzrmDkc0uX2IBnyVZ35FuV/
+5ZFuB1ws079iXNtIE6t3LpusLe1yRJpHEjLZscH32y4f8uoacMD0uHyNjO2dMyW5
+WmlMWxIdPEtW0pFPWxVszj1eSKjE4rKLeUKKg7nvWQLljSFdCtfsessCCK9uAmfY
+mRJEUM7TWGt1B6skYPhonqPrYYbpmAA4HVWBBqIveAQOJRfm4Yjr3L+UrYmmTUVS
+gEqljFki8DtbcCTIyUAteucq0th1Eg3Ae0MIkM3SVRyUHEo5WPN6CIlRSNp22+ei
+OmN6HRnUU9wWMj8dwRb+LPPePLliVfyWhyW1I9fxQEsRO1nMZNIy101QFLSSCJ9w
+EGgNEV0Wqq642M2Z2nDEmzRzOmL9QDjQrKpaw+JwIryLFP9uCfMfmOqzERNN1Mhz
+Cx1Xl/Kp7PrkmRFGbOKc9aPbXWvLK7O1tBrSirsGw4w4ULbUW6Zm00Ng0+C3Rq08
+i8xOhJYVka7KNTGxXuptfx9xFEdluRZZufXTljPPT+LDNhVcu+A1RDiDA35ao29o
+W6CF+MlzFUggHdWbLuu/9vd0hAha11nnXIrf3Oh33lulFlcBKeRegxmYWVCvafJX
+WpWc3PY/WVY779OkJurW
+=YYxD
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
new file mode 100644
index 000000000000..d168589308d6
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild,v 1.1 2015/06/17 10:38:42 perfinion Exp $
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/cunit/ChangeLog b/dev-util/cunit/ChangeLog
index 855de01bff64..44c11b9da9b8 100644
--- a/dev-util/cunit/ChangeLog
+++ b/dev-util/cunit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/cunit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/ChangeLog,v 1.46 2015/05/15 17:25:45 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/ChangeLog,v 1.47 2015/06/17 18:14:17 vapier Exp $
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org> cunit-2.1_p2-r1.ebuild:
+  Add arm64/s390/sh love.
 
   15 May 2015; Mikle Kolyada <zlogene@gentoo.org> cunit-2.1_p2-r1.ebuild:
   sparc stable wrt bug #530916
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 493f0f1c12a0..8688c3b4d4dd 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST CUnit-2.1-0-src.tar.gz 628767 SHA256 b5fc0ab0f03e8d287a3f65935c7e36fabfdcd9f926ee6f50ac621ea6ab6fa8c6 SHA512 564c297293e3578384c11daef70bc45619188ff823107a2bbb6e56cfa702941b1c316cd9a4cb1116ecc5aefababd153febc39907296392b59e669d3251f85fbf WHIRLPOOL be977c03f15a571e35fb557239a70ef281f5dd9580faf4077b51ba4f80d96b824d650d4a3eb53ec34b9ffb3e08cc06ab4bc6a830f4f60ac8818f95a8556328b8
 DIST CUnit-2.1-2-src.tar.bz2 349037 SHA256 1f705f30b36fe1dadb5494989d1d663241603f456b468c81f606a1bdbc168bea SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d WHIRLPOOL a5617aa10baf617e7165c04c66e4fffb25d2d8d396d8aff8ed5f67183154d79514d2c426c88bc02d02440f4c53bbe2b6025bbd0165fa3a6008e2b19e0317498b
 EBUILD cunit-2.1-r1.ebuild 1031 SHA256 300d52bbf48c1e6e6d15d6a59bc4d5bf3e374e874c83881a2deca38a1461c857 SHA512 d530c8d102e2813b44503dd09623ff9d50c99e89c10878a0cfc4d7f56d84dc17c05c51fac62055b88de86023b0d52ed82e452ffc12f3b7a9ad482e3e06a70628 WHIRLPOOL 199557a6aa5df8857e676c2411bf8da73dae5536c7da0052a280d5c43d57c331c03d92050b266588527e0f766dc2e24247595cebaced75b1820e6f2255bb48fc
-EBUILD cunit-2.1_p2-r1.ebuild 1472 SHA256 51420ea679f3e13c56a29bb05fd8a33be0e2df66afce9bc611a00025440897fd SHA512 d8cc1df97ae21df143afbc688027d213fff7c24a044a4463fcbaa4b31f9103f05eae94b119edcaa05603a33fb1e506fb2088a3c7639453773e5e24f6dc9a1f1f WHIRLPOOL e8a69112bc9aa47921d5c065b006639ac52fe0e53b9900ccb9e1899a0c74973ce5136ee4e382f2b787f5b62bc54b0f5296ecebebdb328713c40ccf7c909455b3
+EBUILD cunit-2.1_p2-r1.ebuild 1488 SHA256 4e3838bbe305e65c26e555e696b41541b4c9704db14eb43ef68a07e141f4bb7b SHA512 03ee410168bf7c88fd8e381a1b3f397d18c797807bbfd6dcfac1d039ce998d676859e1b8f1e545d6087cd25e20aabec6cc1750e1f78ad044821a29cc9090f018 WHIRLPOOL c17233e4667b205078f0ad73bc4f3f15f59abb1927d41a72d091ef587e6d7afb29d498a0780983d375d6a57fdf57aa68b8680fe7b142e44d60457fed0dba50fc
 EBUILD cunit-2.1_p2.ebuild 1322 SHA256 670fa5c74e21b9f3e1b48187e0a37daf265d55b3a2e69da74be92afcf98db852 SHA512 df1023d688d4e6274b4cb808e7deec153547631c53c39e699480b165d95bd56da79a597d365ff8aa664935ddcd6b8e922b5fd1e0209647f0d91b3dc07931b761 WHIRLPOOL 65a048dc4640f0d2670ebc8c6464c471d720b6c71b5a03a98d982f060ba38ddf02459e88eea674cadd851f30a8f7dfeda48824fc7b613b3df0fd320692a39975
-MISC ChangeLog 5964 SHA256 74d1be6375752764ec8d0de595a2e0375a7ad5893f27af08215727f0502657f2 SHA512 73db123fd402fbe6549d4da178d2130f9832593aa90fb6a23797bb8a919c5501162c0e45d465c2638df46b6ac9524473777aebf36412bbe52c98153044be4f37 WHIRLPOOL 958d7c5f1a87be10ef8ae6ebbca96fa2f65523aadcb8d5a6f0d420ada6977fe06330bacdf1853ea8d31495c9dd6c02cc6b7401cd527423e2214479f79844f9b5
+MISC ChangeLog 6064 SHA256 598073140265cb558d8ee6c7184c18d3f56f67d2963692e21c724b3823384226 SHA512 1ebf7446ce33c518e54327c8a10a04f8fdaa23065b518f9b14600c8a80fc6c0d6cda4d0d74fee834a69a4bfcad16442ccc146199f1391427ad8ab2edce10d3d6 WHIRLPOOL c0a43c280f68fc21f8afb85bdcef109b5b39466278ad5416028cee05056d0d441eb67cc15d609b8cc8caa2c1973ab339087fa6098420146126f85b35173cc61a
 MISC metadata.xml 238 SHA256 f5d75e5f9da77fe1ecbadf6f0ee3852591ded7f14fac6aebba4e46935aa44dcb SHA512 899560dc4af99bec39e305156a72002c6d1c6be3110336bb8916523ce0ddcc7153b5eb8897047da43cd75746ce2c783c37f430d9bf6d729026193d23956918b0 WHIRLPOOL b5fab0011c65d4bc7cf1f66f17bf1ac47e688cca4cd09deaa3eeb4627b1aa92b103da01f8bf3d6cddc7a9d5fb9b8ae37cf5827aa582de9f0d9c347e17e34f5c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfr8/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiW/0QAKN6x5+S9AjeuYRzwA3BTNyF
-d6uLQZ/blTzfscXF4i0SKA8OR8gUZWsp/eSjAFlFI8ZLRu2nynf1ZAnQ3IyqLs1Q
-1VFCvR6SIhMUroujMLt3ucdlQ7xqPk/Uq0Ep+ZRtC5SVwTbkFGbe7HNLNknA+Fgn
-1K3abNaVxK/G/h8FH+7ZghtklDBGqsDBScYfRutU1E7e/OZm7BKu7uM4jsXEpSLz
-wOe2ITD0/vhbY1DIn4H4Y5Gd9NLc7fYwHpv0V4VdNwYRly9NJQQCdIB+ldVICgtb
-hnd0622WA47s1Ph5OmqTmDiAg9TzftMz+w8XthXcfDVlMZccV9hgopKS0e8xC3+8
-7Ixg1boNiP0G386Kw3W8QOFxpZKSXBjs2VB+tR44vtShbJ0pr9sD7qWM1OevEiN4
-uFd6fWyxq/041/jFkQPw3+QTXs0tJ1xsznjjZikvuTMAAsvBDbZDJi+G/W33Mah0
-jVRWK5FrPMnvTKxy9LXq7n7g3DP5MKbnrWqiGG9y9Gg3QvD+0uGQ5YqQxqt+brjp
-Poth1Lkp4rbqJLphko5S5SdEyIG2sSaj5tVzMXAeErUpCgUXnDcxR1JIkt0asAGe
-PsanZkBdLTXu7pEHeRO8rn9VkGbynni3kl1bOaZOX30lMCx/H/xXTsYG1quqNBcA
-FRTWJBm/+aZo8Gt1sLIF
-=wo1Z
+iQIcBAEBCAAGBQJVgbj6AAoJEPGu1DbS6WIAdbcP/2dmgH+0pNTNx5LIYD1HjzQ+
+TN2x6+68fIS9eQ4ENMMfBM33kQxz7mNMJUhk8/tt2vCUz6i36i55cvNJHwkFT6Vv
+4MtHxW7gr/WItmRjGHkjJZ9hcwEK573Cel4zhX7RYH6ze1gF4Ts6jg7olo0kePoI
+JFIT71hv3iH7erFPPvuAH9guOlG1XlKuL7rjjqVwnKkwqrUG3Sx8RqoQUvQEQszE
+tHQ8QZy9yG4c4PyF7sZyFKQi20gnmQT0I12XbBTeTGs66turWFZMteRqx9IPqpum
+Ft+nzuOeqIzudYKSKdtSe22y98z6IeE97n/j2dHuvc9I0IiMG3HUGUeDElFNNjmW
+F7Q8nPcCjAuM+T0cCmhS83arz5rxF8wMpJR7FX8KBIeLZeRb+Jm1x/4VTtsmlj9M
+ormM26iQzvbcEs8nEZJq38zdfVBP13rdSJTzfb5J9AJK/0J15lUC2/MKEYh5T4Ms
+xsO/aPf+KXk7zMd1K0cA6M/OZ5GnDr9SXdqbGqdDhaVZjSe2WFYa/QKorauKcvwl
+kM9fmnRZpT2V02wOW/MrvrPk5+6BCCQwwUhcvINupjipdzxx5BqdHKse/G2qV5HY
+D9gX0CXIKEngh5J60kJKnEuz0K3S5HeYuKIkqsXWWATBvTUX+vtitP1+BcyiZqxj
+DQ2qmWg8YIUQqGm7JMDy
+=2nTP
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
index 83452f0bacb7..25b862612317 100644
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/cunit-2.1_p2-r1.ebuild,v 1.7 2015/05/15 17:25:45 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cunit/cunit-2.1_p2-r1.ebuild,v 1.8 2015/06/17 18:14:17 vapier Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
@@ -15,7 +15,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/radare2/ChangeLog b/dev-util/radare2/ChangeLog
index 5dab117b6999..ecccffc268f8 100644
--- a/dev-util/radare2/ChangeLog
+++ b/dev-util/radare2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/radare2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/radare2/ChangeLog,v 1.2 2015/01/29 11:33:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare2/ChangeLog,v 1.3 2015/06/17 08:06:17 slyfox Exp $
+
+*radare2-0.9.9 (17 Jun 2015)
+
+  17 Jun 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/radare2-0.9.9-nogit.patch, +radare2-0.9.9.ebuild:
+  Version bump, bug #552268 by Jonas Jelten.
 
 *radare2-9999 (29 Jan 2015)
 
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index f262fa011947..dc26f7bba3ef 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX radare2-0.9.9-nogit.patch 352 SHA256 cb87e4093d4ace137f48e79d899576e89c91805934b0ad0f0b1c5f4a965332f9 SHA512 5a84c2f768b60dc6ffb35130f409714e0ffc4cbc6fb9e08bc4bf86d28651060398d809fed8abafcd56cabde86aa9e8672df77212f0d8c0b6dfc056b243e1c270 WHIRLPOOL fcbc1358c844e486366f766061b82c2ae72f7d513b2e504e7b488057e88f1af732667a5f02b05a8c8f91642799f3fdd47ad8f17e82f9659377c651d3e8d9c7d7
 DIST radare2-0.9.8.tar.xz 4614588 SHA256 8e72caaebdac10300fd7ec86a5d06b1cbecfc6914e5fea4007c6e06e667bfa5a SHA512 8a3b1811c994a520eb5758a11eceffdaa999bb69b5252e45148813a7c36d11e0afd8c83d6f03bc2282c526b630979edc20bed050cb119300dc353ee039a99355 WHIRLPOOL 09ec20978b18f16162100ef3277f01d0dd547779dfb350fac4ea0200cdec58b317aef8f976aa881d37db21a5c8aae0ca53577fc3a3420c20d835d40f4aaa92bb
+DIST radare2-0.9.9.tar.xz 4318304 SHA256 024adba5255f12e58c2c1a5e2263fada75aad6e71b082461dea4a2b94b29df32 SHA512 6ea9396f59a5f61d7d433bc2eceb093526112c58114e2c7d83127d52442e376fbb4277d44447c252c9ba99d1ad1d966a06a6a0d5049660ef330029e2facb4cc9 WHIRLPOOL a349edaf1fea30117a13cb07f59f0798ab4c11fa13bf068a22a574a87b42fef0e695db3d87d42dc32c2e6658688887398e1ad8de85a5558c4b2116c81eebad67
 EBUILD radare2-0.9.8.ebuild 600 SHA256 58b1500ddefda470bde144bd6cca6e21f38806c6b0cd8229adafdefec3e9e2f2 SHA512 526412cb605a1292403cd84bc8fc2352cc707157019ac2c5eed2fa3ebe9f69cb1bbcc1c15df9cab13302bd3cb6253d38b8c359745df8326b576ef59eb78e5146 WHIRLPOOL 3c297943fe7ad3d593c5f972d703134e627369c1a4f067f56790a6dead5fc170b689f519b86352de68eafb462c83033546ec93f0d9db98389831c0a5a71ef9d8
+EBUILD radare2-0.9.9.ebuild 680 SHA256 406665bf3f41f127e5488bebdd4ce1cc9f20a277992e281525453ab741a54f1c SHA512 aa3e2da4a64b00bb30e9985dc0bd36eef5acc6f9bd84dbbf60014f5faaa45bb2c4fb2c4561155612bf342a211a09e08d91da2fbfa4b297f3ad6cf918d17d5e1d WHIRLPOOL f18be791f32cc4e08a59a08112bba3425acc060068bf88d29ae3d6a0cc619dc91acefa11e21d7dd7c23d71e4c179d66517b4b3f863dc7599ce6eae0ef791bc66
 EBUILD radare2-9999.ebuild 702 SHA256 720e4600c8f539da860974fab5c334e9d175df0e8720ce2d034776594da21f42 SHA512 425d0fe22029b593ae10226467a2116de36d77b3289ec3ecaaf430576b76f153068172c56ee798b9e0c3fb96ff9b5ed2e20c2b40b9be64b8cc22040ee5d4d540 WHIRLPOOL f08c4deaf4fa49b2fc6c584a007cd00c22a39061cae9e6a6373740589c0190427767d4d053aa25a231ec0608478e529b5b61abbef9b4509ddba0b4468ac1e943
-MISC ChangeLog 602 SHA256 945955313073f64531aa4f607775c139f9477586b06ad5dddac1d171cb1c44dc SHA512 0b8795fd2e3e7577bf6db50faab964a2145783cc3e6214898e07a601fa4d2ac07e7b4661b67e6641770c6a573a4e2a3cf58664da3e2e66590c99d5197cb181d4 WHIRLPOOL 98dfa7ddd20d0170c6a5a8c3bda60395d8456164170f5b10f36833e03806cb6122c125f909c7349ad46b6dc282c69f04270835846f1a3858dbefcfc460e9aa62
+MISC ChangeLog 791 SHA256 4dd712e34e1b2e2ab9be03f8f9ad678dfd8e6a26da95bb9ae76c9a4f2d618430 SHA512 b618b8c70903664d4f78ce1318761460114c52a6b83320f22bef114988919a3c5a9961e01c16b40a1e0b063f4a4f7e367af93c9977dfb0c2d675e3c325541198 WHIRLPOOL 694b555dd75664961bee62ad4fe60394ad7a38e757c5d67218a174c46811557b10271575ee62c2be1617f3019b3e703dbcda281d159cb6d2c8af093ab1f60e9e
 MISC metadata.xml 285 SHA256 5b7e5a7dd46327e901035dee668f098d4809e91234fd75f6d1cf2c3db7178d16 SHA512 c83f84d36f446da066e0205c938218bf775caa2b7bca33047137f0e87a10aa89731d6875d3849b3162979101ddb2e4ef6923d37521d63ccb560418221135d94c WHIRLPOOL 8d7d2e85da6081b04918ac0010a12c93ba5f524dd6f7995dd437026fbd952d6d95aded099c1eec14321bfa70ca4f748d717f2ce9ad12fcb0b66ea37b7e4f25cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlWBKn0ACgkQcaHudmEf86o3EQCfTfbnLzlPkNGAF4UIr5q9legJ
+DHIAnj9wcDfqteymqtftvj0DM56WEXib
+=o+yg
+-----END PGP SIGNATURE-----
diff --git a/dev-util/radare2/files/radare2-0.9.9-nogit.patch b/dev-util/radare2/files/radare2-0.9.9-nogit.patch
new file mode 100644
index 000000000000..9a6979e348a4
--- /dev/null
+++ b/dev-util/radare2/files/radare2-0.9.9-nogit.patch
@@ -0,0 +1,13 @@
+capstone-sync does not work correctly for release tarballs.
+It tries to sync/revert from upstream git repo unconditionaly.
+diff --git a/shlr/Makefile b/shlr/Makefile
+index a1796ce..f8d179a 100644
+--- a/shlr/Makefile
++++ b/shlr/Makefile
+@@ -144,5 +144,5 @@ else
+ 
+ ifeq ($(CS_TAR),)
+-capstone: capstone-sync
++capstone: # capstone-sync
+ 
+ capstone-sync:
diff --git a/dev-util/radare2/radare2-0.9.9.ebuild b/dev-util/radare2/radare2-0.9.9.ebuild
new file mode 100644
index 000000000000..4e88bb77a7fd
--- /dev/null
+++ b/dev-util/radare2/radare2-0.9.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/radare2/radare2-0.9.9.ebuild,v 1.1 2015/06/17 08:06:17 slyfox Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Advanced command line hexadecimal editor and more"
+HOMEPAGE="http://www.radare.org"
+SRC_URI="http://www.radare.org/get/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug ssl"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.9-nogit.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl) \
+		$(use_enable debug)
+}
diff --git a/dev-util/shellcheck/ChangeLog b/dev-util/shellcheck/ChangeLog
index f908bd9320cc..8d1fa72f7d5d 100644
--- a/dev-util/shellcheck/ChangeLog
+++ b/dev-util/shellcheck/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/shellcheck
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/ChangeLog,v 1.3 2015/04/06 14:46:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/ChangeLog,v 1.4 2015/06/17 09:28:53 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> shellcheck-0.3.6.ebuild:
+  Correct version of compiler in dependencies, bug #552274
 
 *shellcheck-0.3.6 (06 Apr 2015)
 
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 3c513b81bae7..f5fc73ffff3e 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -5,25 +5,25 @@ DIST ShellCheck-0.3.5.tar.gz 77173 SHA256 9289fda0b3683f4e7c2c003f875a9e30889736
 DIST ShellCheck-0.3.6.tar.gz 82760 SHA256 f19f950b39eba78334cfd044077ce3686fb6defe2c6e593c0def949aa089230c SHA512 53e36770eabb49f2e0e84a508b69805799451ecc3bc6b2013e68b5f701d021d552706dcc027089c92355e833059ce856ae193f320f9dad0d3c60c4c5d9516219 WHIRLPOOL 5e8e50c6fd2a0036c24994029ad2e3f5d08afee888606c5205b10bc93c6882308dbe14c3b050c3edeab6e6554f8f20d312b147f9a52575f0491a36e0e7a7411b
 DIST shellcheck-man-0.3.5.tar.xz 1876 SHA256 5b3f940fd8760676c40787b25b7c950a5ae7fa25e882dea6b11dfeabb1b712ee SHA512 974b7bae0a927151819a14eef2be40d76c2eb50fadfd966bef79908b7faab958ecd42a1584cbe1fb25e2e59f1593d89b8632684d655490c83e246502d9680d26 WHIRLPOOL 622968777ce5387abe6e5f068bff5eb9879d8a990d7680fe2acba1ee89114ec5aca3cf402e579222af2941b0d99b1df95415ad17e9ef973a7b7e74fcd6acbee5
 EBUILD shellcheck-0.3.5-r1.ebuild 1124 SHA256 9eee735317c2432d78cc3e8b7b4831e334794d21324edffe8e99647d3ca1aea9 SHA512 2cec123829fb682c42787ce2dbd51b666d8caae243cf28652518abae4c3ea4a9355af8c9c3f7384a97e359b2447f97e5ef5f01995ad2f0bdb123f3bc17ea4bf2 WHIRLPOOL 0f87efc9d4dccd7a8b66d11cd7c09558978be5bbfac5a5800e0c01a204c10209b124984a6a773333d98758eae09ee02428a55bdd5693ccd9f7916e2f30a9122a
-EBUILD shellcheck-0.3.6.ebuild 1123 SHA256 89c78b87e473faa497bf674a4da132b652254562012d00404e05a80043a14829 SHA512 55938d3a316bc1f497a649504ff3efe7444fec1c58a4d548156012f5f05e7c16c57bb63bc69ed2847cd62bda7574437e91d6f1f00cd4afb63cba26aa23e6876d WHIRLPOOL 745f9f94c447cc83e0aee5e30e1e023f717188db270dcda133ffba622a2b494d89bc016eb88aeba9ec2fcf7d635f83e56fae1990c4f5e50bfff61e3a5ae642be
-MISC ChangeLog 648 SHA256 e5a6db2960e030a91f720c364f773d73074dba033ee54d859fcc960832e9e65b SHA512 b583976ab48408f36c1f8d75917938acc2a8601e1559f937332fff342ee8554b766554960e88f509ca64bc3d4e2ed9c37761af49b4290020141751f2877ea890 WHIRLPOOL bab4b5c33cbbc29d075259eda6b41d490341b5eb00f039b0c7ca902a2dda68c2fe564b0e85256a39269b735bfa18a7fbb73be8d74a3900cae7c8b8c82bc0eb54
+EBUILD shellcheck-0.3.6.ebuild 1123 SHA256 1f0408394301eb05a285b1c3b9f0b04fecd471e3d5ca4de9ede0e5e116791af7 SHA512 36fdbc31c26e71be56854dba3593ae8c725184977eb9771a87383afa806d95c4a86098024742405819685cf63bdc232b1bcaa5b23ef16eb60bab698b9cfb0cb0 WHIRLPOOL 2488bf77adc1c748157e9657833422c4f4ac00b6c58280c5e9522f97679b69a0c230a65ff911a96198edc148707b453a51d72742f0cac8203dd79dd9c7d409ee
+MISC ChangeLog 780 SHA256 e3428f7f72cfd2c1a6a8ca4725b86fc2d88bb80f289a07433baffd5bc4c4bda3 SHA512 66e08155f7125d5324ed902d4461983d74561a1b7bb156faaacebd4a9976a6fdf686e18b127cdae9cb56fd99cfb59c0d540652e447f027230419dc0d9d9396b8 WHIRLPOOL 02f10ab851e2a6b9ee3fc1ae939313335c90133acec560aaa00ea47777818646a53bbede471ac44896ffb01ac82c7011037645eb6fc8eea8b6f0c895c77bf449
 MISC metadata.xml 236 SHA256 feedd499ae6ddebc364ebb0f38d08bfbcc6b5d499f805a307a9367fb82dd12e8 SHA512 02882c2ecdf4fe400bf3e4455df1feae173e12b6fbb09181ea50541bb9dbf43780a0ab00fa799ccf5b7f2c27dcf9d854e16146cfb336ff3270a7b4369e451860 WHIRLPOOL b6580a9428931142ea961e985e6b5c736ab716eefb85706692c780c11f97d6019be488493c2e2a51b7ae8b480be80276edddb2858fe19684d48df64433475e06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVIpw+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZ8cP/1xhvAV5+O4FgLl8ipfsS1a7
-Ez9k3K/XjmVW/lk6wALbxLqDsdb7Q64xoRyESv5TN7iMozljkaYLy8CnyOGUfh8s
-xJt0KbFPTM/XOAdsaqt4MVAwlvC96ubHluwWbzpuDt47Yig2Fs5Z1/pFqjE1jNao
-i9WqUpfrVm0e8hICtRla7vJLdtJJxMcAhObywAPNLiEjTnp9Gndj1E+fRgqP8htv
-Sf9foFq+xuyFLtHqg4DrQHgDPCUWZR8XiT9FFK/1Si/NUxwHiacN8dvun/D0lrby
-BS0jO4F9Bsw01iao6e4dISDQx8QJDjEpdtJ8uaAG8F3NFCQNFZWgK0g8WRiw/6l2
-7G0edAcQgTIHi1+thEQZtZmZPq/kJvMCxee5geDkmE6unUaFAut+SBuiuLbH+62F
-BYCymDha5DmRDLG2EFoW9ARn5ocgKbBkyT5XrHzmrP/ZufVEaYsJolJKARgVeMIF
-lULYclqoBTD/eqKGq7CAu1P2zsCU9hRnlAnY1P0ZIuz4fRt9Y3elRVedXAvTbEPi
-ZVCTVFSyIXya09HlqQjPs5GkZ0ZX1FEeVLU+e66vRGi5M5Pg87x9V5zTJ9mrSTHx
-PfftFGVQnLL9XKlMPVQTx3bRvv+vnByhx9ZE9j5dCngMmaqX6oMNIeMF7GvV8nf6
-XM8GiQj/IbIw0tOPM3TH
-=W2hY
+iQJ8BAEBCgBmBQJVgT3XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSminaQP/0A/5gxeD/BJwNrNr6kUnG8y
+tQp9ShY8gmpj4vQdnfMNqGPVcWL0hcKx/nZ73rGle2dtWNptIhN3uancQqKiMovn
+94gd112Uqsm5ygw+ANxN9a7LwIN3yeWu9UE52glwES1M7tvCnCXOYfp2R2g0xSo2
+qaxV3Cn+qnaO8Y9GTaDagJYGHKeEDEF3ZAa2WiJZJUHfYgLhngGEhz+lKDsIEEcL
+61ScqYEcWlQpOceDKaQctYQ14LZeALD4wPzRlxOIkd3I1wKl007U1XJEAk2r2GMQ
+xylco9GjS8JekhsUzxMR3A+kHywRMpIqIOU69jHLOSe1DMHm5CJUVFaFdL1LZFAi
+ta0n7MhwRQfLn98a7WHJ9RovNFvdEdPEisMQElW7XfJwN2QSIsVtDL5QW5en6BbK
+Og4Iw01vAVPs9oMc6qi4BVZLAbrOMdOtOh7M5r7p6/J5TvEvSvPGxpjNIqwPtIS+
+GSWhDeKq5xtOaTBffUVYJWgHunURMH7C9bdDSM4zElvRQvdawl0jK++Rff1XrJKs
+4JfX/8L0WoTY3vvYUzRv6+EFassCFAfSspQs/DGyL9O8NzluK1Hj1z6ZjLxdWmeh
+OyL3thlRNK7/LmoF445rFJt7PRuKVXkY2PzndN1Aseg9vVg0ElIjHytdFj2sscVW
+m3X3PTh4an0kfdXl1it2
+=lxUU
 -----END PGP SIGNATURE-----
diff --git a/dev-util/shellcheck/shellcheck-0.3.6.ebuild b/dev-util/shellcheck/shellcheck-0.3.6.ebuild
index b4d757aa1a0f..1f2b6fcc384c 100644
--- a/dev-util/shellcheck/shellcheck-0.3.6.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/shellcheck-0.3.6.ebuild,v 1.1 2015/04/06 14:46:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shellcheck/shellcheck-0.3.6.ebuild,v 1.2 2015/06/17 09:28:53 jlec Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
 	dev-haskell/regex-compat:=[profile?]
 	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.4:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8c838a139ece..4de808eb8673 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.337 2015/06/13 17:16:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.338 2015/06/17 12:50:34 polynomial-c Exp $
+
+*git-2.4.4 (17 Jun 2015)
+
+  17 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> -git-2.4.2.ebuild,
+  +git-2.4.4.ebuild:
+  Version bump. Removed old.
 
   13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> git-1.8.5.6.ebuild,
   git-1.9.5.ebuild, git-2.0.5.ebuild, git-2.1.4.ebuild, git-2.2.2.ebuild,
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index df08cf3c62bf..7befd2518d23 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -22,8 +22,8 @@ DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d
 DIST git-2.3.6.tar.xz 3621716 SHA256 3ce01c54e92b47366756f57742280e052412efde65344e31f51ad8a48a7c60fc SHA512 53ad21db0fa6bb48ee24302c35ee929b1bd1fae3b646845523e7105b8539700cef23e2425170dec0311c7e746c41b743cfd78f192613b586291e44b49c3c284d WHIRLPOOL 12cf33fc19efea4f885a9b5c6d7099893b92742ffaad8e407016abfc5232ddd4763db95fc657a185830e2f904cdb2b04e8ad1c4305f09d77ff8f7db07c139799
 DIST git-2.3.7.tar.xz 3621804 SHA256 eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b SHA512 87502626d228c8c231794cc8fde29175578c1a5d4bc69aa2fd722f5a2ca3860cdb8c54aaa679fc56bdd498810e75af60e568bf4ff3375f5ff54fdc98a46e2fce WHIRLPOOL 982797f9fe540fe980a3c566d1b77b9342a420e21df97203a4e7990988b8eef7f7a37aba4f7158ca72db01a16c8f1f90a9b94b5c492a184ead8c1be98896928f
 DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
-DIST git-2.4.2.tar.xz 3683880 SHA256 4801ec1cd8c2175b58cfdbc721d0bf50d74ae226f36905fceb894c2fb620c9e5 SHA512 0013069b73572fd764489222ad94cf94b9e08fc65223187a300e6662fb56b27dceea0b3a473cf8630793a5bf0c87e3b63264936bc38b66f71c6a548912540326 WHIRLPOOL 52d2fcd44c4da3f0e1f2caa229e1086b92022b992e410f3c20344f527f3cb9a623d3f0b6a8d5d66f3e4f43b9677f0211ebbaaffe85a621b784af1f5bc3f5896c
 DIST git-2.4.3.tar.xz 3687444 SHA256 f05007a9d1ef28c3d84091ddf7ce5d29c2df2272f34b4dd8b24e09274280d814 SHA512 ae9647e121d8aae9a57a2ae1d1b0474c94b8663b61c41d4dbf50e83e85fb78cfc794452fd1eeb9e31ddc784d1b78babe789c8be7bc80e7dc9884fa1ba9cb0633 WHIRLPOOL a7e62ce2217eeb6bbfad7d13c78d65898a144fb72ed944a19632e5c14a51de950c7afa7d08d4d3a1130980e1463b3d62851d6217ae6ed5946773d8ad61ae0c27
+DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85
 DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
 DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
 DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
@@ -32,8 +32,8 @@ DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002
 DIST git-htmldocs-2.3.6.tar.xz 987292 SHA256 b37439087ae465534588a65380e3acb66d3e6949904ede720febeed1dc5d8b49 SHA512 ccb836c3df4bfb96174500295c630aa1ac3bea475460434e4d097c3e178bec5a0b5037ff17281fe6a6bc7bb3ae6bcac03ee4009611bb222eccaebc3ae6aac81f WHIRLPOOL 8c58f108d1ea95bf552604b956e727dcf7a8f0eed8979239b0b6ab931aceffc76434137b5f76054563a09985bcaad0a03359da8791469adae71a3a8821084d58
 DIST git-htmldocs-2.3.7.tar.xz 987448 SHA256 8e797f1d50ef4f5681fab9bd2e45ac6c1d75b4a87f67d7a55ac37e1befaefc7f SHA512 7ec6ca9c43fdae5469eb2d81cd2c4325e3baf28028c0170077b0fef4f5c2620ee5c4ae15f021eb84e5b11d19dd13b39d38e27e14b162b690f4368a44c5b8a175 WHIRLPOOL 72eb57e299ff6dfff31a041e7ba0b85b5e65f1c163b2bf89de2e34308f2e6849333caa7d433d3352e55dc112ab60f48b777056618ee3c99ba67ceb643a8f99ef
 DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
-DIST git-htmldocs-2.4.2.tar.xz 992192 SHA256 792cfc6c8236fdb58dfd66e39766c7b8097080361eed28443207bc6c36e07911 SHA512 e9790b698c50a09724ec9c71001a70f2a6a7094b72326f290f3b5c7b274181f331fdbb71cb4e2db9edf1229ae534a715b2974424b89d515b901b074bdeb30b66 WHIRLPOOL ef3de3704e7c0e34174b1e16f0837c52d9ce9d64c0f61c417a52811ca623ae17304a2b9d484457569d635a269b4dedb3e940bf0fa7d3db1bc4f744bf1d392ff1
 DIST git-htmldocs-2.4.3.tar.xz 993204 SHA256 5a6f6ef9c992eef29b62d8e963ba508583b917f14a374e0fbba3fe50a44c111a SHA512 55fbcffc89336083975ebdfc0123bdd7ee7d72cb02d54250684360dc5fc324209e5ae57a8f6bded65d850714b84c9322bbbea30c769389d5af67cd7599486478 WHIRLPOOL bb38b49cb28ada1e174fb8be8a6b41d19dcb941f0dd79955ce58deb31603288540fc2a4fe11b615a8984b143f69b6e6800243c53988d31a81adbe7342d483433
+DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054
 DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
 DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
 DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
@@ -42,8 +42,8 @@ DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c6899
 DIST git-manpages-2.3.6.tar.xz 371620 SHA256 b1356f5cb3e7bf53445b08f24ea6950ef1f80031aedd6cd90e3ec60ff1f06b02 SHA512 c7ff2e6aea8c0c12009f29724c899e606b6620e7d408ee3c536fb5239ebcaa0b790a6ee1287dccd88df8776fbc2e72e799124426dbacd82e12f05e3f9f3c909a WHIRLPOOL 7117ba84d888ea448807f3bf51f958b86de011afed1bbad78abf4390c1a77f799f77781f4d9bf1e9287ab903b912b7ca270433c1f4a1f112a4cb4840dde3d400
 DIST git-manpages-2.3.7.tar.xz 371556 SHA256 77e783b0ff15f6c0048bb6c4b79b141dd045516a45fe72c2a4b6fe1434e476ae SHA512 fb8a79c5b058faee528f70df93f9743b2bc2399e0b0737cccf26691f9d5a2697430587a95706dc70d2130cf56139ecf5c0b172a5ea475f0c2d333d481bbcbb9c WHIRLPOOL b475367033b3444c098cf225abe1d127d30b3adc9313b07f15145f67ef5ee49bd89e8ddabc253e7d3378c360fc30ec69a110365b3c3f5333f7d1bd66e225a248
 DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
-DIST git-manpages-2.4.2.tar.xz 372804 SHA256 1b1830e804725e90ff319d801ab25f84ad956564379ef976bdc91bd58b743c32 SHA512 52f28cd537fc9fd34acad8834aa05d7d758e2f639df18b978effb676d5dbb660c99764075eb216c6377adb14b0b2d58584c8b3f635442bd4ded36a31b8757dc4 WHIRLPOOL f30b9293aa594111ce4baa46fee474b114199cc691ae43dea565a346f8ad7eb2cd72574bd6ddf9d5b32af020ad6032778cef3610ccac74d0f94be965b335962f
 DIST git-manpages-2.4.3.tar.xz 373072 SHA256 91e1a9cb4a35c141bd875063fedc0409ecb676e828204afabc75c3b4c7b844cc SHA512 98ffa7d7407300b63f07d0b7d27604efa99e602fc316359624b43312de983422611ca68d2a13634cc5421e1ac14914d45e9b933f55957854075a3a6476dfb1f1 WHIRLPOOL 915ba5bdb165c7a5f46c888b6517bfce7baad1f628554ca85aa6274ba5f52229af97bc7219e566baeced7b5393389b661781ccb2fe4ab56672a0c3fd70b86499
+DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413
 EBUILD git-1.8.5.6.ebuild 18420 SHA256 8bd199f2d9e9882f2c75ecc943c0b61fd574773ca17cd62e5622dc75a8a3e721 SHA512 835b70267dc8886148b496d399218149722f1268b65cf1543ab19e3531197e38f69c915bf372b4cbc971f83b85d97a2305bb17bdddba6692efd8eb4333c0efcc WHIRLPOOL 6db7ad96acc343ed2010a7dcbc2f560c9a28fc805c5c4a5266344f80c0124f1f9a5e7d20d512cb161e66c11ad45c2bafbbba08791d6b26d19eae0789a2b65ef5
 EBUILD git-1.9.5.ebuild 18366 SHA256 ed2ca0eb88aef746cb733903526b3779f7920cd01645fb8746b06bea6ed6bb8f SHA512 cbb477f538052da56c4ccb48b80a1963f88ceb4d9c27aabff4c6975601a51ed9cd791d6d36b0ce1144d0a045a0f17f730cf903e9d6babbb25cf2f838ede83205 WHIRLPOOL ab0214820bb2a92bb9575ecf511bdfe09b7559893ac9890b8b2b0062e95a11282b0b6eacd1e17ac929ef39d31e6256ca0d389723fdce25cf81c43721e37fefb0
 EBUILD git-2.0.5.ebuild 18441 SHA256 89acd9eb6ec6ab801309da85b860a29b7c8cad047f9f867e1bcbcaaf3aa40710 SHA512 94a7950cf0b48fa143b898d9748fa1ae6700d85149338440db281307eb569afcdc67dbabcbaff8829c1f841a110e67cd03f5fbb7271f06ff78dfe0cf10e40420 WHIRLPOOL 67cb064e76a59c8de0a89cf1965962aeab85e03e79bf9710e1605a419223d1c6293c021f3eb316d20c5a2ef53eab56d7e8403552748868fa8909d8fdc545fe4c
@@ -52,31 +52,29 @@ EBUILD git-2.2.2.ebuild 18152 SHA256 f0507277ac9bcf329e5b0a84340096e994f773fe6b0
 EBUILD git-2.3.6.ebuild 18135 SHA256 d9a413893f2108b86620989dc6000ae56e182186464d852fbbe86408f7df648b SHA512 98bc4eacb1dff752c70fe1af7566c2756f093b15969106ebaf77d8a72115b2f6a738759ff9dba60dd860a3e3d5be7c974297d5758b96b27d26e77f106bc2ddc3 WHIRLPOOL 47f5c8779bd6a6c9ec72ea3aa65c6c02482934a36b263fb617795c031ff1d665eef70d5047a33d3918018dadd77dc5649e3248b28b04809e5874f0140b56404a
 EBUILD git-2.3.7.ebuild 18142 SHA256 f8bde7341096f85879c49b80e1cf0fd08c47a6e7a4df429d71859cbe4d6552c2 SHA512 3e1a793c17548f64cac11a4a93b8e30d4292df275362d78ffe2af7ee43ac89abb832ee09241e01611fb2f1f889c657f3cd2528d57673ab311d13922eb8fb2d00 WHIRLPOOL bf8b459d20b2e317225389efa793d1257cd9a00a6abdb5330f9f28f191a4062fbe89c11fbbbb34502f8a431a44ba6fb30caa3315e340c0e2cc962658dd410ea2
 EBUILD git-2.3.8.ebuild 18142 SHA256 588105634ce20bee096939923f7d5f02953c84e526523569049e457210124e82 SHA512 b5fa6c3138f44d5478472bde271262dc5b8cb5f897ec68732323ef7f7d484eeba31eaa448c3b2e775b0b8d7aa325b5f725f9fa0cc30433d1faad4ac437ff3bea WHIRLPOOL 5851d8b1b94b63f197a3c96c158a7e7e614773c38da4c4b0c7af9a78517787414b3ea70df0a6b5313c7ab3e8bff3dcc629b94c09297694fdc037cc423ee7ba45
-EBUILD git-2.4.2.ebuild 18142 SHA256 56f375a969b43967be6bd7c830a1e56fb42d62f495abd545b3aba11439dd9260 SHA512 848e09af6f3b80e6c1afec8c55d232ad6e285904ef989c57a9a123d06dc4b40dc9b93a732adceeca304884cd08e7c73bf36e24372b1db8c58e74d8a1e978296e WHIRLPOOL 1138b49f6b0638a9e2a5f134978c337466137b0b6b873d25931739a791924a333933caf72bf21c54251b39cda9f48fbff56b144f2ba12206d8d1dbb268db0dfc
 EBUILD git-2.4.3.ebuild 18142 SHA256 6b87e090f0c680b2575d28daf20759b8cf1cd4120648a68c835530949c45a99a SHA512 cc5891d8e4f2a048c28360b53470862f9aed9171f64bcc1743b2df1d3af99d22a9b0608e7cc3bc8515e3766dd45784794118dea501c7980ae6aa492ad253fabe WHIRLPOOL b113c00bbe33ad01cb12231073fb3f07865ecf2b68cc03e3780ac2e66114e7c1975933086268e61d02962ee5a564359f1c16ea9a2fc5fd8c74d81a08be709375
+EBUILD git-2.4.4.ebuild 18145 SHA256 a9c201a901f907bedf81f45b75843beeb3ac49699ab44a3daa500867ca88b723 SHA512 cbb674196b53fa0410f9a76c7a9c51778ccc97701d619627609636beb7d00497cd9ec66dd896d2cebc117560146ad64b55cae03957c13652e3a0e71b66700c6b WHIRLPOOL 81ba5886a4a017193e32a997649908996cbcc5d5e93a7bfc0bf9e4b88d5f96e346a10b9ce6b6263e2f51fa024c9298b92887001f7ebe88ba67d16c2f4ec23bf7
 EBUILD git-9999-r1.ebuild 18408 SHA256 e564dc21ec2c510e02fe058d1daefced55a1950f06a8cf5058d83c46e59ef6a5 SHA512 e75c2126c7f685c8133f13ab467395c379218cb22e0e05d31b3af9770bae2a86ffc50aca4a8c06f3f1d9e5b2261246d98359577290c2b2631738a77a57df038c WHIRLPOOL bfb978bc847ebefea5573315e68e5f93acf2c9bdd22188e933ddadc6240fda954ce90521993624010bae8b9da390aaa4575c84afe04d360e3af91490409324c4
 EBUILD git-9999-r2.ebuild 18409 SHA256 b906c115584a84280f3cbb0baaef9e1b31e7eec84438c6f9aeb01eeaf0b7b5f8 SHA512 b354db3fb8a8581cb88c2df8cb769191bb6bce8ff476fdaa07977564e6cde93cfb77848d1554a165d992e3ee1176820937cc288b562ad940f063fa09c1dbd370 WHIRLPOOL 8d02999fb604dcc02547a560747f7fcd3b1ccd9ced26398f00255b9a272744c088f0f53c269a36ea20feefb82c6ccdd5d151b6965072cf1f138c0ce253948f19
 EBUILD git-9999-r3.ebuild 18405 SHA256 6c326a688255a7162bf76cd134e0d27b608906bfc48affac504cfff03862763d SHA512 4cfe1738e1ac1dde844a791802987b0a503d86595743eda9ffc14466b4b62f585d20be7c11c569ba93d24f4c8bfca6da47107cf86fafc950de4ce7a6d73f6308 WHIRLPOOL 2466a93be31cf90ad3f83b1e8d47488894c9d18de1a533ed745ad756969b18f6a4ff8b61a3ba361500f5bdbf760e3f46cf5867b394a40c47b47828a07df87d9a
 EBUILD git-9999.ebuild 18408 SHA256 03e891f683ea433405815dc3f81ac4cee875a46f974cc96cb9c03513f6d825a9 SHA512 79818916651744f681cd2a993fbfa859fcf831ce5de23752f77efdc3893debe7e017c7383e5eb64923a95bc09309145578adc0c719045e5f67c0dda8fd690813 WHIRLPOOL 647148a4d8f69f80dd9dffe99c45f450fceba3214ac4cbb2c7c3992b8993eca2be980f52ea7c82c7f33e4ccde077bec46220cf28bf4bc7f0f354a7913ea4bb42
-MISC ChangeLog 27593 SHA256 8c10ba257933ee3d3eae580a12de807a72b5e15e08bd94c6c7f903c2ac08ddd0 SHA512 03897932accf41b88e3fcb4abe558ac9ce905276e0f8c591164f5ca25824731623212d16247d66f468446f2b7faa204476be058185eee09ede18318b32d42544 WHIRLPOOL fa639936051ca9470d510ce80b723e8348cd70b4b94ce4be20f32d31abd393c10988a1ad2e71bf7ecdf0f5f71579a9b26b0104e8b22fe3a972174e275a4e8038
+MISC ChangeLog 27746 SHA256 f56a64f1f477958a757dfd9a02c25b975f80f31fa71a971a36e0b9759d9c9af5 SHA512 6095649ec72a254a49d3f450bced5d1f1ce881f8aa8682c756ee66b446bf24748a8ed70a4b2087a35fa133b965abe42ec7f96d0c8279b1f754469bf8ce277f71 WHIRLPOOL 46d2bb7c85192280e301d754fa63ead427e6decdbda6095ddb872d09453beeda5399b5ae70b16bcaa864398c3077f873cf9238b8952511a7472360d45c33f5f5
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVfGVWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
-MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5Q0oQAJbHTn0OGZee1QZZ6PVQoXVb
-BVSN1gb/scYNACt8l1jEp7wnPMr3AxOoYUF1+80hMNy+7RcWLPgFFHTEBvw9M6H2
-m53hWtQA7xnyfuic7bNu5uJ4jUXg3XtaDYoM0wXa9YzcCNkZi+utM/524HcDpFUN
-aDgOVywF3MnFzn/Ye2PL0r/gdM0oEN7kr27eWcNPGe05RyfhDq+Idb5P85hlpTQ7
-yLWAnZZLd9RigJan1HxffltANuws310qx6HzdZ9omojPr5p1PtmAIrpne2OsqVIO
-5q8OSItAUwPUkjhb3yXBJ72VcphdWUKq7s3XZZRXMueYMj8C9199LVqsOkT/G5aj
-CLsGLGQodC4+bEYAv8fxTVv6W0qK5ont+NhXeZ6i2aDrKrvLAy2OBiGfECT3PhYR
-3kEv1eCULh9dDYlu8LkFs6+gXSN2FjyL1vK+MQmuxyEJG5riBgyv42mHOqntvTsF
-2l/ZlnbL4ywRMQ9KA8TQj0i9tVS8r0432vGdEgmF3NMfNNAIseOfd7w8ZuL8YZLf
-hFdUvPnJ5Jaq8Fc5B0tXZo27yXwwqqerbb6Zb/63o5O6I3UWiJMzx+ndz68rp2Nl
-d84kqxgOsQZPitQxKyz5oVm6Vq/4EQuWtUvxmYOBiwILr0k4mkFLOxrNDBKA2SCM
-f9eK+zd/4PVl9hlGTUfv
-=YI2p
+iQIcBAEBCAAGBQJVgW0bAAoJEPiazRVxLXTFUVIQANQGjZe5eWFSH2unMZyvgcsD
+5vT/2ogelUAQeJqVvsKc7hXJp8EgQwbCS3FIjPldmTF7qDWe5mDuPhT/l57KhOVk
+tTtGYGTzpAlOkQfPNq/fSd6ncnl8qPYbxRFXcZJw67IZswl8fGMvSUkO6RTlwD8S
+3CddEZWSKjShkPm2m9bo0FcF05FWcO/iQ0+trgUGObbRliANGV7ojYczkQ4O7YGN
+525k9siYmHjOwQM451dfW6QsnBlx9fsdqWMvy40Po1Y8yXGA5hDK3+6J/YYLzRHX
+z66K922xgKLWpwsLn/M9XrOUNUGmJl2DtOnasaBlRb2pA2cOAaepxuxTFURhe/ec
+HlxjJm0x/OkYHZVeWDwOEfcHnB8UevLTUgyA8NMr7cv5Fej7L2ODpcF4L6WAJCVu
+D1qRzC0coT7LZcD4KEkapTGUAtLQWCNci0O7vziW1xbVCca5DKnRVF574wSpY0t/
+fpZy6qfj4HV8TVhl1+a3yVaoCpDWbHd/M0YpRl/17Gzh6i01eZL5BO2f1R4OuojY
+Uua3MrQyZWs2SUSzXqLZbdUROEbfKL57vC1cFsw55QMaMIx4CHlH1j/fFuEgiOGK
+KTZU07g0X8q9o6+3tpr1RqtCLWEvMaUbarWi1a+IHdqsmMEcmRMAdvzSazARsHDl
+bIRjPG6bueX6Bi3Cq3NL
+=IonA
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-2.4.2.ebuild b/dev-vcs/git/git-2.4.4.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.4.2.ebuild
rename to dev-vcs/git/git-2.4.4.ebuild
index 8fe6f24a66e3..11941fb3da27 100644
--- a/dev-vcs/git/git-2.4.2.ebuild
+++ b/dev-vcs/git/git-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.2.ebuild,v 1.2 2015/06/13 17:16:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.4.ebuild,v 1.1 2015/06/17 12:50:34 polynomial-c Exp $
 
 EAPI=5
 
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 999ae0e36b03..550426a1b16c 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1669 2015/06/16 21:40:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1673 2015/06/17 20:11:28 grknight Exp $
+
+  17 Jun 2015; <grknight@gentoo.org> depend.php.eclass:
+  Add require_php_cli to the list of deprecated functions to be removed
+
+  17 Jun 2015; <grknight@gentoo.org> php-common-r1.eclass,
+  php-ext-base-r1.eclass, php-ezc.eclass:
+  Mark 3 eclasses as deprecated for removal on 2015-07-17 wrt bug 551910
+
+  17 Jun 2015; <grknight@gentoo.org> depend.php.eclass
+  Deprecate unused functions in depend.php.eclass
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass:
+  Update from qt overlay: allow configuring debug/release on a per-package
+  basis; add instruction set support (similarly to qt4-build-multilib); use
+  usex().
+
+  17 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-2.eclass:
+  Remove eclass dependency on python[xml] and replace with some ugly grep that
+  should suffice. Closes #552332.
 
   16 Jun 2015; William Hubbs <williamh@gentoo.org> +golang-vcs.eclass:
   Add golang-vcs.eclass to retrieve go packages from vcs repositories
diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 6a1fbfb78b9d..fed53ce725c2 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.32 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.34 2015/06/17 20:11:28 grknight Exp $
 
 # @ECLASS: depend.php.eclass
 # @MAINTAINER:
@@ -24,6 +24,7 @@ inherit eutils multilib phpconfutils
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with cli SAPI.
 need_php5_cli() {
+	eqawarn "(need_php5_cli) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} =dev-lang/php-5*"
 	RDEPEND="${RDEPEND} =dev-lang/php-5*"
 	PHP_VERSION="5"
@@ -34,6 +35,7 @@ need_php5_cli() {
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with either cgi or apache2 SAPI.
 need_php5_httpd() {
+	eqawarn "(need_php5_httpd) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} =virtual/httpd-php-5*"
 	RDEPEND="${RDEPEND} =virtual/httpd-php-5*"
 	PHP_VERSION="5"
@@ -75,6 +77,7 @@ uses_php5() {
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
 # (any version) with cli SAPI.
 need_php_cli() {
+	eqawarn "(need_php_cli) Deprecated function call.  Set to be removed on 2015-07-17"
 	DEPEND="${DEPEND} dev-lang/php"
 	RDEPEND="${RDEPEND} dev-lang/php"
 }
@@ -104,6 +107,7 @@ need_php() {
 # determined by ${CATEGORY} - any PHP version or PHP5 for dev-php or
 # dev-php5, respectively.
 need_php_by_category() {
+	eqawarn "(need_php_by_category) Deprecated function call.  Set to be removed on 2015-07-17"
 	case "${CATEGORY}" in
 		dev-php) need_php ;;
 		*) die "Version of PHP required by packages in category ${CATEGORY} unknown"
@@ -145,6 +149,7 @@ has_php() {
 # and need_php[45]_httpd functions cannot guarantee these requirements.
 # See Bug 2272 for details.
 require_php_sapi_from() {
+	eqawarn "(require_php_sapi_from) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local has_sapi="0"
@@ -248,6 +253,7 @@ require_php_with_use() {
 # any of specified USE flags. Returns if any of the listed USE flags are enabled.
 # Dies if all of the listed USE flags are disabled.
 require_php_with_any_use() {
+	eqawarn "(require_php_with_any_use) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local missing_use=""
@@ -296,6 +302,7 @@ require_php_with_any_use() {
 # Check if our PHP was compiled with ZTS (Zend Thread Safety) enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_zts() {
+	eqawarn "(has_zts) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} apache2 threads || phpconfutils_built_with_use =${PHP_PKG} apache2 threads ; then
@@ -310,6 +317,7 @@ has_zts() {
 # Check if our PHP was built with debug support enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_debug() {
+	eqawarn "(has_debug) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} debug || phpconfutils_built_with_use =${PHP_PKG} debug ; then
@@ -324,6 +332,7 @@ has_debug() {
 # Check if our PHP was built with the concurrentmodphp support enabled.
 # @RETURN: 0 if true, 1 otherwise
 has_concurrentmodphp() {
+	eqawarn "(has_concurrentmodphp) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	if built_with_use =${PHP_PKG} apache2 concurrentmodphp || phpconfutils_built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
@@ -347,6 +356,7 @@ has_concurrentmodphp() {
 # You should use require_php_with_use pdo instead now.
 # @RETURN: die if feature is missing
 require_pdo() {
+	eqawarn "(require_pdo) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Was PHP5 compiled with internal PDO support?
@@ -370,6 +380,7 @@ require_pdo() {
 # depending on the CLI SAPI.
 # @RETURN: die if feature is missing
 require_php_cli() {
+	eqawarn "(require_php_cli) Deprecated function call.  Set to be removed on 2015-07-17"
 	# If PHP_PKG is set, then we have remembered our PHP settings
 	# from last time
 	if [[ -n ${PHP_PKG} ]] ; then
@@ -439,6 +450,7 @@ require_php_cgi() {
 # Require a PHP built with SQLite support
 # @RETURN: die if feature is missing
 require_sqlite() {
+	eqawarn "(require_sqlite) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Has our PHP been built with SQLite support?
@@ -461,6 +473,7 @@ require_sqlite() {
 # Require a PHP built with GD support
 # @RETURN: die if feature is missing
 require_gd() {
+	eqawarn "(require_gd) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	# Do we have the internal GD support installed?
@@ -494,6 +507,7 @@ require_gd() {
 # @DESCRIPTION:
 # Executes some checks needed when installing a binary PHP extension.
 php_binary_extension() {
+	eqawarn "(php_binary_extension) Deprecated function call.  Set to be removed on 2015-07-17"
 	has_php
 
 	local PUSE_ENABLED=""
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 366ef6c005c2..420335527c73 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -5,7 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.40 2015/04/28 20:35:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.41 2015/06/17 09:48:12 chewi Exp $
 
 # @ECLASS: java-pkg-2.eclass
 # @MAINTAINER:
@@ -96,25 +96,6 @@ java-pkg-2_src_compile() {
 	fi
 }
 
-
-# @FUNCTION: java-pkg-2_supports-test
-# @INTERNAL
-# @DESCRIPTION:
-# test whether a build.xml has a test target.
-
-java-pkg-2_supports-test() {
-	python << EOF
-from xml.dom.minidom import parse
-import sys
-dom = parse("${1}")
-for elem in dom.getElementsByTagName('target'):
-	if elem.getAttribute('name') == 'test':
-			sys.exit(0)
-sys.exit(1)
-EOF
-	return $?
-}
-
 # @FUNCTION: java-pkg-2_src_test
 # @DESCRIPTION:
 # src_test, not exported.
@@ -122,7 +103,7 @@ EOF
 java-pkg-2_src_test() {
 	[[ -e "${EANT_BUILD_XML:=build.xml}" ]] || return
 
-	if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test ${EANT_BUILD_XML}; then
+	if [[ ${EANT_TEST_TARGET} ]] || < "${EANT_BUILD_XML}" tr -d "\n" | grep -Eq "<target\b[^>]*\bname=[\"']test[\"']"; then
 		local opts task_re junit_re pkg
 
 		if [[ ${EANT_TEST_JUNIT_INTO} ]]; then
diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass
index c26cbdc5c14d..f8781ecbfb70 100644
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-r1.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.19 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.20 2015/06/17 19:23:34 grknight Exp $
 
 # Based on robbat2's work on the php4 sapi eclass
 # Based on stuart's work on the php5 sapi eclass
@@ -13,7 +13,8 @@
 # This eclass provides common functions which are shared between the PHP4 and PHP5 packages.
 # It is only used by php*-sapi eclasses currently and the functions are not intended
 # for direct use in ebuilds.
-
+# This eclass is no longer in use and scheduled to be removed on 2015-07-17
+# @DEAD
 
 # ========================================================================
 # CFLAG SANITY
diff --git a/eclass/php-ext-base-r1.eclass b/eclass/php-ext-base-r1.eclass
index 23559ba8e625..9e111c7b543a 100644
--- a/eclass/php-ext-base-r1.eclass
+++ b/eclass/php-ext-base-r1.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.17 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.18 2015/06/17 19:23:34 grknight Exp $
 
 # @ECLASS: php-ext-base-r1.eclass
 # @MAINTAINER:
@@ -17,6 +17,8 @@
 #
 # Combined with php-ext-source-r1, we have a standardised solution for supporting
 # PHP extensions.
+# This eclass is no longer in use and scheduled to be removed on 2015-07-17
+# @DEAD
 
 # Block ebuilds with minor version slotting. Quite temporary fix
 DEPEND="!=dev-lang/php-5.3.3-r2
diff --git a/eclass/php-ezc.eclass b/eclass/php-ezc.eclass
index 3087059d38c1..04c06c1f5ef0 100644
--- a/eclass/php-ezc.eclass
+++ b/eclass/php-ezc.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ezc.eclass,v 1.7 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ezc.eclass,v 1.8 2015/06/17 19:23:34 grknight Exp $
 
 # @ECLASS: php-ezc.eclass
 # @MAINTAINER:
@@ -9,6 +9,8 @@
 # @DESCRIPTION:
 # This eclass provides means for an easy installation of the eZ components.
 # For more information on eZcomponents see http://ez.no/products/ez_components
+# This eclass is no longer in use and scheduled to be removed on 2015-07-17
+# @DEAD
 
 inherit php-pear-r1
 
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bc7bb2f50090..73a409c491b6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.19 2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.20 2015/06/17 15:48:58 pesa Exp $
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
@@ -39,19 +39,19 @@ case ${PV} in
 		EGIT_BRANCH="dev"
 		;;
 	5.?.9999)
-		# git stable branches (5.x)
+		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	*_alpha*|*_beta*|*_rc*)
-		# development releases
+		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
-		# official stable releases
+		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
 		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
@@ -77,9 +77,9 @@ DEPEND="
 "
 if [[ ${PN} != qttest ]]; then
 	if [[ ${QT5_MODULE} == qtbase ]]; then
-		DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )"
+		DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 	else
-		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
+		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5 )"
 	fi
 fi
 RDEPEND="
@@ -321,18 +321,17 @@ qt5-build_pkg_postrm() {
 ######  Public helpers  ######
 
 # @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableopt]
+# @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
 # <flag> is the name of a flag in IUSE.
 #
-# Echoes "-${enableopt}-${feature}" if <flag> is enabled, or "-no-${feature}"
-# if it is disabled. If [feature] is not specified, it defaults to the value
-# of <flag>. If [enableopt] is not specified, the whole "-${enableopt}" prefix
-# is omitted.
+# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
+# otherwise. If [feature] is not specified, <flag> is used in its place.
+# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
 qt_use() {
 	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
 
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
 }
 
 # @FUNCTION: qt_use_compile_test
@@ -490,8 +489,9 @@ qt5_base_configure() {
 		-examplesdir "${QT5_EXAMPLESDIR}"
 		-testsdir "${QT5_TESTSDIR}"
 
-		# debug/release
-		$(use debug && echo -debug || echo -release)
+		# configure in release mode by default,
+		# override via the CONFIG qmake variable
+		-release
 		-no-separate-debug-info
 
 		# licensing stuff
@@ -517,6 +517,17 @@ qt5_base_configure() {
 		# obsolete flag, does nothing
 		#-qml-debug
 
+		# instruction set support
+		$(is-flagq -mno-sse2    && echo -no-sse2)
+		$(is-flagq -mno-sse3    && echo -no-sse3)
+		$(is-flagq -mno-ssse3   && echo -no-ssse3)
+		$(is-flagq -mno-sse4.1  && echo -no-sse4.1)
+		$(is-flagq -mno-sse4.2  && echo -no-sse4.2)
+		$(is-flagq -mno-avx     && echo -no-avx)
+		$(is-flagq -mno-avx2    && echo -no-avx2)
+		$(is-flagq -mno-dsp     && echo -no-mips_dsp)
+		$(is-flagq -mno-dspr2   && echo -no-mips_dspr2)
+
 		# use pkg-config to detect include and library paths
 		-pkg-config
 
@@ -552,7 +563,7 @@ qt5_base_configure() {
 		-no-compile-examples
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(use prefix || echo -no-rpath)
+		$(usex prefix '' -no-rpath)
 
 		# print verbose information about each configure test
 		-verbose
@@ -639,6 +650,8 @@ qt5_qmake() {
 	fi
 
 	"${qmakepath}"/qmake \
+		CONFIG+=$(usex debug debug release) \
+		CONFIG-=$(usex debug release debug) \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_LINK_C="$(tc-getCC)" \
diff --git a/kde-apps/gwenview/ChangeLog b/kde-apps/gwenview/ChangeLog
index bb23abd4ee07..d9753761d4b9 100644
--- a/kde-apps/gwenview/ChangeLog
+++ b/kde-apps/gwenview/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for kde-base/gwenview
+# ChangeLog for kde-apps/gwenview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/gwenview/ChangeLog,v 1.1 2015/06/04 18:44:46 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/gwenview/ChangeLog,v 1.2 2015/06/17 13:02:59 mrueg Exp $
+
+  17 Jun 2015; Manuel Rüger <mrueg@gentoo.org> gwenview-4.14.3.ebuild:
+  kde-base/svgpart was moved to kde-apps.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -gwenview-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 9595ac207377..2ec1eb6bfc40 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,25 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST gwenview-4.14.3.tar.xz 2910652 SHA256 2032d18bc20ea490f3d1298e015ffac2a7b96eb7a76c02578df0713c1ab427a0 SHA512 cb64b2278adb01f0fad92d861126ff8256c80ae8780de0a37bcc1e6a0e19e2f5b14c09fc884c6d759a0cd6b3a2611787235020745147c9fc66883d61ab4861c3 WHIRLPOOL 6e786942bfb45965af7f765961822b7d2d0929facede5e197a36d67b82aaa3a036261288738fedec33e65ad117a4f14009f59eddb3f89d07ea9584f72fce103f
-EBUILD gwenview-4.14.3.ebuild 1624 SHA256 c189e867075a65c985606acdb4e519cb5e0fa3e026c716a6e1d1f202ef123e87 SHA512 037ed8372a8072985f5ad034278dcb54785052fa50da7ec2749b2d4f30c19854b1a95adb506c87f11b31b766acee3e693091b5c9ae7463210e499708beb32444 WHIRLPOOL 9c0135dba3699b885becfab0039bb8032cedd3e14fe1c3efc695c68625d0efec3ee8a31fa4d063033478e77d35d952192a8d49ff27e5a840e9ffaeea310b07a9
-MISC ChangeLog 30867 SHA256 cb14867b5621fd18342d48848f6fc239fead179b7c63b486aa9c35813f62b50c SHA512 84d89b5d396da56f56dfeea43ee5f2aca43a6f4e77f189bdea0fd2257f3a2e6ebbfdc19155bf19622db2389f63271daa1017dcc969d6b1d84708fcf42cf8397f WHIRLPOOL 8c5cbb01d690b1fd84fb31fbae865fd53895349cf24cd10e64a90d47cd97887e728d4c0d0021f9626b89b3ec7b434e4a060c732c54ddcc9c067ecf8c4f33dceb
+EBUILD gwenview-4.14.3.ebuild 1619 SHA256 8cbba4e1daba84f9ccccf2d50ba036f4b6d97d9f1017ce5d913cd77f4696e963 SHA512 73d34cf82c11df0d6b0f54efc021a9a1d731780e4f1094f87bc3a6b4ae9afca8ede096c5f7b280ff7e95cbfbdcd629302ddb6fabf82f63f0c7ef62484ec5c239 WHIRLPOOL 863e5f6cbc3a5cba568b59cce395e517e6321b0b7575b9bf7fdaeb46c8ad2ba7565b1ce2a9967cb05cbffb1daa4f670fd71845a13f784639b2e2e92e86c1efa3
+MISC ChangeLog 30977 SHA256 1bedc65eaeee53db3e7f687666981fa5c2f0d0a34a5d7492eb864211e357bdd4 SHA512 b4c888721454eb6257bfdf74e8480d6ef7413159d55352bf6e567fad0dd23e6ff7ce6aef7973ac2e5a1f921667a7ddd64da4ee447be2bd6558389957a9e9cadc WHIRLPOOL 88591e385b9eefe92cf8eb191718f19a54041623f77b7c0068dd5ba344f4e01c0bea92b42b697d0e812c0bf22d1777dc6bb4ffeb913fa6adc28185e51e3cd90e
 MISC metadata.xml 243 SHA256 12222337bd98b25a862628c05dd31255ce1bcf6a6c5d2e73d8a67934b9cb75a7 SHA512 d5739acc63ac7ab01e3f339d7905984407c97f212b7504f278bfeb464399337c965b871a2c456405d9bc003f0a062d8e1e5446e1ef745c2a284eda1d1aec28ab WHIRLPOOL e48d246ea2063b9e81c166fd0dfa4428bd58e2b2ee9f4a02ca84ae4979942d47fb9516cc1c1f7f75a1ab8622335bea963e9f88464f0174682346650220c64144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJVcJ0BRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FCKD/46DikhwaCiEZnd+nqgVpyKZIIhfUMGP19RUcE+9O2Y1Wq7X0FKYSAWpZxG
-WIlgBafLsGRoYJdSjSp4XS9gd+IiFRJMPeiYZnhRFTyVtFpqACxU1Q1KKdmCq61p
-K+PD8q6bZXyUbSxgWiqgGJlHWM1qsIcHZLJFXous9x7mHRHGMeLX6HKTwdxVgt0X
-9Uv0AewXXUwIUJUOEwM4Dn/C9yYpXi+vr4rWsm2LTKhpyLVXAOCK1EAqYmL2shO8
-TvzGiCYQJ3fJf5F5cDZYT+Ack1lLmf1c0bKRmch7OnJ+DWJeX3yhaxvaPdguzTtz
-bepHmbW1rMd+xXJEYl94b26qaWMp5bOBCqNZuANwdahE9/VYc5V9vXnKusZwjGg4
-PMNHQ92I84X9w8OfbJg11qqMKlo+mREg3eTOP+duqjZz4tY+HG6ECrFPKFETFqBf
-wf9d/mKh6JNF56SaCPousH6jwqR504w5nPVsPwmVxcNB5oO5TcpkjtSZSGEvlxSB
-483M7n+zd3SymMc/GDHReKKBoD2tddEBSNFtB9GD2utWPW7dM+CVluqz2Ttd03dn
-CKddX3WUnKqSkgs8Pcb4s9GuTF/MGYIoxL4BYMLRDASDz1bANGlq2uK+mlE8KxvW
-pOQ4HSHrbhupvcyD0rCGvi9DpokgOY4AJAKmRiPPFmuc/x4IbA==
-=o0TS
------END PGP SIGNATURE-----
diff --git a/kde-apps/gwenview/gwenview-4.14.3.ebuild b/kde-apps/gwenview/gwenview-4.14.3.ebuild
index f020706b992b..6c04709b1f99 100644
--- a/kde-apps/gwenview/gwenview-4.14.3.ebuild
+++ b/kde-apps/gwenview/gwenview-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/gwenview/gwenview-4.14.3.ebuild,v 1.1 2015/06/04 18:44:46 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/gwenview/gwenview-4.14.3.ebuild,v 1.2 2015/06/17 13:02:59 mrueg Exp $
 
 EAPI=5
 
@@ -54,8 +54,8 @@ src_configure() {
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! has_version kde-base/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-base/svgpart:${SLOT}"
+	if ! has_version kde-apps/svgpart:${SLOT} ; then
+		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
 	fi
 
 	if use kipi && ! has_version media-plugins/kipi-plugins ; then
diff --git a/kde-apps/kolourpaint/ChangeLog b/kde-apps/kolourpaint/ChangeLog
index d16957cdec31..84310c4917b7 100644
--- a/kde-apps/kolourpaint/ChangeLog
+++ b/kde-apps/kolourpaint/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for kde-base/kolourpaint
+# ChangeLog for kde-apps/kolourpaint
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/kolourpaint/ChangeLog,v 1.1 2015/06/04 18:44:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kolourpaint/ChangeLog,v 1.2 2015/06/17 13:04:24 mrueg Exp $
+
+  17 Jun 2015; Manuel Rüger <mrueg@gentoo.org> kolourpaint-4.14.3.ebuild:
+  kde-base/ksaneplugin was moved to kde-apps.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kolourpaint-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 5d00a7104292..f20fa0a8461d 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,25 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kolourpaint-4.14.3.tar.xz 1164576 SHA256 b0141d7447d6c9a52f8f65a098c6487501d9f5bcd092d5216115a0c6bae4c64d SHA512 3deead0511e70a11b749e1fe8e5756fec4a50ca60a660b300c177ece4b0b42b936940d806468f1f2ce2403c9290219e7882ff0a09ed925d7a1f350877a78ead2 WHIRLPOOL 0efa988bfc40111c79ed9d148002d7a2803b88556ceffebff8219891d124dff64a5ec731912feaac171838bdcfa5faadbe887d85bef6bebee486e25599b10fa9
-EBUILD kolourpaint-4.14.3.ebuild 715 SHA256 235b3cc200fbdae72b8a020758598e99a9a06a9a92220e06c8c7860f1d013151 SHA512 b44062148293b5bbe9bd5210601c49ae3d73a5327954be372aff7db7a500a5e77ac01ad33819bcf223ca0eecce1dbd3d186273243afb94ffc38a40a3b75467d1 WHIRLPOOL 42b1af6e0db08dbba5d285172ba3a91c76d4ee631e945c800b66d08a7900a95629088a5e4934662b82d61b8f6def60d30f014421bd82bf359325413696e52108
-MISC ChangeLog 40342 SHA256 c3bc889bf8f7c7472c863fd54d7a70c4bb49341413d1c98136f7109c1e736f2f SHA512 ae88a7cc0056d2e5fec8ad7062e0b3cb32a5bee48abcaacd45560521d4eb22b1490b744256dc201052e54395339d9ee18344157622e1097c54ba0ebb67c7f460 WHIRLPOOL caa72f33dc7bcd13f4a7089e4c5201e0469f9034d5864a54159e2b8711e17535b1471c2181a9ae58e4dda4b6ae0b49d7a5ebb97532d4f2f13d95309307ee9bae
+EBUILD kolourpaint-4.14.3.ebuild 710 SHA256 deff81e376a4aef81481861f3412c19fe358b4ef27935151e1c0bffd8b0fd578 SHA512 ce5bfad9d1ab211803809bea47b22f4cdcb7585dfef87b5b04c712a3b65cb9a3f3d35fbb4b96cb1dc8f1cd15b7c85a94e6a27f57c4a8fdac19de0ecb498fce4d WHIRLPOOL 6c8dfea187d0acd34f583ff7cb31ca60e03d109135ee35f2b8580b30f116108e060eb5fecd3807f1639c22869e24db91461c78bff1f58d162243e68dbd744ce0
+MISC ChangeLog 40459 SHA256 2710c509c5463f55706f9dbca2c3c986beff4b567416e0462f2ccf14ffc9eee8 SHA512 f5b7ef95fc85bd378a3bcf6391546bb77a9118916acf270079b4fd970401a94a1ab9f99a2b480d007d472f5e291b2d38e043d5624846b78d4f7e85477b557861 WHIRLPOOL f19aae86b544ad20a40edc91ec2099d35326b2dde23910a6c96ef880958343b0dbc7a875aaf2111a06dc1d2cdc5120fa970448d81ac066270a971540546610cc
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJVcJ0RRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7HhTD/9YExDwEnsvB2dDas5h59wUW6Qsq8LLE/bNB0iYPGo+Pn6UDYKUVuBHT8Nd
-ZBvNrAiWSGssAcLb8XRxOHFf8yT0WHsizxzi5482a+Ykbe31/WQwWLErFWhAgPMY
-ZvtXDE+TF93Y+tHu/D8GU/OAwBsEVj/9iVtDRB6MmXdHD23nP0u9pfg/8zc0KmOR
-DWAgr8k8lAPg9r3503z/63qSxbO/2Yu1GRwUAeJlqWg8i8ShTjpp4NXkL5c9oNhl
-PeAas7GTcnR+bmKzcjmXNYXaxpMr2f7DtL3FJXnnLGa3gC7DcgMGOYR5YiZfrjB+
-GXfhzaSJSUCCSy6JpMaycvz4BX3++gVUZKrTVt2JTY1wAIjpB3IfyqzbDwCgGcwh
-VE7OG3gaL6ad5m+1p/oUZOGVq5Ps9kpVL1Ph4Nx/kWB1gtyfzWC4Sg7zk3tnaVfu
-yeciGhMNmLFw+ERcdhCOeaHfGEZtJmVaCHZ00Bk/bf1AhWsVPtsJ/YACHf1DYmtX
-KCStMhjmLEKvDn6pMM9p0W0T3DRefZWCtrebCdvrCaqE/SzcKYMAgdaVQFoPrKLd
-e+f7iC0dRqp5xd+BVAEoWQbjY5uUzxDOWQqc3mGQQo5lA3382Dp+E1jRCnrKseWt
-LM8l4fqlJgRe+nBVSTUPm32HK7W2SMYnqfVEDlg/xRDIcf+Caw==
-=9G8W
------END PGP SIGNATURE-----
diff --git a/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild b/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild
index 7407787c2f4b..46854c0afd8e 100644
--- a/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild,v 1.1 2015/06/04 18:44:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild,v 1.2 2015/06/17 13:04:24 mrueg Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 pkg_postinst() {
 	kde4-base_pkg_postinst
 
-	if ! has_version kde-base/ksaneplugin:${SLOT} ; then
-		elog "To enable scanner support, please install kde-base/ksaneplugin:${SLOT}"
+	if ! has_version kde-apps/ksaneplugin:${SLOT} ; then
+		elog "To enable scanner support, please install kde-apps/ksaneplugin:${SLOT}"
 	fi
 }
diff --git a/kde-apps/konqueror/ChangeLog b/kde-apps/konqueror/ChangeLog
index 1b3f908ca13f..756e078185e6 100644
--- a/kde-apps/konqueror/ChangeLog
+++ b/kde-apps/konqueror/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for kde-base/konqueror
+# ChangeLog for kde-apps/konqueror
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/konqueror/ChangeLog,v 1.1 2015/06/04 18:44:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/konqueror/ChangeLog,v 1.3 2015/06/17 12:58:09 mrueg Exp $
+
+  17 Jun 2015; Manuel Rüger <mrueg@gentoo.org> konqueror-4.14.3.ebuild:
+  kde-base/dolphin has moved to kde-apps. Fix bug #552378.
+
+  17 Jun 2015; Manuel Rüger <mrueg@gentoo.org> konqueror-4.14.3.ebuild:
+  kde-base/dolphin has moved to kde-apps. Fix bug #552378.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -konqueror-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index c00b94b0caaf..b9c443223081 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,25 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a
-EBUILD konqueror-4.14.3.ebuild 1456 SHA256 520f669a88086a8154838a70645c7f3ce0e5b91b236fd8be202e03c91bf67fdf SHA512 0a451eca5c3ccbe9bbe693740cc70b5f28af97a3a2d7eb6a837de136a9b39d1c58805a76f2622fc455a9809a40a5d207788061ec01b14ac2110d95bd1716ac60 WHIRLPOOL cfcb2c6cf19df8b3c47499753c7a113ffb9e3819e6bd05888c64a023ed6751f7a73b7bf0346459bcff66d1cc7c993d69084a0e3dfb6d2a6552e66098f25e2ec4
-MISC ChangeLog 46605 SHA256 4e59020034beadd93253f85e530fb0237715741d2e0a21bf2ef107088d7fd025 SHA512 59a4d87fc6bb0dcfa4f058a490b867186541aae0b844ae6740ff2d5d89125043f2a66cde4c7c5f3c6be2c36dee4f912192afe77bcb4b07624290a6190c3dd286 WHIRLPOOL aea84ab8821f6d807e38a23f289b5ba9b1b3d10a69f823642b3411ce3805abf37a7c828e90809e8c97f81b173dc162b96f61e3fcb12568313511ccca4039e1df
+EBUILD konqueror-4.14.3.ebuild 1451 SHA256 97e55bf003a0b9ff25aaf59b56b8034386d434c960ebbc59403089b02703edf7 SHA512 22d30f7785dcede5015309f9981198d7a039322490eb570e911c66a08438bb13c9d79cf363126a8c1e92e9a786f8d04dc6a2b4125d6d118100f11274fcf2eb43 WHIRLPOOL 8f1c331a8bc1a076345e46e956a733c70328a8d505b11530fad4a74e13dccdf7ce0ea837ff761f61602f2c0b603ed5c82a25e87929948e717688f3d1d9cfed86
+MISC ChangeLog 46866 SHA256 cd2126030e0e275fe0edbff4c49fabcb285c42547f20a6b807b5dcd296f3c3e7 SHA512 1cd6f017b9d5286eb6aa7ba633e7a23c701471393ecdab76e8b9598846f619b4da82d286d605785681992667e64d3352a4583cfdcda2acc8bab964d0a8cbb4ae WHIRLPOOL 2e30236d9c7b0c3ff42dc8a840cd6128153bd446a7f7bf67e22daaacb10104cd722afc8296d459d52688ec6c160a49537cfbd478c00afb3864138080eafe08ca
 MISC metadata.xml 240 SHA256 3940acd26451de238b92c9602337472a3343be5d392bf7c3e72abddbf8b7ecd5 SHA512 d026b15c9e065629d39d0d595856f6ab43bc6c6d1957ae3d76431026e83cb956acb09ff40b57e40474e839f6cf005bdcc331e0adf40b733a6aa6bec17a14148b WHIRLPOOL ff98af2213775171dee0634ff26b026a798b5900d44bc90e40b1a9c9990dcfb8bd979bc7195ab185269bccf4550abee8daeeb3de2f6bfb41ed2ca0355e9b6507
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJVcJ0SRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FXpEACevzYpAh+p2eSgiyG4zzBGfuatjgMkRBNF6yZRD4JekfG0W0F+qixpZcyy
-jvBGemOkq+GOiD5ZUHNDB+LkEManjrUmFGmEXAnsRNlBQ0aGyIWnEuHWnszU51c6
-LThedl8aGMC11REyqMGVYo7hmml6M/krsxhhsoUNN8st5Kj21cGJ6MryglWSAbm6
-5JoVs2qVGqpZjXS2c25jZ935ziFZZSsUXkqPeWsnqrzn4xxWLlbhM5TZnCPjkpbg
-iHAvzZnWv7bvRAgFoHk8z06HHpBheMLq3SLOZkqjPckcQmQhfazAif2jmmMYy2C+
-ha/JWdnmxjwUzYG/3qM/svUC5TLiFR8JZlmM2e4hcjd4Ppr6jdzC+zK30jndEMKK
-l/SVMV4F2tOidsuIWTQJ8kg1S3mlaEcF2avR6YjQA9bvDtMsTkC7wX8G1HJTU5+U
-j5Xqq2VJ774DzOh1d1M6XQDxsdD+4FW7ADZsAvAjN55ZzdU/tCUoQvY1f5cBD8WF
-Zg1XP1T628ciaLORCX8zsZwWmVTVOdyN2B/eg7yvWm2ozK9gmkVbJk/kJoQUeV1O
-xgptaC5f1UxtK30bSl2ckeysTSX2vUb4BQZuhW6BlVU18lbutU69b5Cku1IL+88l
-cmF4v+Sr2F1/dnH6L3Ib9Ycy+RNQSGcgk2cP397WRMpAOo7hdg==
-=tCO1
------END PGP SIGNATURE-----
diff --git a/kde-apps/konqueror/konqueror-4.14.3.ebuild b/kde-apps/konqueror/konqueror-4.14.3.ebuild
index 7ca8ababdb8d..ce1aeb93dfe0 100644
--- a/kde-apps/konqueror/konqueror-4.14.3.ebuild
+++ b/kde-apps/konqueror/konqueror-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/konqueror/konqueror-4.14.3.ebuild,v 1.1 2015/06/04 18:44:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/konqueror/konqueror-4.14.3.ebuild,v 1.3 2015/06/17 12:58:09 mrueg Exp $
 
 EAPI=5
 
@@ -47,9 +47,9 @@ src_prepare() {
 pkg_postinst() {
 	kde4-meta_pkg_postinst
 
-	if ! has_version kde-base/dolphin:${SLOT} ; then
+	if ! has_version kde-apps/dolphin:${SLOT} ; then
 		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-		elog "kde-base/dolphin:${SLOT}"
+		elog "kde-apps/dolphin:${SLOT}"
 	fi
 
 	if ! has_version virtual/jre ; then
diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 67fc6fa0c820..6b31d4b366ac 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.593 2015/06/11 14:30:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.594 2015/06/17 19:35:51 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> postfix-3.0.1-r1.ebuild:
+  ia64 stable wrt bug #551084
 
   11 Jun 2015; Agostino Sarubbo <ago@gentoo.org> postfix-3.0.1-r1.ebuild:
   Stable for ppc, wrt bug #551084
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 9c58536145e2..dd8296b37c2a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -20,25 +20,17 @@ EBUILD postfix-2.11.3.ebuild 9787 SHA256 e77b8742bf2abbc331d1b2e1e34071a0b4c1b67
 EBUILD postfix-2.11.4.ebuild 9795 SHA256 163629654e4aca99b4118b6b3ec046d1d56e7b807fefcd3974477c7ac1eec5f0 SHA512 8b57ce3759092e17d078697d86b0b7afce1557fa484f4dffc7ac437fda0e68715b5c0d24f68d62555ecedde3c538c07b48f67b14cbaf51b2216068e3479e6077 WHIRLPOOL 500b0422ee1bb3029b5f5cf6e396918d9133d1097acb538017747e06e2947e30e90fd07ae2a37531a1471abbbd21c4028440e6858d9d8fed2e3c0ab5cd121ac7
 EBUILD postfix-2.11.5.ebuild 9795 SHA256 0a889b186b67bdea46395bc062160876d68da1acf38a593bbff776bf38723cbb SHA512 b764a6052ceee68fa8a2e41bb471d2452c80d24a5e69a964844668097e7327ba40882095243db9267acf49469cda35dd6b8737249d6d8a991e9614d2393e65a9 WHIRLPOOL 63face778a830a182c93c276173988bd6023b70f034f7c099d1f93dfbf9c3bab20ee19adb44ca19a8546f4fedbeb43cc4009f4c92c125fb792d07813ea19c7a7
 EBUILD postfix-3.0.0.ebuild 8979 SHA256 9ffed33d62ad84c9dd9f338acdc672c4dc663d929c13596953c8cc07690f7279 SHA512 80c4c442d657a21a07abc41dd695d1192bafa59fa4ddec5c558698eb0c70a5826966e019773d23e91faba38273e9d5308f4a52070e186cbe46a12c443a6da49f WHIRLPOOL 91a22255f88142dd3f228b5bb467c0d3a45bf7962220479cb9fb9090048f84bb1fed2aeadfd0b3c3fa36fee5262c389eaf030b5bd7f2945c30563233b70f77d6
-EBUILD postfix-3.0.1-r1.ebuild 8986 SHA256 e36343e2a18f73f91ba143655a09b5b6105c3d4825f27ea44e000cc125ad14f5 SHA512 b7c02f9c2894b6fd2cd500b962959c34f58bba6cc77e01b0b10e19e247b1730dfd004529ba809dda94c1a475fc86790c756d530caac0ce6be11bba15cc5acd26 WHIRLPOOL 1f4a586bd65e29bf6f8d899cc0eadfc007ba2acffddd44ba65dad4713f66eb30905a42ba3a03fecf80a45e1e7a458ed8a2d0eb3c76ae21cc798c4f4e7d719c88
+EBUILD postfix-3.0.1-r1.ebuild 8989 SHA256 785e6f63bc5de9c063216c893ef100ea4ca58d5af8161dc0ad7d5cce8869dd96 SHA512 70714898eed0d883f9555c32c94b7b2de521cdca8314c8d5ce32925f7afbd9ae9718349c6e146012850daaf31299cafbbed818f91df4191bc79f7f448f2fa826 WHIRLPOOL 8b4b569e4a9efe384442f3ec0c1b9e2afab84606fcd5a8b183845fe7e3ce333181ae9dee1bdffc433e32b7e82a58e1c581dea6341bca1a12992f0583c8d0c173
 EBUILD postfix-3.1_pre20150523.ebuild 8954 SHA256 456d353dea6cf3b974397057bb55a62209bdec69abd93a9c4ace7a7d7683199c SHA512 720c4deda0b373c1d0066dd96d4b2ec93267b1d1a027132909dc190c571a71c9d9d8cb3575203438123b2f6b66719606597c41b37f0356b407eb9a527bf910d6 WHIRLPOOL ec9ee6591f1fcc9b388d639ea88ad54f3bc6387e1699e5c7989d268e0249b48175f5fde4b29e51646c30ffeb5cbdd91bc944fde3fd0a486772077cdb86122773
-MISC ChangeLog 16781 SHA256 bcc03b2b415228138fc2acbab9f40dcafde3af7eb2ffe01bbcb1413ecb1891ff SHA512 30f53bc719c6e3145b160403e0b26f1c5a269350f8fb8a93a1b0adfc27eb79545f913b202911bc19a75e6f11ce2bf152d41ee06592242dda4ba981a3644476fe WHIRLPOOL 709bf883524124b780b1c335708c53936fcbfea99b970df2b3152b3138d66aa7aecb282836d6c7a9e3cc18f217562ddff400ac6378e86eba1bc129d3b290a714
+MISC ChangeLog 16891 SHA256 0eee93ce914e5073d73da74ac299b6419601d03619a795dbca1c1d13fcec2e9a SHA512 b7a420a6add76bcaa535075bba239b646a5c73a23cd159226e2d3917b5c04b6ce8a7451b7e3f9848c55af131773951dbf841d3e0ba2c18cc04577d528660c463 WHIRLPOOL 3abf096533eb2d3622ecd7b3ae7b8d8c40e96f0b24837e2adb81125fc8ecd200f5687773b268bde1e9d4aa50a762d04bbf6a86c8dac62ca5d7aa060808a56194
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC metadata.xml 754 SHA256 52b30e7748a792a156ad44b46878b67cb1a359c882e03f76b1d7b3b0bf111129 SHA512 bef165b527524efdcabce97c2fc0735f784dfc014ae810294e6a19b534edc6a01e14e532d730c8b8c2b76c99dafac672074317ec6dc23942285ad27895fd7220 WHIRLPOOL 702d14bd15db16217c664a39534bd1b19774d5f6c5a4a2a43e6595f400c06332c56849fd0d722c7982f5c40398b4bb0b3398b96c6f370a57d99d323d0e84ab51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVeZttAAoJELp701BxlEWfUvQQAJypnjqQhi6uCi026uwMpvCM
-nLR+uMfbZT/g+ZlgTZDll1BnGZOoYACdIFoRiI2ATirb0rDWn2YucS9Pu3Zs+Eet
-JGWg5WZZa17ipBoA4BCMM8XNfbG+aUAgq5tkcJjydP2IYVnb9gTNJaZU7adlYDCV
-e4+0pUwMS5AP1jYo81Ozgh9cReM1IuTRIYp5y1kWComYMxi7n1fN7L81yppDmj5J
-Qmv/dp8fi7kQnJ+lBdZmvc6zOsFUYWb9nGSk9M/88it9IZmGXp+tUrH+ajRBa4+G
-z2Z2ev4c3W0wk4LPppzucnqKIg2H/7XyS0VWCm6UOwH9wefvNiXguhMLwypTlPDG
-Qg42jAC15mXJ6d8f/MzoTtBEAihT+ULkHziMP+knWT6rsySmsK34BGTkPf1m2y/G
-SOVExeBTi2FhND4B32EJThTrAIEDVfCl1jSQMXguSrgT5VMwWqs//7UMvzFUFmlf
-yZmMUZXd7z1zbnLj24DFGdI5JToQTudSmpvtbjbGTr0FprZqVcbawn2Lv0B9ljKC
-qy3aa2WfzS616BQ5oWkPsHVE+ZQ1P4qepDRFQdmlwjDujkWyZ6Nyog4I+Fr940fK
-PVg9LHoMuVt8OD+rbpb6xgwuuiNe6JHh6vOhQ00AW8VJoutbdnycFKKDVHMgCJkp
-2Eo4d+iUHdDpO0VLzIDY
-=6BHf
+iJwEAQEIAAYFAlWBy5YACgkQG9wOWsQutdYFyAP/RJ9sA4wKDY60YbRdtHks3iZw
+dofyKvbbAtEwsKKDfoSUQCbHV7cgrp+cfgl1o6ONVlkRinvQnbqGFQVz8ZzErmHn
+yLlQ//FSs070DptMd2KqFqP9fspt+08tHCCVItCDcjV7jxCz4tPCNvl28L3fmiM2
+KGU1Cq2T5YLdr3SzM1w=
+=mbC+
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-3.0.1-r1.ebuild b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
index ccc6505b0c7a..ec66bc9db377 100644
--- a/mail-mta/postfix/postfix-3.0.1-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-3.0.1-r1.ebuild,v 1.5 2015/06/11 14:30:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-3.0.1-r1.ebuild,v 1.6 2015/06/17 19:35:51 zlogene Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
@@ -19,7 +19,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 394b9f728abb..3af6235dbc76 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.71 2015/06/04 19:03:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.72 2015/06/17 22:08:58 mrueg Exp $
+
+*darktable-1.6.7 (17 Jun 2015)
+
+  17 Jun 2015; Manuel Rüger <mrueg@gentoo.org> +darktable-1.6.7.ebuild:
+  Version bump.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org> darktable-1.6.1.ebuild,
   darktable-1.6.2.ebuild, darktable-1.6.4.ebuild, darktable-1.6.6.ebuild,
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 9dd1e62b96e7..0cec882f85df 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST darktable-1.6.1.tar.xz 3073356 SHA256 1372ec5b6df22409f3614b229ea98b89051c9e23e46c8bd6de1c4326705e32c6 SHA512 f1111940239b732201410b80beb7986372aedf90741fc93eff685f3ab6f53a1482d67dc1ceac4219c1e565c17492389d564bd8b21234bc0b7428e8eb1d009dcf WHIRLPOOL d6c549a530488445fc6bb6f0ee7701e639e079b547c358f020875bb07540d621045f0dddcc89dfd1da2da7c229420d1ab4d553d0555853bf64cfa029e16d0999
 DIST darktable-1.6.2.tar.xz 3086572 SHA256 66ee5f8ce5df9169211980fa374dc686eaf74322e0bd363a56612ae808bdc5bd SHA512 bd7cfb8f0ab3cce8e302bd089136d9054aa90f12fc5742606fe1cdfb782d252a59f073f6e3b08d093e7adca2e2ccf1b53c187304beff115f1c947e31d0b56cd7 WHIRLPOOL 27ca6786f6d0c1eb58b77a9519952ed0765d6910557f01b976895a13bf20f31e2b69cdd4b7ea5f538c87e4da62904380dbed66beccae7204d4eca57023733c3f
 DIST darktable-1.6.4.tar.xz 3117168 SHA256 c5f705e8164c014acf0dac2ffc5b730362068c2864622121ca6fa9f330368d2a SHA512 1527133ec6031431a8b929beaba592b3a99f800e883820a2e46d4e1155b2a32bf5e94ce030ab1942b112f6726592c9d538419887540daba014a9a1ba3100e874 WHIRLPOOL cfc7510250a4007f93e0f45919a43cf2c9c12ff259efefae634ccb844235ae5d947284252c3a822d4c14d23fc736e0c0df22ac98e325716cb041e18fe0111d8f
 DIST darktable-1.6.6.tar.xz 3097760 SHA256 f85e4b8219677eba34f5a41e1a0784cc6ec06576326a99f04e460a4f41fd21a5 SHA512 96f0371c0044c40e22c0cf729076032e487fd0af30d27d28ed42ea8bcc3e29971b09d9f628e3b734147265b02fa0243217e687a8e6237b2c0c14b9db330df09c WHIRLPOOL d04e77777fdcfdd5933d7c915375b7418647918af7ef4a5b19703724a113ee5fdfe8db6bb839e9638eecca6c0c9c7542088d12b45634fca57d3b453fa120d7f6
+DIST darktable-1.6.7.tar.xz 3113804 SHA256 a75073b49df0a30cd2686624feeb6210bc083bc37112ae6e045f8523db4c4c98 SHA512 6fadc62dc9ac0dd8b11d7d1a1ef1c23bd07abb7e66159d0bd26dd4bb9b36162e390c4f1559dd7c433c18dd55ebff98157234137567e12467995f7f26915b0ea0 WHIRLPOOL 69228b8c734b53b17483ae453df8cd73caf78b5fcbcee6b5cae5f8396c5dd1038ba6036048ab50e15c85cc35adeac0bd49de03f3acb30dbcb822fae2e02b73bf
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
 DIST darktable-usermanual-1.6.1.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2b3bc41f060fc4721a1c5f661b25c52f5b054 SHA512 c94e134137778d57822c1b0e1b876bc0358f2c32bf7978e518c32ae600af60f74f95f6c49ed6c07ff0aa4e035d6108000ceaedda39a900afd0de46632f4c3fd3 WHIRLPOOL 29db2f68cde6b7a2a1ce78a81deb1173a5cbaa643b6593ee8a5b7a55aef9156ed11a3f048f253f0ce47a3f08b37b9f4630f117797be4b15368882a9366f8d6f9
 DIST darktable-usermanual-1.6.2.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2b3bc41f060fc4721a1c5f661b25c52f5b054 SHA512 c94e134137778d57822c1b0e1b876bc0358f2c32bf7978e518c32ae600af60f74f95f6c49ed6c07ff0aa4e035d6108000ceaedda39a900afd0de46632f4c3fd3 WHIRLPOOL 29db2f68cde6b7a2a1ce78a81deb1173a5cbaa643b6593ee8a5b7a55aef9156ed11a3f048f253f0ce47a3f08b37b9f4630f117797be4b15368882a9366f8d6f9
@@ -13,24 +11,7 @@ EBUILD darktable-1.6.1.ebuild 3928 SHA256 d17c73bc3cdbfb7c6020f5c04e4e8dec9bb113
 EBUILD darktable-1.6.2.ebuild 4089 SHA256 37e8ffcef75f47aa2faddc007463b8fa94c306cf0a71469174c0acf0bed806f4 SHA512 644e37cc5e59959129edd18002f2427067d6ec2f8b8b225c792acbea8b6a3a6bdb7becc810f0fcbb0464c74f63e40962a5c041db7f4497407b4e3efac6f38f76 WHIRLPOOL 17af10f1e31d8cf7d973e039b98b6874ab5d26ab67943ee027a78f6777aa828150c91fd53504bd68196cf98f57c984ffc977ea4f79b8d684b159d3494ea2eff5
 EBUILD darktable-1.6.4.ebuild 4094 SHA256 35015ccb30383523414749a399c75382b45a65e1120d30fe3cac5b3c99ad6db5 SHA512 53ae264a88cf0c6a79c36b54ca62e88a85745b8d23c76b1eae3dd7a1f55d12655439bcbca4012d75f8de18fc21a6b69bae061c338cc2b55c07552e319ba70bb0 WHIRLPOOL 0bfb28f0b4b3d27e19f4b5ed9bfb849b4b6a824aa4bf30275fb74b6203eac7956ec0aa921812530d0b795d8c25f0096fc465b336445d2adcbc873ae177dd25ae
 EBUILD darktable-1.6.6.ebuild 4160 SHA256 8cf2ddc10d5a8eb85f5c189c4c5c703387f6b4a91fcaee43eeb7c9a84cb42843 SHA512 a7f4e73c6a748a87dfb7ccbf47df613351478d5b5756dbc7a2fd3ee151bf3874ac69954fad78797a3baed240f8b31e0d4ba2ff2e866a42bdb713a822bbcb46dd WHIRLPOOL 558dae9d2a4932c66524d729f3487fd97a4f4285ee19af37916cef9072e21848e4db2f260ab5974b60a3eb8d5c485d2c9d5ed9ee5b94e79df587346c3a209121
+EBUILD darktable-1.6.7.ebuild 4155 SHA256 ceadcfb2e89d3dd1ce7bf0dd9f301e928b5d7ef9aa78b709f8c502c92c3e126c SHA512 a30903c0c281f41b36d54a77aad537e3450d58d41c284db5c42dc16f57b332ca8dfc14924251fe4e99d42585722355947463d9bfc2cd922b3ddbb930446815db WHIRLPOOL 11c02927905aa28dd73fcc51c76e6e06fde74a43e30318648521addddb99e09ef5380f180748bf86bfbbf67981fb4b0c3ea38f9f07b3e78963d1cad88cc25bb8
 EBUILD darktable-9999.ebuild 3919 SHA256 9f893eae585236a1e924888cf31397e90b4af412ca0676902f171b8a06ba7d11 SHA512 6725edc268df34cdbe7c2d7576387ae767d095bb388480aee8f48b81b85ee0cdf54844924d1139a30aeb37641b99db735c0711d65cbfb1abcfe3608b732de547 WHIRLPOOL 0f86dd4639728f0aa7c4eb627f91fd861b8a8c8e2311484f1d2d69cc74dc064bff53bb02fd43dd9ae613e07c34df7f01f8d5d1e64ab195ae20b1a37c495c62db
-MISC ChangeLog 12890 SHA256 959513239e17bddc1e08344a9de48f75e9b2c9cee8fee2e2ce9d912c606c63b9 SHA512 69315e3b5b602aaa6e1846bf4ec2809d36f888ae6cef1c1706df9218c604303d2010e726a3c09c3d7c864f34f9d865ad3d27830b1cd536ec1f2c8a66056e4eb1 WHIRLPOOL c92e073ab0d3548666627abbf9ed407b001e67b9ce203119ac3eae415c366d8110bdf25b002895cec505260f3a84e361f3e3dc7c56358a843f6f84300039519b
+MISC ChangeLog 13007 SHA256 5ab903bb2b253c89e3b92c983ecc27eba0c9fc85c23ae9140e0569b3ec0471e5 SHA512 e849926880c4382963171da8644ec3d8a3083a47ff956402bfc3a1a5c24e6edb7c76f65a7101e41af8a92b34412f64cdc485bb27b1b01989d48b02f486d57b6b WHIRLPOOL 59976d6065afe2495a88deaa1257c7a29278d6bbaa87291f4339333722847488f3bb811367c47140b5df9dc4246e5a826359db2725816d58e110d1f661c4870c
 MISC metadata.xml 1183 SHA256 74075c6b1ec2b0d94214dffb780882acc4ebc5305d4a94fff7487b9630098be7 SHA512 34ceb0e19ac74ff04ceb3cca0bcdca9410323b0a69486eac134c965d3b89721d7154bde1fb18d86a6f2b44e5b29c526c795d20d757a12dfb02e88407dcf5b09c WHIRLPOOL a661e3b2cb39693e8349f075c839acc3256b513ee3c9ab07654aa91e07edd1ad583d939f6379f69aae7a6b0a32a608fad493cdafca0f4971c6bc59503f5f854d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJVcKEgRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7CE4EAC5VwKC5EKbO+7ocnqXnvjS1LrvnPK46i22fvd8b3+Pl0y8OANFF/8+sT5/
-vDMMgS9UafrfwMrrUjIEvvW88jbDZRkfZrUO2WhxjDgwlDxY6gpYwoaDZjJ+TlWQ
-tyXCzORiGx95xks47ZJz04Ntea46Rlk0Zsta4SALj/dWMJz6BFBQvMGxk+WNJPhl
-l98re/5nzFb6dQ0vNf+eN/gCyzN5WDZ3fIO8/pbZr0qQ1uOperxaPfpPgUgft9l/
-1gfowQLyB0j1Dww6tb0G3CFlFEP2A4+QJz9R+t9ZXCqKpHehSGz1s6AVfiC9tjYs
-wmB079+uGeGaNBBag57p+UKswOiKGoZDombunbpAgmK8m9d+teRLSpLueMZF8nnP
-cAY3caYJgzgl0YhnTT54adjAjqysrjjDdtxTwQVo1hntoJ1T5/x87ZO1300d3YB7
-Jv2KySKf8Z+HClybKGgSr7kVwknRJHQEZcQL2vWUh7qKd4gTHRMfjPgL2X3Ioeyj
-OMn6YAlRlYhnfZCnAQGflZQIe0NIr5ZiWia6LcQ8CDj8kmFi7Tj57YG56JL4SSK2
-o33VDgKsto+OjT6Szxyu+++4KxpRADOwazJA9QAX/2HnLtZU9F8pH0ADqk2f4Rd4
-NSWijcj/HS+QuXlxq/RD2B44zUE6cVUIlxDk3UiCBHQ86/8ctQ==
-=Mnr2
------END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.6.7.ebuild b/media-gfx/darktable/darktable-1.6.7.ebuild
new file mode 100644
index 000000000000..2c31eca70647
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.6.7.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.6.7.ebuild,v 1.1 2015/06/17 22:08:58 mrueg Exp $
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
+
+DOC_PV="1.6.0"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
+${LANGS// / linguas_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-gfx/exiv2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-misc/curl
+	virtual/jpeg:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	colord? ( x11-misc/colord:0= )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	libsecret? (
+		>=app-crypt/libsecret-0.18
+		dev-libs/json-glib
+	)
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	slideshow? (
+		media-libs/libsdl
+		virtual/glu
+		virtual/opengl
+	)
+	web-services? ( dev-libs/json-glib )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	x11-themes/gtk-engines:2
+	kde? ( kde-apps/kwalletd:4 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" \
+		-i doc/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use colord COLORD)
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use geo GEO)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		$(cmake-utils_use_use kde KWALLET)
+		$(cmake-utils_use_use libsecret LIBSECRET)
+		$(cmake-utils_use_use libsecret GLIBJSON)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use opencl OPENCL)
+		$(cmake-utils_use_use openexr OPENEXR)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_use squish SQUISH)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		$(cmake-utils_use_use web-services GLIBJSON)
+		$(cmake-utils_use_use webp WEBP)
+		-DUSE_LUA=OFF
+		-DCUSTOM_CFLAGS=ON
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/potrace/ChangeLog b/media-gfx/potrace/ChangeLog
index a00fc8e8e483..2ac34471f3ca 100644
--- a/media-gfx/potrace/ChangeLog
+++ b/media-gfx/potrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/potrace
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/ChangeLog,v 1.56 2013/09/05 05:25:37 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/ChangeLog,v 1.57 2015/06/17 18:47:37 radhermit Exp $
+
+*potrace-1.12 (17 Jun 2015)
+
+  17 Jun 2015; Tim Harder <radhermit@gentoo.org> +potrace-1.12.ebuild:
+  Security bump (bug #545036).
 
   05 Sep 2013; Mike Frysinger <vapier@gentoo.org> potrace-1.11.ebuild:
   Add s390/sh keywords #390671.
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index b5aaaff67ddc..6141745c37c4 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -3,24 +3,20 @@ Hash: SHA256
 
 DIST potrace-1.10.tar.gz 617866 SHA256 5ace5b470866ba914def16a1cbc09d10b37bf93f22ff704769d25f573d32f8ed SHA512 f9793fb562ff2e8fd99dd37015bc797372e515041fb26aaaaea6121e29e166d6a32dea3a98d0c2069ddbbd5ff465988724495519c641646814251bbaae265f74 WHIRLPOOL 2f19bd0c20a0a6dfe83aa6234eb88707cb1d52bdc70e92bc47a10a7e8b071e3df7c4121ff63f9c38a2b2ee1c1dc920b2aee64f72bd0e9a66adb258b1e6591958
 DIST potrace-1.11.tar.gz 662085 SHA256 5aa5eb496e00206d68b67edf8f6067999a45d1b69f848c18af5cbdf8e4a17ead SHA512 d0ff037ed989a1742a099bb9d120c5f10cf1eae6ed9adb20d1d37eee713e569925eff6235825dfbdd7b1649dc46ad4507982ae001d6d3d49cc281ed16ddf1843 WHIRLPOOL c05613ae20ebd23606098b8cdff7beb327a7dd19986a097fbd82fd7565a88143c8036b71e895c18b4c9e290e01213448ec4abe48a33fc1e0d28ef1e827a3f285
+DIST potrace-1.12.tar.gz 604946 SHA256 b0bbf1d7badbebfcb992280f038936281b47ddbae212e8ae91e863ce0b76173b SHA512 d971f96ea5cd7a243d1409ad94d2ad41e00d1733f56bcc00e12fcaf4d5eb6844bc73fd7dbd270d1876f7931619597d3cace0c2c76aed313046732c26621c2680 WHIRLPOOL 820e310c90a7e6541d773144ff8d4347cdc3cc8207be45c11a1a71922531696e5d51ef69df7bb29f249c8ba9b592e2d34fb63c03e53137d56f02a01a7c769db3
 EBUILD potrace-1.10-r1.ebuild 887 SHA256 a557ebc6cbeb14223ac66e52c6e4a837da867119febece8e8c0fccc4c4231969 SHA512 7b67016d40ae4de79db35d5d8a95535a651c93f166891480999558ba78933a0b02c31e0aa56e6a0c7ed7d6a47e6a84cce8c93bace678bd0bf85f6879f68c38da WHIRLPOOL 33cd5d260188dec46fc6874b9e1db78ed42ed9b9ae60e4f23fadb182585614a833a3d0077610b8781912840ed2afecb93f6b6172629b7d1f7d23e860cfbd809c
 EBUILD potrace-1.11.ebuild 892 SHA256 7a82b61055873d98cf77044f2088e44cba6de1352dd850ca8e03dfd1e87a2313 SHA512 17b9670604d5fa1523d2e38af14fb0bdbf1c92ec5879ed0f15b0209dc3fffb0ff5bf2ff4577e6ef03e14f112319e6f0eff4f587440996ba0e5ace525458bb4d8 WHIRLPOOL cc745be43a8557230eb3295735d20f913c359450ad411b0a9d83da9344c1810fb6fb13cbf738f5cff2ea07c1041fe4da93e8ae268fb948bf7668dab72674af4c
-MISC ChangeLog 6379 SHA256 afe9f939641f82c1e242fe805a9f37dd64803204197b0a706116e11802a6185d SHA512 66495a757bd7cd7234432510854e954752960e6276e48212255b797131af76a88a2a9c9075b23e48cefaa3b7d033bc776ee0b05a2e7e849380f5a29d864796f3 WHIRLPOOL 196c56d83f6e144ac58c35edee39df0eaab8d8405456e778cc07a5f0733c727495a58be574917bee28cd85428db6a5f6fb16eef1bd0365e78d5877212eb7edf6
+EBUILD potrace-1.12.ebuild 911 SHA256 a93989f4218c2a7b77c8e20612fcd71a905e49e656352b6b73c345ef2d7c0f31 SHA512 d9a4958992b58111b0552e31883f838a019f6bf323fd9c989d21e0968f0a09f20a25d6205eee98c074af6128977ca965a2ea3d26061628a10ab335f955d01f01 WHIRLPOOL b5739d836203e8635614d23a49c467d02494574da7d5537decdec602006f62ee3e99de387331ce5dfd579aab5e6fb0c251af60172ff64c17950e3194bd4781ea
+MISC ChangeLog 6514 SHA256 79d87086e12873278a63db2dd2d3a88a900f379596d1830ad9515d55bd5d3767 SHA512 01b2ff51cbc58c19a865458faac34dc7b70ce4cabd2ad939d1fd5fa11d38020b0be36d3125d2a291ee8b5b5522c857f487a212a16b7f6cef81e90dad4b39ad29 WHIRLPOOL 38defba74129558a80512444499f946bc1c9f71676df05c12a2c1018f72164b892a765501371bf74104dcc5cf64468adb1e5c686ca42195b9381cdc6f7043eb6
 MISC metadata.xml 281 SHA256 65df77e39bc9efa676342fe391c0b5c96dee83390c8caece63bb736952fc7c61 SHA512 fbc4e09d32adb9853e196fcc3ebbf069900f8468e8c74af45ad86c750812b4f80bfd29923a4ca4dbdcc34d9f7ef205cf78ed9462fdb1317b6086eb84d760a7b7 WHIRLPOOL d1a4a11309f1dc9a732407d3da7a1c551bc6786670b789fd27d4d70d4b394fae27598990ad5c61cb7185009b2d60483013ec1ff24096306869a732b5e3c6af9a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSKBXZAAoJELEHsLL7fEFW6S0P/ju8LpgjQt6hs//R/zZ3IB8n
-Y/0C/ghn0OoyIiuwYgKJBLbkA33/jCG6uVRa5x6yQGSnLtvY18TGyu8F6VgBRMhv
-EdvF1H3ODyUk8NMe84vKfPsnICD8nvRRcxNAk9lz4loU9K459sWqkwdZjwIYkNFB
-OEUfkBoGCT0U4/msk/IGii11+tuCcI6YwgisZQmTjRQ132NsgVoZLdzOd++74VuS
-Hj2cO6qGZs0SgMGcKh0sWPfB757X5pQMLwacZaXXx5zJyV6B1Wua/2NkD7cIVRAg
-hY+A67ai7CXPPriL7nk59JfcsaGOjC2DLEKgCrRb3Ns2QNJkPIMtkeb36BUJNFvR
-Xa5NKkvyrmYpJ/VRfLOI2RxQJvF2Qa+t9eEFjmeX9Ys+679+XGu+WoAAlfzmrp39
-gmU55MYEuh8XBkkW8SJqtvU2SnwqpXCFVswGfAjk048MqTo06tq5VI5y2KMMFjB3
-Os4+UjDYVJ70jWCy8L56pg+jLgWv+JTWrENGrnSnEsOZzUatK0+GEhsQ2rgIZUE5
-w3DmYpb+y+D2dauSiXWCAnfOXlUg0n1267lOk68gKGhonSgrRoq7l/mHofRSDa6J
-DswikzF0oU+5QzOm4ppaivHrugWpKjVBSG/nPcJ9eISkpgkYXpii7rTBw9yOEblf
-M88kPFYGx0kfM1exMb+i
-=QgUL
+iQEcBAEBCAAGBQJVgcCfAAoJEEqz6FtPBkyjmXAH/0/7YUMJ/7oesuSrB6hqHUi1
+qcooTZkmx7U76eEY5msjA45lMrM/uGEyrFed9PHRWuq4VvwQnHlZFvMCMjp/1Z2K
+HJRqpMY5R+bH8DOvBM86WiFzLs5HGlJsphXZNuUda9C1CQZrrjN6sjJwbBcsOvKp
+JtRU2qq1MYk+9FKciJcdzzHgLiGeWyXDIpiFE4zq1KGFq3CikIgMyAHwASpQLTl+
+9361qjgLkTKM7M7pNGIBUu3xO2xsswktpgFEhBaNq68h4nCv6drjq15P7mDCV8Lf
+Vf6OLFtG4DiMBuCJSD3NqC3zWFJgshMZ19XmdT1qbD0Q0xT0ceBG9gHpNoU/uNU=
+=UcVi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/potrace/potrace-1.12.ebuild b/media-gfx/potrace/potrace-1.12.ebuild
new file mode 100644
index 000000000000..75d3630be9d3
--- /dev/null
+++ b/media-gfx/potrace/potrace-1.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.12.ebuild,v 1.1 2015/06/17 18:47:37 radhermit Exp $
+
+EAPI="5"
+
+inherit autotools-utils
+
+DESCRIPTION="Transforming bitmaps into vector graphics"
+HOMEPAGE="http://potrace.sourceforge.net/"
+SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="metric static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-zlib
+		--with-libpotrace
+		$(use_enable metric a4)
+		$(use_enable metric)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 152da9f13343..01c71853603f 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.88 2015/03/21 18:45:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.89 2015/06/18 02:29:37 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> freevo-1.9.0-r1.ebuild,
+  freevo-1.9.0.ebuild:
+  Drop directfb useflag as dependencies for it are unsatisfiable #545246
 
   21 Mar 2015; Justin Lecher <jlec@gentoo.org> freevo-1.9.0-r1.ebuild,
   freevo-1.9.0.ebuild:
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 5fcaebac51b8..1d4b90d0b484 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX freevo-1.8.2.boot 1632 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc SHA512 b8bf95ea34e9c77d8f8df170a3b1455361634265bd1205a03760d51b647efb74635a7776d7c94a92799e9be4cc2aaad3e72b6df87e29c07cf6595e1c1b3b6ec4 WHIRLPOOL 90c5329c5ea1231b0d6eee20befb16e7e96f107fe3c22626465189d4fa16d30b8ce40e9908c075a145940ba084fe3c7ddd6580f284c3f95f0827ff6188b4486f
 AUX freevo-1.9.0-PIL.patch 905 SHA256 208f1ec7d72443548f58dd4491b8b86b9c3a20b529a4c89504c0740178c2afaa SHA512 324ea349ce6c2a860e2f13c445ea3d21631e6400541d48c294a745df1f73e5366e82988dd59712470edbb0228e518e2387ff08f40fbe718e52c2a49eeaa99984 WHIRLPOOL caaa551cdd12975ce38fe19c0554c76b51e34494a5a5d0fecbe19d94fec65f3b6557e99ec380ae15694d5cde9d3fcdb655efc6916c766e1747ff287f5a012dc9
 AUX freevo-1.9.0-distutils-r1.patch 663 SHA256 9f7bf9da4821d1298d23ecfc8ad72e237979844ae48f42b363657be9627736ee SHA512 6cd4ac470896ba2a77a937b3b5539831045972c61e142b0f5fc1c309e5220d5deb59622d81992615a4da2d2d6f41fd778e2997f38c9424e8dbee70f4a97e21a5 WHIRLPOOL 9180ee3db9b8bf404ccfb31adfcaf9b1c65daa30bdbcef6af2d8d7b0f0ca7d5811800a607efeced6e0d8b8ac824111e0b62436407af8c4d506235339c0e6c758
@@ -9,26 +6,7 @@ AUX freevo.conf 1265 SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c634
 AUX freevo.desktop 96 SHA256 d7d8662ac1116c48c8180e7e88d1b0cb0a26ff8f61ce81dacb9c6a7b552dfddd SHA512 91642e741bc65b58a19231f755638855ed45e50aebddb6b3a84d1818884602201173ef76ae2678a034a0d8ca9caf98a8ddf82028727423163ceaa1a15f745578 WHIRLPOOL 5c98fcb258adfb249d312ded3a5b165a38837f5f6fb95c22b4da6d693c44191cbf1f79e8914ee7a605386d85c36473ddaf9991057e1dd2208aeb66b6f50612b9
 AUX xbox-lircrc 1690 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070 SHA512 ff9a286fa59bfbb6af47d41530c908ed393b0ee9b8c0ca6e63d71b494ffbc88d04cfeb03ca50ef1da9d457b2d3c1359d9491c75469781ffd7e95b051bdfda519 WHIRLPOOL 6f9618277ea42dca833fc00cec71c5e86b8d441200cff9466a34a683ac0b86157079480b2506e5c37f20b8fccbffcd33acd565c3ca983ce84d21d5cadff7fcbd
 DIST freevo-1.9.0.tar.gz 27182867 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722 SHA512 4dc722efbf81101bda1ab4437516faa6d4471d4106553617d30dd6de860bb7ca5a3c7bfc9865f4a7589d6726c7ef838161213f86c679889e1cd086362921ebac WHIRLPOOL 16abf397c20b9dd18271c5933e343c846746cbbbf5bef8a126a364ce945c820e8e0f164e66fb56a61d86f256e6d7b98ba110a39395d8d26c278c6e54ede8a543
-EBUILD freevo-1.9.0-r1.ebuild 6064 SHA256 7ac21d7dd13a242c487d4d3cfc92ac0b861556d0bce38b1b9de32566c4a96016 SHA512 0f0a7a3c3a7f868c1e599a4198ba04ed06c081e52b3aad09f40f3b21058dad0c8238a03b1eab11d691cbf014e9aee394e234a2be4d8039cdd70fd1842ec85ad3 WHIRLPOOL 6d2d49c3f1dda876eb7bfc0719359a6ff93bb28c80bdf41ba7d9adc90697708423c6503825766f31aa1e01bd9ce69c871d0e29fab076a3754b1c7a97d5b64812
-EBUILD freevo-1.9.0.ebuild 5795 SHA256 aa67fb1554406652e6fbb1ac6250ff0248c571475ea285369fd17595fead8e1f SHA512 35c21b43e171a7413c93890e521dc7aca67217809ad0baa9f9f860f3ff6fd592a0419b3980937a4722e4c58c024198474fdb0a5af29b6c1ef6fc03a3a3687142 WHIRLPOOL bb4ffa8b94f06c7fad1c4fa9277aa10dbf88fc635c6aac4c9acba12943d5fc7f868ba1c0757eea31b6ba5856dafc7f110fbec5c561a610def9e186c8580c1c00
-MISC ChangeLog 13807 SHA256 f122a016e32b1456261940c75c04c0d91d5739179b90d3363cd9f09c75ac25ad SHA512 415b935e6a1da6443a1512bd55d7dbf6464e01f56467df1733bcde09ed397d2ec2f579c2d36b0bfd7b95949c2159bd73436eb6ce4b19a35678ab1b18249ae754 WHIRLPOOL 8174cd99ec8aa285e44cca388a25d5a271b084d65662b81599c15f53f3d3906416879ffafcd791baf13a4e643b594088d04f4d374a92edc7ce5a18d8a0322492
+EBUILD freevo-1.9.0-r1.ebuild 5787 SHA256 4e804a2f507b3a78a73bafcc2ed1dcfc3588fd26505666e8e19fbab1d90d5fcf SHA512 77f209feb734ba89e71939412e28a7665c40238546477d14fc3fff88ec33cf2b9c350779396a7866bf9cbbf4bcc014c6b0441737181a982f67eea8cf49b4a9f2 WHIRLPOOL eeb3e8f1116dc94370c0717ad4be1a93f45febc207ca40aa8cf1a44b7957e3074bd7634226a7d85f25e50a7d4776b35a02698b88f66e8ebfc1f04131053a7979
+EBUILD freevo-1.9.0.ebuild 5518 SHA256 980894d8fe1ef2642b77e67cfd6f85d93c4d834f97ceebbf4c5549338aa4c3dc SHA512 cb466b88ede5dfffd7c12f6fac1ad6dcf11902e91fd2621f572e1f53dcf9d77eef6aaf1f99c1f062c726a6c184ad0f9937b457ba0191501fa5772903cf06b90c WHIRLPOOL 1515802f5ab737f8d3e638b38c4a466aa543de0cfb233912ad650c624ed9d088a6c8134fb9411dd890719e96ee436b8315ebea7c3f0df003bfa8a8865b43ac6d
+MISC ChangeLog 13981 SHA256 2d42ddb6e1d98352c341cdcdcbfc7147ccee774c69be14fd61455cc50df398f6 SHA512 a776d2ef71edf651100d2fe95cc769b8da6cb7ce08412756cac9c93ad6f0a759201646193253fc9f27eb6a6b951ab6b8c06a2c13137d178f6ee7c3c6d6c62f7a WHIRLPOOL fd0ab801343f8c93ede5d8f5d464a76724a1e874c193943121b6a550abc1d0cc7c568c7c6de6221d6b34c500c01601d440a03be89f4de3d80cdd4395f1e0423c
 MISC metadata.xml 798 SHA256 b7ebe5b40248cb8bd1aad4533cec8430c73a0734a378b679d5a1c5f0fd799674 SHA512 be9be1db80da67a6e6284fd314eaaab92c03335454a663dc8a4664194b52ff06bcced552556e8ac9ce78c05b8dd64100eeb4dc9f7d93b3fec6c2906e4de083c0 WHIRLPOOL 5eb59bf2c9b7014672e83991c6629849a16df97a7a7cad79a949d254b41f5afb808c619c34ce56665af176f0bc8e57edb90e9f80a378405dc5ff15203a070779
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVDbxYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpy4QAJlTtq2j42nsVXBi/ioDhxws
-f42qslMgOjKX0dPrqAnG3GQL5zBD0/ApmynUGyoZOAj+xobjjvXcLArhCpEhwGmZ
-kfgMeBYQZMnDKO/Amve3dKKJAHgJ3Dpq7QHujYfXgW+mf139jzy6cr4jlr+bwN8u
-TfQtpqkwCjrI2YkSGYA0GXeu5w9beAr+7Xcg4bFy2iW+Izw/nFRGlkp2WA1bvDp0
-yw4TLLucj3rDsEA6mKn2dq+wTpvdsblucbRDKrD+ZhA6gLP3+KP8G2aCxp+Linna
-+MkDxLuCRZiHXXj7HVnci6QCm09JcfF3qjoYm9O0Y4/KDVPyZT27zXeJm35KNzYI
-nGtUzeBcdKb93bMc9Sg6EZeP2t7t/BpHz+HucIHJWIixnn9Pggv+MGR5O1bg7nNt
-i+6Qe/Cs5IJNrbnundClq0M1eQcXC73cQW/kGryOiB844XZCR5iV39kCMc8rMb+v
-0+RDe/gz578tmKDHcPdEeElvcNvSLQx6yE4RLOOShp4qaqXYK6FjAxOXO7xqLxPt
-quDMKY8/F3+yLO5zalj0g0NHLpu2c9LrmOhidFI2IQwiTmoUgKFqpJTHVL1bqye7
-QviltJa3dtc5CYZk8qZP7wi1umSSImzOTrSiJqnfsClMfvrd4WZDHEKYL9FnVeuy
-QdOhj3qW8QuVVjBBOH/H
-=HM0X
------END PGP SIGNATURE-----
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index 97fe2609be66..75b6b17950a7 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.6 2015/03/21 18:45:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.7 2015/06/18 02:29:37 patrick Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
+IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
 RDEPEND="
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
@@ -32,15 +32,14 @@ RDEPEND="
 	>=dev-python/kaa-imlib2-0.2.3[${PYTHON_USEDEP}]
 	dev-python/kaa-display[${PYTHON_USEDEP}]
 
-	media-video/mplayer[directfb?,fbcon?]
-	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
+	media-video/mplayer[fbcon?]
+	>=media-libs/libsdl-1.2.5[fbcon?]
 	media-libs/sdl-image[jpeg,png]
 	x11-apps/xset
 
 	cdparanoia? ( media-sound/cdparanoia )
 	dvd? (
 		>=media-video/lsdvd-0.10
-		directfb? ( media-libs/xine-lib[directfb] )
 		fbcon? ( media-libs/xine-lib[fbcon] )
 		encode? ( media-video/dvdbackup )
 	)
@@ -58,11 +57,11 @@ RDEPEND="
 PATCHES=( "${FILESDIR}"/${P}-{PIL,distutils-r1}.patch )
 
 pkg_setup() {
-	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
+	if ! { use X || use fbcon || use matrox ; } ; then
 		echo
 		ewarn "WARNING - no video support specified in USE flags."
 		ewarn "Please be sure that media-libs/libsdl supports whatever video"
-		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
+		ewarn "support (X11, fbcon, etc.) you plan on using."
 		echo
 	fi
 
@@ -119,12 +118,8 @@ src_install() {
 	cd "${S}/src" || die
 	if [ "${PROFILE_ARCH}" == "xbox" ]; then
 		myconf="${myconf} --geometry=640x480 --display=x11"
-	elif use matrox && use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=dfbmga"
 	elif use matrox ; then
 		myconf="${myconf} --geometry=768x576 --display=mga"
-	elif use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=directfb"
 	elif use X ; then
 		myconf="${myconf} --geometry=800x600 --display=x11"
 	else
diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild
index 97daa705f172..845ccd40841c 100644
--- a/media-tv/freevo/freevo-1.9.0.ebuild
+++ b/media-tv/freevo/freevo-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.21 2015/03/21 18:45:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.22 2015/06/18 02:29:37 patrick Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
+IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
 RDEPEND="dev-python/beautifulsoup:python-2
 	virtual/python-imaging
@@ -29,15 +29,14 @@ RDEPEND="dev-python/beautifulsoup:python-2
 	>=dev-python/kaa-imlib2-0.2.3
 	dev-python/kaa-display
 
-	media-video/mplayer[directfb?,fbcon?]
-	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
+	media-video/mplayer[fbcon?]
+	>=media-libs/libsdl-1.2.5[fbcon?]
 	media-libs/sdl-image[jpeg,png]
 	x11-apps/xset
 
 	cdparanoia? ( media-sound/cdparanoia )
 	dvd? (
 		>=media-video/lsdvd-0.10
-		directfb? ( media-libs/xine-lib[directfb] )
 		fbcon? ( media-libs/xine-lib[fbcon] )
 		encode? ( media-video/dvdbackup )
 	)
@@ -53,11 +52,11 @@ RDEPEND="dev-python/beautifulsoup:python-2
 	vorbis? ( media-sound/vorbis-tools )"
 
 pkg_setup() {
-	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
+	if ! { use X || use fbcon || use matrox ; } ; then
 		echo
 		ewarn "WARNING - no video support specified in USE flags."
 		ewarn "Please be sure that media-libs/libsdl supports whatever video"
-		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
+		ewarn "support (X11, fbcon, etc.) you plan on using."
 		echo
 	fi
 
@@ -112,12 +111,8 @@ src_install() {
 	cd "${S}/src"
 	if [ "${PROFILE_ARCH}" == "xbox" ]; then
 		myconf="${myconf} --geometry=640x480 --display=x11"
-	elif use matrox && use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=dfbmga"
 	elif use matrox ; then
 		myconf="${myconf} --geometry=768x576 --display=mga"
-	elif use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=directfb"
 	elif use X ; then
 		myconf="${myconf} --geometry=800x600 --display=x11"
 	else
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3141652e494f..cc1088c4b079 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jun 2015 07:07:16 +0000
+Thu, 18 Jun 2015 05:06:57 +0000
diff --git a/metadata/glsa/glsa-201401-04.xml b/metadata/glsa/glsa-201401-04.xml
index b2d6737903ff..a7d5e69fef3f 100644
--- a/metadata/glsa/glsa-201401-04.xml
+++ b/metadata/glsa/glsa-201401-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>January 06, 2014</announced>
-  <revised>July 07, 2014: 4</revised>
+  <revised>June 17, 2015: 5</revised>
   <bug>325593</bug>
   <bug>355927</bug>
   <bug>358663</bug>
@@ -28,6 +28,12 @@
       <unaffected range="rge">2.7.7</unaffected>
       <unaffected range="rge">2.7.8</unaffected>
       <unaffected range="rge">2.7.9</unaffected>
+      <unaffected range="rge">2.7.10</unaffected>
+      <unaffected range="rge">2.7.11</unaffected>
+      <unaffected range="rge">2.7.12</unaffected>
+      <unaffected range="rge">2.7.13</unaffected>
+      <unaffected range="rge">2.7.14</unaffected>
+      <unaffected range="rge">2.7.15</unaffected>
       <vulnerable range="lt">3.3.2-r1</vulnerable>
     </package>
   </affected>
@@ -91,7 +97,7 @@
   <metadata tag="requester" timestamp="Wed, 18 Sep 2013 03:32:23 +0000">
     creffett
   </metadata>
-  <metadata tag="submitter" timestamp="Mon, 07 Jul 2014 12:53:14 +0000">
+  <metadata tag="submitter" timestamp="Wed, 17 Jun 2015 19:34:44 +0000">
     creffett
   </metadata>
 </glsa>
diff --git a/metadata/glsa/glsa-201503-10.xml b/metadata/glsa/glsa-201503-10.xml
index 64a35ccb7304..d37ba8281c26 100644
--- a/metadata/glsa/glsa-201503-10.xml
+++ b/metadata/glsa/glsa-201503-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>March 18, 2015</announced>
-  <revised>March 18, 2015: 1</revised>
+  <revised>June 17, 2015: 2</revised>
   <bug>495224</bug>
   <bug>500518</bug>
   <bug>505068</bug>
@@ -20,6 +20,12 @@
     <package name="dev-lang/python" auto="yes" arch="*">
       <unaffected range="ge">3.3.5-r1</unaffected>
       <unaffected range="rge">2.7.9-r1</unaffected>
+      <unaffected range="rge">2.7.10</unaffected>
+      <unaffected range="rge">2.7.11</unaffected>
+      <unaffected range="rge">2.7.12</unaffected>
+      <unaffected range="rge">2.7.13</unaffected>
+      <unaffected range="rge">2.7.14</unaffected>
+      <unaffected range="rge">2.7.15</unaffected>
       <vulnerable range="lt">3.3.5-r1</vulnerable>
     </package>
   </affected>
@@ -66,7 +72,7 @@
     <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9365">CVE-2014-9365</uri>
   </references>
   <metadata tag="requester" timestamp="Mon, 18 Aug 2014 20:14:36 +0000">K_F</metadata>
-  <metadata tag="submitter" timestamp="Wed, 18 Mar 2015 22:30:27 +0000">
+  <metadata tag="submitter" timestamp="Wed, 17 Jun 2015 19:35:55 +0000">
     BlueKnight
   </metadata>
 </glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3141652e494f..cc1088c4b079 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jun 2015 07:07:16 +0000
+Thu, 18 Jun 2015 05:06:57 +0000
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
new file mode 100644
index 000000000000..cbb4370c30dc
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=app-accessibility/at-spi2-core-2.15.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/libxml2-2.9.1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gtk module for bridging AT-SPI to Atk
+EAPI=5
+HOMEPAGE=http://live.gnome.org/Accessibility
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2+
+RDEPEND=>=app-accessibility/at-spi2-core-2.15.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<gnome-extra/at-spi-1.32.0-r1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
+SLOT=2
+SRC_URI=mirror://gnome/sources/at-spi2-atk/2.16/at-spi2-atk-2.16.0.tar.xz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=e90cc48b742fabda5d557bf87579ed32
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
index 50b172ad3a92..cc43df0238cb 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
@@ -8,5 +8,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47d1f65838064f4ecd5292d71dbd8e4a
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2
index b8cb82f4df12..d5d035092e69 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b662bb80a4642bb0514b239d2c8062d0
diff --git a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1 b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
index 4628cef03328..90aa8e3e7ded 100644
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
@@ -10,5 +10,5 @@ PDEPEND=net-nds/389-admin
 RDEPEND=|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-admin-console-1.1.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b37a1518356a0c8edba8f4f11b43bb37
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.7-r1 b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
index 0fbec5dbe04b..c36ae8b96615 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.2.0
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 http://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60c13f02f88a97013e0c9ba30f223284
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1 b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
index 25d144f0c817..ed1d78dada65 100644
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5048d44119bf049f103085c86621184
diff --git a/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4 b/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
index 28c85a2b77d6..e3df79282b8e 100644
--- a/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
+++ b/metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bcprov:1.45 dev-java/commons-cli:1 dev-java/commons-codec:0 dev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-1.6.7.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12735c8c26829372c24c92b58250ed95
diff --git a/metadata/md5-cache/app-admin/logrotate-3.8.9-r1 b/metadata/md5-cache/app-admin/logrotate-3.8.9-r1
index 74952ad7a3cc..cd47671ce00c 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.8.9-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.8.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/logrotate/
 IUSE=acl +cron selinux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.9.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ab6f93439024adf73db23dc2960d21fc
+_md5_=227b73a221611e6441d083631a174c8f
diff --git a/metadata/md5-cache/app-arch/p7zip-9.20.1-r5 b/metadata/md5-cache/app-arch/p7zip-9.20.1-r5
index d50170e561b6..566f02fc9cce 100644
--- a/metadata/md5-cache/app-arch/p7zip-9.20.1-r5
+++ b/metadata/md5-cache/app-arch/p7zip-9.20.1-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Port of 7-Zip archiver for Unix
 EAPI=4
 HOMEPAGE=http://p7zip.sourceforge.net/
 IUSE=doc kde rar +pch static wxwidgets
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1 rar? ( unRAR )
 RDEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )
 REQUIRED_USE=kde? ( wxwidgets )
 SLOT=0
 SRC_URI=mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=084812b075b4560cf12a7227518608a5
+_md5_=3170135b89ef11ec71d22f732fbecaa2
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
index e5a313417c11..b4f8aa955036 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d03f65dbddf57b2253588506d90db0b5
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
index 022eaa804525..18439d815a6e 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae7c3b3d5be3f6ccbe6719dc8998d101
diff --git a/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2 b/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
index 793a37a03742..6bd0253c5737 100644
--- a/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
+++ b/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 app-cdr/cdrdao virtual/cdrtools mp3? ( media-sound/mpg123 ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://joerghaeger.de/webCDwriter/download/webCDwriter-2.8.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60c7fe33d900b4e554c3d21493c3fde4
diff --git a/metadata/md5-cache/app-crypt/jacksum-1.7.0 b/metadata/md5-cache/app-crypt/jacksum-1.7.0
index 2172a431cd6f..4eeae9a29c6f 100644
--- a/metadata/md5-cache/app-crypt/jacksum-1.7.0
+++ b/metadata/md5-cache/app-crypt/jacksum-1.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jacksum/jacksum-1.7.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d0834201c08c2dba01c19c1cbdd0653
diff --git a/metadata/md5-cache/app-editors/jedit-5.0.0 b/metadata/md5-cache/app-editors/jedit-5.0.0
index 639479cbb628..004d0943f0aa 100644
--- a/metadata/md5-cache/app-editors/jedit-5.0.0
+++ b/metadata/md5-cache/app-editors/jedit-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.0.0source.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdc2c72ca23b9557a8276c6f8bd9fd30
diff --git a/metadata/md5-cache/app-editors/jext-5.0 b/metadata/md5-cache/app-editors/jext-5.0
index 3c47f13bf14f..4afa6de3c4df 100644
--- a/metadata/md5-cache/app-editors/jext-5.0
+++ b/metadata/md5-cache/app-editors/jext-5.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.4 dev-java/jython:0 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e534970a666527e23906a615bc6627aa
diff --git a/metadata/md5-cache/app-editors/jext-5.0-r1 b/metadata/md5-cache/app-editors/jext-5.0-r1
index d8da80a96a14..a07ecd4a21ca 100644
--- a/metadata/md5-cache/app-editors/jext-5.0-r1
+++ b/metadata/md5-cache/app-editors/jext-5.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.6 dev-java/jython:0 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf39534838c41cacdbf438cc9db783d5
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index 03185ec74e8b..86627fee5205 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=elisp	d13b0507622afb8ac9e3f54e91d58614	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp	d13b0507622afb8ac9e3f54e91d58614	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ebf834dffab1dac91d41a5d7e347120
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.1 b/metadata/md5-cache/app-emulation/edumips64-1.1
index 571bec7d92a6..6f74cc8258d9 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.1
+++ b/metadata/md5-cache/app-emulation/edumips64-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff15ed62d085b494baf95d7debac1209
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.2 b/metadata/md5-cache/app-emulation/edumips64-1.2
index 537a97e9d070..7a41f9db282f 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.2
+++ b/metadata/md5-cache/app-emulation/edumips64-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4343aee969c3fd8e68accf82fcb134c
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
index 7bbf47d10819..0f3b17d8d5ec 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.1.11
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.1-11.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=88a3ceaf9facc2b813e79dd880bc9977
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
index 7280d32334af..540640301f5a 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.1.7-r2
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.1-7.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=3fb1225b3c19084fd3a2edc3a976d8da
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
index 454d4bd95371..5f7e30a9af21 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.3b
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.2-3b.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=86f93c2c0cecc0f31b4c11818a6343de
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4
index bcd0634498b9..04338b15dc7e 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.4
 SRC_URI=http://phpvirtualbox.googlecode.com/files/phpvirtualbox-4.2-4.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=78244f8f33003db892863e7a9e10db8c
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
index 4c1827f5fc5f..760e04512316 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.7
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-4.2-7.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=5c173f392959a487e2b5a2e0f93bf07b
diff --git a/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0 b/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
index b289aca2a138..cbfda1b3b15a 100644
--- a/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
+++ b/metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[session,unicode,soap,gd] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.3.0
 SRC_URI=mirror://sourceforge/phpvirtualbox/phpvirtualbox-4.3-0.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=a7c4f1e7344af6bb6aeb4899636410ee
diff --git a/metadata/md5-cache/app-eselect/eselect-opengl-1.2.7 b/metadata/md5-cache/app-eselect/eselect-opengl-1.2.7
index 60c14c7eeec3..020af7594bcb 100644
--- a/metadata/md5-cache/app-eselect/eselect-opengl-1.2.7
+++ b/metadata/md5-cache/app-eselect/eselect-opengl-1.2.7
@@ -5,8 +5,8 @@ EAPI=4
 HOMEPAGE=http://www.gentoo.org/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-8.0.3-r1 !<x11-proto/glproto-1.4.15-r1 !=media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5-r1 !>=media-libs/mesa-10.3.7-r2 !>=x11-proto/glproto-1.4.17-r1 !=x11-base/xorg-server-1.16.2-r1
+RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-8.0.3-r1 !<x11-proto/glproto-1.4.15-r1 !=media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5-r1 !>=media-libs/mesa-10.3.7-r2 !>=x11-proto/glproto-1.4.17-r1 !=x11-base/xorg-server-1.16.4-r1 !>=x11-base/xorg-server-1.16.4-r4
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mattst88/distfiles/glext.h.85.xz http://dev.gentoo.org/~mattst88/distfiles/glxext.h.34.xz http://dev.gentoo.org/~mattst88/distfiles/eselect-opengl-1.2.7.tar.xz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1be5011fd47c5f92afd245a29bda8130
+_md5_=6322d345f80e854e2a73ed3d1d59984a
diff --git a/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r2 b/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r2
deleted file mode 100644
index d83bc7fa0e40..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare pretend
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Utility to change the OpenGL interface being used
-EAPI=5
-HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5 !=media-libs/mesa-10.3.7-r1 !<x11-proto/glproto-1.4.17-r1 !<x11-base/xorg-server-1.16.2-r1 !<x11-drivers/ati-drivers-14.9-r2 !=x11-drivers/ati-drivers-14.12 !<=app-emulation/emul-linux-x86-opengl-20140508
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~mgorny/dist/opengl.eselect-1.3.1.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=70b40ebb6c4811728174268f7de315cc
diff --git a/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4 b/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
index 1b8a0fb909bf..c0776920ee04 100644
--- a/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
+++ b/metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://www.gentoo.org/
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5 !=media-libs/mesa-10.3.7-r1 !<x11-proto/glproto-1.4.17-r1 !<x11-base/xorg-server-1.16.4-r1 !~x11-base/xorg-server-1.17.0 !=x11-base/xorg-server-1.17.1 !<x11-drivers/ati-drivers-14.9-r2 !=x11-drivers/ati-drivers-14.12 !<=app-emulation/emul-linux-x86-opengl-20140508
+RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5 !=media-libs/mesa-10.3.7-r1 !<x11-proto/glproto-1.4.17-r1 !<x11-base/xorg-server-1.16.4-r1 !=x11-base/xorg-server-1.16.4-r3 !~x11-base/xorg-server-1.17.0 !=x11-base/xorg-server-1.17.1 !<x11-drivers/ati-drivers-14.9-r2 !=x11-drivers/ati-drivers-14.12 !<=app-emulation/emul-linux-x86-opengl-20140508
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mgorny/dist/opengl.eselect-1.3.1.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fa1ab305a4f3b2529c96b2feb98dba10
+_md5_=ed647d08270bd9ec906201184c95566f
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
index de2fc6b4e819..9a4f3e1d20b8 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=5
 HOMEPAGE=http://www.gentoo.org
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ottxor/dist/eselect-wxwidgets-20140423.tar.xz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7023a531929a9c1f6392c7e40c4ea1bc
+_md5_=c140560432998dd3aba278387ea66afa
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
index 8d01ae9a951b..c68ccc309fad 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r1
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=77725f0a5a5146546b54bfe5cb8e8f0c
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r2 b/metadata/md5-cache/app-misc/bfm-1.2-r2
index 31d3cb444692..7945248cde19 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r2
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d96c2371fcb9997997678bdfe4194106
diff --git a/metadata/md5-cache/app-misc/dateutils-0.3.3 b/metadata/md5-cache/app-misc/dateutils-0.3.3
new file mode 100644
index 000000000000..c6631df9c704
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dateutils-0.3.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure test
+DEPEND=app-arch/xz-utils sys-libs/timezone-data
+DESCRIPTION=command line date and time utilities
+EAPI=5
+HOMEPAGE=http://hroptatyr.github.com/dateutils/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!sys-infiniband/dapl
+SLOT=0
+SRC_URI=https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.3.3.tar.xz
+_md5_=60c944a952364e4a1f5f29830ac376e6
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0-r1 b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
index fbb0c526cbec..8877e62e5ce1 100644
--- a/metadata/md5-cache/app-misc/freemind-0.9.0-r1
+++ b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b440744e578b14df818d7b19ebd05992
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.0-r1 b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
index fa7139fd37c9..79ae684778e2 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.0-r1
+++ b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f57e56c42154fac61feeaff7e31fd58
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1 b/metadata/md5-cache/app-misc/freemind-1.0.1
index 24d0bada386c..e4bced8570a5 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.1
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e72896ab34f170e889d38395ee6b80f
diff --git a/metadata/md5-cache/app-misc/jdictionary-1.8-r2 b/metadata/md5-cache/app-misc/jdictionary-1.8-r2
index 7e049ef62eff..a0ec15475f72 100644
--- a/metadata/md5-cache/app-misc/jdictionary-1.8-r2
+++ b/metadata/md5-cache/app-misc/jdictionary-1.8-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=13a7cf002aa52339344a382eacb75530
diff --git a/metadata/md5-cache/app-misc/jdictionary-1.8-r3 b/metadata/md5-cache/app-misc/jdictionary-1.8-r3
index a5b5db987d0e..d9e93503fa96 100644
--- a/metadata/md5-cache/app-misc/jdictionary-1.8-r3
+++ b/metadata/md5-cache/app-misc/jdictionary-1.8-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1bcc760bf29fc9187552fdd0ff516e5
diff --git a/metadata/md5-cache/app-misc/jitac-0.3.0 b/metadata/md5-cache/app-misc/jitac-0.3.0
index 9ec243f5e68e..2354b56474ef 100644
--- a/metadata/md5-cache/app-misc/jitac-0.3.0
+++ b/metadata/md5-cache/app-misc/jitac-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/sun-jimi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.roqe.org/jitac/jitac-0.3.0.src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5013f2b50ebb8371b807cd711fe4e633
diff --git a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1 b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
index 9da1eaaeb9a3..ae2ed2d54868 100644
--- a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/java-gnome:4.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://research.operationaldynamics.com/projects/slashtime/dist/slashtime-0.5.13.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc57a57b04c5f0f13555838553788b9f
diff --git a/metadata/md5-cache/app-office/borg-1.7.4-r1 b/metadata/md5-cache/app-office/borg-1.7.4-r1
index b7039b873dd8..9c95f6c884e7 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4-r1
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 java-virtuals/javamail:0 >=virtual/jre-1.5 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ccbb92a370847961208435a81100e65
diff --git a/metadata/md5-cache/app-office/borg-1.7.4-r2 b/metadata/md5-cache/app-office/borg-1.7.4-r2
index 6125e0a2fb22..84df9d781764 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4-r2
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 java-virtuals/javamail:0 >=virtual/jre-1.5 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1ab48106c14e3c4ab0b2cb8db10b4e2
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.2 b/metadata/md5-cache/app-office/hourglass-0.7.2
index 4658960c8070..4d89505e23c5 100644
--- a/metadata/md5-cache/app-office/hourglass-0.7.2
+++ b/metadata/md5-cache/app-office/hourglass-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j dev-java/jcommon:1.0 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a3a9edc4bbafd253b91db7b4392ac83
diff --git a/metadata/md5-cache/app-office/wps-office-9.1.0.4961_alpha18_p1 b/metadata/md5-cache/app-office/wps-office-9.1.0.4961_alpha18_p1
new file mode 100644
index 000000000000..b9a5eb6ad985
--- /dev/null
+++ b/metadata/md5-cache/app-office/wps-office-9.1.0.4961_alpha18_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4
+DESCRIPTION=WPS Office is an office productivity suite
+EAPI=5
+HOMEPAGE=http://linux.wps.cn/
+IUSE=+sharedfonts X
+KEYWORDS=~amd64 ~x86
+LICENSE=WPS-EULA
+RDEPEND=dev-qt/qtwebkit:4 media-libs/tiff:3 app-arch/bzip2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi dev-libs/libxml2:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-libs/libpng:1.2 virtual/opengl media-libs/tiff:3 sys-apps/util-linux sys-libs/zlib x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXxf86vm media-libs/libmng net-print/cups net-nds/openldap dev-db/sqlite:3
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=x86? ( http://kdl.cc.ksosoft.com/wps-community/download/a18/wps-office_9.1.0.4961~a18p1_i386.deb ) amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/a18/wps-office_9.1.0.4961~a18p1_amd64.deb )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	font	b3239d2dc442d1717b9725e2be7cb5d6	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f0d637b4f163c86b7b81ce52fb00e4d7
diff --git a/metadata/md5-cache/app-text/epubcheck-1.1 b/metadata/md5-cache/app-text/epubcheck-1.1
index c6f2c2b8baae..e13765f48c34 100644
--- a/metadata/md5-cache/app-text/epubcheck-1.1
+++ b/metadata/md5-cache/app-text/epubcheck-1.1
@@ -9,5 +9,5 @@ LICENSE=MIT BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://epubcheck.googlecode.com/files/epubcheck-src-1.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb28736fe002941d248d8ee357d8912c
diff --git a/metadata/md5-cache/app-text/html-xml-utils-6.9 b/metadata/md5-cache/app-text/html-xml-utils-6.9
new file mode 100644
index 000000000000..418dc12001cd
--- /dev/null
+++ b/metadata/md5-cache/app-text/html-xml-utils-6.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=net-misc/curl
+DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
+EAPI=5
+HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=W3C
+RDEPEND=net-misc/curl
+SLOT=0
+SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-6.9.tar.gz
+_md5_=98a5c594a3ec854edc2f0220227a788a
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
index 10ce0a7ce12b..063db79bdbb7 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ b/metadata/md5-cache/app-text/jabref-2.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:0 dev-java/antlr:4 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=502701c6f364f629c30cb4754bb34cb9
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.10 b/metadata/md5-cache/app-text/jabref-bin-2.10
index d00ab796d437..866bb4992c70 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.10
+++ b/metadata/md5-cache/app-text/jabref-bin-2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54a7b357f2e2b8bc7293915cda14bf87
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2 b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
index 92453eed5a64..e57ff496e482 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11b2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78c1c0df6c75ba42760a338121914f3b
diff --git a/metadata/md5-cache/app-text/jing-20091111-r1 b/metadata/md5-cache/app-text/jing-20091111-r1
index eddf323dda37..11d79838d429 100644
--- a/metadata/md5-cache/app-text/jing-20091111-r1
+++ b/metadata/md5-cache/app-text/jing-20091111-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/saxon:9 dev-java/xalan:0 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jing-trang.googlecode.com/files/jing-20091111.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8af85ea14acb7480e97927f7b92e4f2d
diff --git a/metadata/md5-cache/app-text/jing-20091111-r2 b/metadata/md5-cache/app-text/jing-20091111-r2
index 9b93f194f70e..a775fd6f809b 100644
--- a/metadata/md5-cache/app-text/jing-20091111-r2
+++ b/metadata/md5-cache/app-text/jing-20091111-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/saxon:9 dev-java/xalan:0 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jing-trang.googlecode.com/files/jing-20091111.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41b9a9e0d622c7f77f2f2a3126a6d2a6
diff --git a/metadata/md5-cache/app-text/jmupdf-0.3.0 b/metadata/md5-cache/app-text/jmupdf-0.3.0
index 78b835dcdd4b..97a0c8c6804a 100644
--- a/metadata/md5-cache/app-text/jmupdf-0.3.0
+++ b/metadata/md5-cache/app-text/jmupdf-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-c
 REQUIRED_USE=!system-mupdf
 SLOT=0
 SRC_URI=https://jmupdf.googlecode.com/files/2012-01-24-src-jmupdf-0.3.0.7z
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=688d222cff7ad2f8db96b3c45f2fda58
diff --git a/metadata/md5-cache/app-text/jmupdf-0.4.1 b/metadata/md5-cache/app-text/jmupdf-0.4.1
index 33c5d24197d5..5de4de929afb 100644
--- a/metadata/md5-cache/app-text/jmupdf-0.4.1
+++ b/metadata/md5-cache/app-text/jmupdf-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-c
 REQUIRED_USE=!system-mupdf
 SLOT=0
 SRC_URI=https://jmupdf.googlecode.com/files/2012-02-23-source-jmupdf-0.4.1.7z
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0beee37b9cf98c56e99dfe142853c9ba
diff --git a/metadata/md5-cache/app-text/jmupdf-9999 b/metadata/md5-cache/app-text/jmupdf-9999
index 79f51f257e77..c6871749db44 100644
--- a/metadata/md5-cache/app-text/jmupdf-9999
+++ b/metadata/md5-cache/app-text/jmupdf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-config-2.2.0
 REQUIRED_USE=!system-mupdf
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b881e693c464199893f76dca2e09d9e6
diff --git a/metadata/md5-cache/app-text/jpdftweak-0.9-r1 b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
index 3fe1fcc73435..39d54dec18bf 100644
--- a/metadata/md5-cache/app-text/jpdftweak-0.9-r1
+++ b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/itext:0 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jpdftweak/jpdftweak-src-0.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb224198e6d185da74dedc4e8bf72161
diff --git a/metadata/md5-cache/app-text/refbase-0.9.5 b/metadata/md5-cache/app-text/refbase-0.9.5
index 2abc1f6c2d1e..c8fc64c2e9d1 100644
--- a/metadata/md5-cache/app-text/refbase-0.9.5
+++ b/metadata/md5-cache/app-text/refbase-0.9.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[mysql,session] app-admin/webapp-config app-text/bibutils =www-servers/apache-2* dev-lang/php >=app-admin/webapp-config-1.50.15
 SLOT=0.9.5
 SRC_URI=mirror://sourceforge/refbase/refbase-0.9.5.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=d8a54331b2f805008d2d55e717fc8fad
diff --git a/metadata/md5-cache/app-text/restview-2.4.0 b/metadata/md5-cache/app-text/restview-2.4.0
new file mode 100644
index 000000000000..7b640cf4c930
--- /dev/null
+++ b/metadata/md5-cache/app-text/restview-2.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/readme[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=reStructuredText viewer
+EAPI=5
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.python.org/pypi/restview
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/readme[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/r/restview/restview-2.4.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=78404f2397f7609a3ca4341a01d58d8e
diff --git a/metadata/md5-cache/app-text/t1utils-1.39 b/metadata/md5-cache/app-text/t1utils-1.39
index 2d03bdb657aa..d19cb55dc37c 100644
--- a/metadata/md5-cache/app-text/t1utils-1.39
+++ b/metadata/md5-cache/app-text/t1utils-1.39
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Type 1 Font utilities
 HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!<media-libs/freetype-1.4_pre20080316
 SLOT=0
 SRC_URI=http://www.lcdf.org/type/t1utils-1.39.tar.gz
-_md5_=1db591a96a672da5fb73649f67745cfd
+_md5_=8c32818a43545b62428ec32f03584c94
diff --git a/metadata/md5-cache/app-text/trang-20091111 b/metadata/md5-cache/app-text/trang-20091111
index f27a51f6cf78..6749513375b9 100644
--- a/metadata/md5-cache/app-text/trang-20091111
+++ b/metadata/md5-cache/app-text/trang-20091111
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jing-trang.googlecode.com/files/trang-20091111.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ecd94d5224f50ee42ee9f64f8a2f8cd9
diff --git a/metadata/md5-cache/app-text/trang-20091111-r1 b/metadata/md5-cache/app-text/trang-20091111-r1
index e45f683cdcfc..b5ab876e134e 100644
--- a/metadata/md5-cache/app-text/trang-20091111-r1
+++ b/metadata/md5-cache/app-text/trang-20091111-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jing-trang.googlecode.com/files/trang-20091111.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69fc8bfdd0fe0f0b5da410ade08d058f
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.2 b/metadata/md5-cache/app-text/xlsx2csv-0.7.2
new file mode 100644
index 000000000000..2186d12365a0
--- /dev/null
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Convert MS Office xlsx files to CSV
+EAPI=5
+HOMEPAGE=https://github.com/dilshod/xlsx2csv/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6b83dfc42380949d648d0f13ec792906
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1
index 75d43abf58bb..f2da4e0177c4 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[linguas_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=52e9eea099098a2bea66e1266a86ab37
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
index 16d0c9b6666e..1d0ebef0b4c1 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[linguas_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8725d02f001b095066a7949a6cbedea1
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index 7f5a0339ade3..132b046892fe 100644
--- a/metadata/md5-cache/dev-db/apgdiff-1.4
+++ b/metadata/md5-cache/dev-db/apgdiff-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6a463bdd6a4d1f39606cb46015cc7cc
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
index 00037a45f69f..6f35a01080ee 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.1
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ec885903f28dadd690c0f758a98fe75
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
index 999e0d6c3901..436c238b5ceb 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.2
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bddd2ba04e7f90d9059f6e187f79e34
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
index 67ff27594803..7194031e4636 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.3
+++ b/metadata/md5-cache/dev-db/apgdiff-2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.3-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8634c3fcb1d80b55e849b31e37814d13
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.4 b/metadata/md5-cache/dev-db/apgdiff-2.4
index 76b1378a6283..8aeb6edeecb3 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.4
+++ b/metadata/md5-cache/dev-db/apgdiff-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4a5ff0a11a95bb7c519f44b0486969
diff --git a/metadata/md5-cache/dev-db/db-je-3.3.75 b/metadata/md5-cache/dev-db/db-je-3.3.75
index 5f03e03ae784..45c0f584d9b7 100644
--- a/metadata/md5-cache/dev-db/db-je-3.3.75
+++ b/metadata/md5-cache/dev-db/db-je-3.3.75
@@ -8,5 +8,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.3
 SRC_URI=http://download.oracle.com/berkeley-db/je-3.3.75.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=955bf968a069434479934036d89d77ed
diff --git a/metadata/md5-cache/dev-db/derby-10.10.1.1 b/metadata/md5-cache/dev-db/derby-10.10.1.1
index f3e24a320e86..a835b17e18ed 100644
--- a/metadata/md5-cache/dev-db/derby-10.10.1.1
+++ b/metadata/md5-cache/dev-db/derby-10.10.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/db/derby/db-derby-10.10.1.1/db-derby-10.10.1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ec6114622e3741247e6d77a77f46f5e
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8 b/metadata/md5-cache/dev-db/henplus-0.9.8
index 65454e99705c..7ea90cbb1c28 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7795c30a0d98ce1e534bf27e96a85df
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8-r1 b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
index 41439267a171..bbf52a4870c2 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8-r1
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8fe7d5b4deb805a472b793c4af660bc9
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3
index a94554eb6ec0..71611f7fa57c 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08b9b00a4bbeae8b1df8e0df4faa8594
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
index 536cb6dbe3fe..0bd10317b785 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f448683f64c852ef07506d8d6c7aca3
diff --git a/metadata/md5-cache/dev-db/hyperdex-1.7.0 b/metadata/md5-cache/dev-db/hyperdex-1.7.1
similarity index 92%
rename from metadata/md5-cache/dev-db/hyperdex-1.7.0
rename to metadata/md5-cache/dev-db/hyperdex-1.7.1
index b6b58b6a1d0c..ad63de1f9ebc 100644
--- a/metadata/md5-cache/dev-db/hyperdex-1.7.0
+++ b/metadata/md5-cache/dev-db/hyperdex-1.7.1
@@ -10,6 +10,6 @@ RDEPEND=dev-cpp/glog dev-cpp/sparsehash dev-libs/cityhash dev-libs/libpo6 dev-li
 REQUIRED_USE=test? ( python )
 RESTRICT=test
 SLOT=0
-SRC_URI=http://hyperdex.org/src/hyperdex-1.7.0.tar.gz http://dev.gentooexperimental.org/~patrick/autotools-java.tar
+SRC_URI=http://hyperdex.org/src/hyperdex-1.7.1.tar.gz http://dev.gentooexperimental.org/~patrick/autotools-java.tar
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=966a4c13d29d1885287f59438c9a5f4c
+_md5_=e2eb50858c2d3d044126d9649dc541d6
diff --git a/metadata/md5-cache/dev-db/jxtray-0.5-r4 b/metadata/md5-cache/dev-db/jxtray-0.5-r4
index a18e657823e3..c86c9746c5be 100644
--- a/metadata/md5-cache/dev-db/jxtray-0.5-r4
+++ b/metadata/md5-cache/dev-db/jxtray-0.5-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/jdom-1.0:1.0 >=dev-java/kunststoff-2.0.2:2.0 dev-java/poi:0 dev-java/sax:0 >=dev-java/xerces-2.7:2 dev-java/xml-commons:0 firebird? ( dev-java/jdbc-jaybird:0 ) mssql? ( >=dev-java/jtds-1.2:1.2 ) mysql? ( dev-java/jdbc-mysql:0 ) postgres? ( dev-java/jdbc-postgresql:0 ) !firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql:0 ) ) ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jxtray/jxtray-src-0.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8a27c5120685db11f299d9d1ea76a08
diff --git a/metadata/md5-cache/dev-db/octopus-3.0.1-r3 b/metadata/md5-cache/dev-db/octopus-3.0.1-r3
index 1f1863c77ac0..6ecb2af4acfc 100644
--- a/metadata/md5-cache/dev-db/octopus-3.0.1-r3
+++ b/metadata/md5-cache/dev-db/octopus-3.0.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/xerces-2.7 >=dev-java/log4j-1.2.8 =dev-java
 RESTRICT=test
 SLOT=3.0
 SRC_URI=http://download.forge.objectweb.org/octopus/octopus-3.0-1.src.tar.gz mirror://gentoo/octopus-xmls-3.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bffaba1c5f1aebdb126c7a39aecfae2
diff --git a/metadata/md5-cache/dev-db/octopus-3.0.1-r4 b/metadata/md5-cache/dev-db/octopus-3.0.1-r4
index 7bd21c12c718..4f96a964a68a 100644
--- a/metadata/md5-cache/dev-db/octopus-3.0.1-r4
+++ b/metadata/md5-cache/dev-db/octopus-3.0.1-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/xerces-2.7 >=dev-java/log4j-1.2.8 =dev-java
 RESTRICT=test
 SLOT=3.0
 SRC_URI=http://download.forge.objectweb.org/octopus/octopus-3.0-1.src.tar.gz mirror://gentoo/octopus-xmls-3.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65e944f4aa9e562a263a76c2b9847054
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10 b/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10
index 8be183d8d7fc..0296db488214 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.0.10.10
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.0.10.10-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=3da4c55317846667dd7f19b946f173aa
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3 b/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3
index cf9b602f42fa..31df6f205efd 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.2.13.3
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.2.13.3-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=89bbc512032c7a560cfe50a6bb45b43e
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.3.12 b/metadata/md5-cache/dev-db/phpmyadmin-4.3.12
index 4f44f4f4c8bf..913a98bab75a 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.3.12
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.3.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.3.12
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.3.12-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=9ed6f329a412d8df0f8fec75acececec
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1
index 597337ab4e3c..503da5c33c1d 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.3.13.1
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.3.13.1-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=5cfe37acbf74f060fbcf418c59143721
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1
index 131710a510c6..0179678d7099 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=4.4.6.1
 SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.4.6.1-all-languages.tar.xz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=cde1cbf422e426e447675f7f04f2b064
diff --git a/metadata/md5-cache/dev-db/postgresql-9.0.21 b/metadata/md5-cache/dev-db/postgresql-9.0.21
index 0c8cf2adcdfa..20a0b0f19a71 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.0.21
+++ b/metadata/md5-cache/dev-db/postgresql-9.0.21
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.0 !dev-db/postgresql-base:9.0 !dev-db/postgresql-server:9.0 selinux? ( sec-policy/selinux-postgresql )
 RESTRICT=test
 SLOT=9.0
 SRC_URI=mirror://postgresql/source/v9.0.21/postgresql-9.0.21.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fff9b365256fbd21bf0943203dba6015
+_md5_=b93699c27845b60f63cb0ea396466a10
diff --git a/metadata/md5-cache/dev-db/postgresql-9.1.17 b/metadata/md5-cache/dev-db/postgresql-9.1.17
index 6fcd666ed400..5c670ee9c1aa 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.1.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.1.17
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.1 !dev-db/postgresql-base:9.1 !dev-db/postgresql-server:9.1 selinux? ( sec-policy/selinux-postgresql )
 RESTRICT=test
 SLOT=9.1
 SRC_URI=mirror://postgresql/source/v9.1.17/postgresql-9.1.17.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d10cce3c308913e3be8289bde4c163ae
+_md5_=12a322cc071d8227e278f97c1b576081
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.12 b/metadata/md5-cache/dev-db/postgresql-9.2.12
index ac445c662fe9..75d81b4cb793 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.2.12
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.12
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.2
 SRC_URI=mirror://postgresql/source/v9.2.12/postgresql-9.2.12.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b820a77ec6c1128e673e2ae36c8f79ac
+_md5_=8078df8b67223dfd47c4a018d86dd54d
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.8 b/metadata/md5-cache/dev-db/postgresql-9.3.8
index 3061fbaca18b..e9f5b855ff57 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.8
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.3
 SRC_URI=mirror://postgresql/source/v9.3.8/postgresql-9.3.8.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=35f103d58f9fd8bfdc8aaee03e34a76e
+_md5_=3908c6c29c1c28fede4378a3df05f868
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.3 b/metadata/md5-cache/dev-db/postgresql-9.4.3
index b6da867b4520..39990e9ac71a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.3
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.3/postgresql-9.4.3.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2e990de360f7e16aa687fd6f21343be8
+_md5_=eaee86a313dc1b1681e549817c61e36f
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87 b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
index 86bdc6c1d63b..97035a2ea177 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
+++ b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6.0 mssql? ( dev-java/jtds:1.2 ) mysql? ( dev-java/jdbc-
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-3.2.20.09.87-no-jre.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80f0e68414ba756cd704b23ea21a6a5b
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21 b/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
index b72da3c989f9..9d06029d1765 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
+++ b/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7.0 dev-java/java-config:2 mssql? ( dev-java/jtds:1.2 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-4.0.2.15.21-no-jre.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12f1ef6436454e810d4eca18f8196238
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
index 441e682496e3..ed806132fbcc 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff37b2713fc007c22f14578769356722
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
index 5117c0e85ae4..238152f1e923 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef0de40ffc137d803c8645001d9f8ad1
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2 b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
index 6d56ffec8fb9..3aecde79b6ad 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk-7u4-stripped.zip http://www.frijters.net/ikvmsrc-7.1.4532.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=146ff4ab6201b884338f84848005bf6f
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1 b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
index 8653e493c310..2bb54e9d6e11 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/ui
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=http://arduino.googlecode.com/files/arduino-1.0.5-src.tar.gz mirror://gentoo/arduino-icons.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d73ee37c320b21e2dd260951de179a3
diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta
index 347387c8e533..b5e99a90dcad 100644
--- a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta
+++ b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 CDDL )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/absolutelayout-6.7_beta.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2f81db8aa3831ee39fd68a32107a08a
diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1 b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
index 3cfb63af0ae6..7d6ab880d654 100644
--- a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
+++ b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 CDDL )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/absolutelayout-6.7_beta.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=01cad5a3ec9174102d9a83be06361d02
diff --git a/metadata/md5-cache/dev-java/annogen-0.1.0 b/metadata/md5-cache/dev-java/annogen-0.1.0
index 38c2feb6f6dd..7a4f70153e62 100644
--- a/metadata/md5-cache/dev-java/annogen-0.1.0
+++ b/metadata/md5-cache/dev-java/annogen-0.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.5 java-virtuals/stax-api:0 dev-java/ant-core:0 java-virtuals/jdk-with-com-sun:0 >=dev-java/qdox-1.6:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dist.codehaus.org/annogen/distributions/annogen-0.1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a5dd80927029bb78feb38905f3e029c
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.8.2 b/metadata/md5-cache/dev-java/ant-antlr-1.8.2
index c137f3a90f8f..e6c777c4c18c 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.5-r3:0[java] >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e6777db764b8a39b88c454fdfd94cac
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.8.4 b/metadata/md5-cache/dev-java/ant-antlr-1.8.4
index 480bae5880ea..b8835d788f3c 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.5-r3:0[java] >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb1c6388d8f2e535b84e9f504ba7863a
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.1
index 5b6d67c022a6..40a366fd0548 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.5-r3:0[java] >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b595ce4c34e2e125626895f84526c7b
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2
index b47e7d019540..a36492a54443 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.5-r3:0[java] >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b2bc7c5a6a018fb0223a85f75746b56
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2
index 0d5f15e207be..726e24e4fe07 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b7e455911ac6c8f0b440d34ef22005a
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4
index a7d9f218f427..e38c049a04a0 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a20cbb91a65f4ef7ac02c2405c1240f
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1
index b1f0494f55b9..90805eeed695 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=732b0e36b2be010d51b05bb8514bcb5f
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
index 69818e3237d6..b5f067df502e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f596c75ab813ad556dc019bb1bf3e58
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2
index edde03837c08..42c3cbe3cd1e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8c8d54d22db3570acce72c7ccff101b
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4
index 7b03c3dbff09..17dde07c4c1c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bebb5da82c05058a715e7fb5d1197c0
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1
index 9c8605798db0..4835fcd39d90 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c21fb7f3cdcfc15f02e38fb3db13855
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
index 42e4c5cfe93a..814037b2ff0c 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8ab4406ce6a476d654dd97caf7799a3
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2
index 743224ddef0c..ae3f39b347b1 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58bfaaeda9c74f1603df0a83ffa1f582
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4
index 58247cc484d7..203eae2d6a43 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6fe48ad27ef3b940a1c98645d7f6c8a6
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1
index e445cf382c3c..09246f1f0d48 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc0aa033e5de59bbb0542c3dc6ab517a
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
index f62eb63d2d69..4795cd718945 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2f98b7d6e66d10707da74fcef118168
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.2
index 20337aada2a3..2389225aa564 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0 ~dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d415379e2913ecba83450148b77ff74c
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.4
index b5206dde601f..1a77cda2540d 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0 ~dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f78f2b82ee9d5522c1da7374643d69dc
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.1
index e0ce39e7f0e3..fd5796b06197 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0 ~dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=86ffe8b42423dbea641ceb257699338a
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
index ff6d83babf04..536a133130bc 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0 ~dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bdb732f0879d37210004c06b7ebec41
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2
index aff2b1c883ae..2048d8b6b9fb 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=293b1b3f9779c6c82896c68d7213e4be
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4
index f2805e009495..a514fb54dca8 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=980317c91124863e6add2e93cb70af9d
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1
index 800997dcc2dd..0efbeff76b9b 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ab5ed521c76ebca5874b8baff1f21fa
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
index 09e313f13126..2eba3d27dfce 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=218c9d1890e0bb4b8646fdd19933c158
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2
index dd0d22a7df45..2dea0d033f3d 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e43db79007efa17a2fc1d6a8f29438ef
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4
index 511ddb23d61f..efca80d91a5e 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f9bb0de26e7c74f30859285be8222f37
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1
index d32773826eab..a07e1a65d76a 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=865d9d5640919d01618cbfcfa44ede46
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
index e8f39f80dda1..d076efc94550 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb216d98e404ef6b329bf7a462eb0590
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2
index bf11db14bd12..17fb4bcb6054 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0 >
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d26a997e72b84df10a39c4279e4819d
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4
index 4ca158b8eba6..f5cb64bec817 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0 >
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cad1c53a33925cf1dd7dee641e018c16
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1
index a6c63a9e9371..fd7c226d5079 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0 >
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8fcad632dd4ef41fade7899f32f9fca6
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
index bcaa50199d83..2842d2b30803 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d11ccfb111176c593d8084d099f92bc1
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.2
index 68b516a22c7f..4939c9e8ac63 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=788e99a90b23796940813cb9980cf119
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.4 b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.4
index 73a36410dc08..0b71a1ebb54c 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c84503ba053217998e97d05fb813035
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.1 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.1
index 478a9b58e618..1d5e52d9d1c0 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc59489f73c06fc1423185600d370d0a
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
index d2cf776aa3a1..251b64b6f4e3 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e30ab173b1b904d637d34a2fc8b9fde
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.8.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.8.2
index 9a3cef307637..1f3287f6f52c 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0dade70e190a5683537449a2270d4aa2
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.8.4 b/metadata/md5-cache/dev-java/ant-commons-net-1.8.4
index 261fcc07eb42..e6dadeb5d4fb 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=277b9967f30767d9fbe845bcca8d7126
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.1 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.1
index 45095744ef31..91eed684f640 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7466e4a68589f74e6f2ebf7638ad45cc
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
index 7b572f0bfe50..c5fbce354430 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=793fb2bf339c4b0b1273e12a5dab72b7
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
index 37ca1e609487..b57c0c184a68 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 >=dev-java/a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55ac83f0a2b9987d22287a526dfbf71a
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
index a52dfea8137a..92ecd7d54113 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1:0 dev-java/commons-httpclient:3 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=730a61ffa47d25f1b246511a45560051
diff --git a/metadata/md5-cache/dev-java/ant-core-1.7.1-r4 b/metadata/md5-cache/dev-java/ant-core-1.7.1-r4
index a0c3b4a5534b..f271682c201a 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.7.1-r4
+++ b/metadata/md5-cache/dev-java/ant-core-1.7.1-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 mirror://gentoo/ant-1.7.1-gentoo-r1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c65c7cf575eda45188cdf78632041c02
diff --git a/metadata/md5-cache/dev-java/ant-core-1.7.1-r5 b/metadata/md5-cache/dev-java/ant-core-1.7.1-r5
index 89356f22637f..cc46762ecbee 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.7.1-r5
+++ b/metadata/md5-cache/dev-java/ant-core-1.7.1-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.7.1-src.tar.bz2 mirror://gentoo/ant-1.7.1-gentoo-r2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8992d7f94bcbc05b330e916cf820625d
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.0-r1 b/metadata/md5-cache/dev-java/ant-core-1.8.0-r1
index 97f8377de9b1..f48ecc8b021e 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.0-r1
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 mirror://gentoo/ant-1.8.0-gentoo-r1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b86bb59fb2e45039a51b6a0c8d90132e
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.0-r2 b/metadata/md5-cache/dev-java/ant-core-1.8.0-r2
index de5cbdf50f6e..8066df585601 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.0-r2
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.0-src.tar.bz2 mirror://gentoo/ant-1.8.0-gentoo-r2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e58eba2189cbfc89a05e17d0d9e5348
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.1 b/metadata/md5-cache/dev-java/ant-core-1.8.1
index 75a3af1d4859..44c5441c8682 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.1
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.1-src.tar.bz2 mirror://gentoo/ant-1.8.1-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=353b6d1f2e5d9f7b3f470ff2374aa212
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.2 b/metadata/md5-cache/dev-java/ant-core-1.8.2
index 250f61a3bc1d..3c390bec64f0 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f35b22c84897b6d57bb31d8fa1b6055
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.4 b/metadata/md5-cache/dev-java/ant-core-1.8.4
index 53d28836b2ea..663fb0e10301 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d515f0bfc412a30218d16d108c606b54
diff --git a/metadata/md5-cache/dev-java/ant-core-1.8.4-r1 b/metadata/md5-cache/dev-java/ant-core-1.8.4-r1
index d359cd0af4ac..35a66a52ea03 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.8.4-r1
+++ b/metadata/md5-cache/dev-java/ant-core-1.8.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-r1-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e85d730f55a01621db1b5d57f1e5e6b5
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.1 b/metadata/md5-cache/dev-java/ant-core-1.9.1
index 79fdccb59ebc..b485e06f4f05 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.5 !dev-java/ant-tasks !dev-java/ant-optional >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=387e286c6bac3a2a61f1db2ccd41d22c
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index d2bdb1da4779..4b25da951454 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d2b36819eafb070dbc8ea805d1e9ab1
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1
index ca7dc54b8ed5..cc5da519496f 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.7.1 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecjsrc-3.7.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e96b5ef0992158c5e13632abc9f3b6c
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2
index 9f5dcb4efb02..1d344bd7854f 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.7.2 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/ecjsrc-3.7.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d867b0c59e12b2a9f0d816eb91450b79
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
index 5e7fe7c7c73e..efc043027428 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2.1 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f2fcdc5b69d887e4aab5ee031da7244
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1
index dfea0dcf6aba..29bbdc448e0b 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.6 ~dev-java/eclipse-ecj-4.4.1 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/ecjsrc-4.4.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d942f3f3b14743495843ba67b9e15e50
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
index 49a4f32768cc..c281be6199d2 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cd8c4565cf83deedcaa64c26bdc378f
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
index 1f3d4b8f92c9..f648a0994249 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/commons-cli-1* =dev-java/c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1483ead62abdfd5dfcaaca0db2c4c7e7
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
index 18896c1d702b..153231f50f8a 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccddb9391b7bb1fc5c2ddc75cc059e03
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.0.0 b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
index 5cd8894cdccc..012095972c2c 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.0.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/jakarta-oro:2.0 dev-java/
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.0.0/apache-ivy-2.0.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0ccd054c6450d3603c2ad5109ca4807
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0
index bb6f88ee8992..5705015aae56 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/bcpg:0 dev-java/bcpkix:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8aad1f3ed87446cda509f57643b7c91
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.8.2 b/metadata/md5-cache/dev-java/ant-jai-1.8.2
index a16d5315c5b9..82f48180a041 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0 ~dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b0a7f38e9411170dd79200659a252cce
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.8.4 b/metadata/md5-cache/dev-java/ant-jai-1.8.4
index d5152f97e53c..fbd8d7f14c39 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-jai-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0 ~dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da3ffcf7c19bc2ba666608598819e3cd
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.1 b/metadata/md5-cache/dev-java/ant-jai-1.9.1
index 7779b038c0e1..4f5bf00b9c7d 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0 ~dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1600c0983216c05a7b68348319849eb
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.2 b/metadata/md5-cache/dev-java/ant-jai-1.9.2
index 61cd21633b31..67d240d0df92 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0 ~dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3017ed570febd1cba333ff49a41d7444
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.8.2 b/metadata/md5-cache/dev-java/ant-javamail-1.8.2
index c1d7a0f4d9eb..1c5a1d12c5fc 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail java-virtuals/jaf >=dev-java/java-config-2.2.0 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9cbdcd9cc33e4a930c9ec2e8fb45cff9
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.8.4 b/metadata/md5-cache/dev-java/ant-javamail-1.8.4
index c4a8665df012..606027a91eeb 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail java-virtuals/jaf >=dev-java/java-config-2.2.0 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ecd650931d03c17823d92276a400bd6
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.1 b/metadata/md5-cache/dev-java/ant-javamail-1.9.1
index 75e49b8da810..4ebf85dbaaaa 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail java-virtuals/jaf >=dev-java/java-config-2.2.0 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=312c4d842eed53cb24d1ce78b0ddb044
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
index ab7f95a86ed8..f8269ba57767 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail java-virtuals/jaf >=dev-java/java-config-2.2.0 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8020209d29f23c57823b026717a84f00
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.8.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.8.2
index 3eb8c7330646..3266934a2ee6 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b010834cf7c4c4d4da01fc9c3f39bead
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.8.4 b/metadata/md5-cache/dev-java/ant-jdepend-1.8.4
index 93a04dcd90d8..3e3e49166206 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=147f514ffc4998dfc210c13cebaeb50d
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.1 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.1
index 25777c74ebef..6e1f67fa0288 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7185e3a6c05b8ee09c61d50d520b3d98
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
index 8e81152f9ce7..66c0d9b56fe9 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c307727e28cae2993938cea8841f3fd2
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.8.2 b/metadata/md5-cache/dev-java/ant-jmf-1.8.2
index 498f3fba044f..1bfe129a133c 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=924e74ee7c50869507faf7b494349745
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.8.4 b/metadata/md5-cache/dev-java/ant-jmf-1.8.4
index a1c88e1ee360..823372f67818 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=138909b02da4999153dbface77bb272e
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.1 b/metadata/md5-cache/dev-java/ant-jmf-1.9.1
index f2e316dba38e..5da25b0378d7 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a36968c63758c800ef5a91fc3e06cf38
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.2 b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
index d818282b9583..844c18550d29 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=438d1bb62230a6c54f1068fd271e9a6f
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.8.2 b/metadata/md5-cache/dev-java/ant-jsch-1.8.2
index 2ba5fc9a926e..a35a788f2e8b 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7617aaf054f7a679d91f1ba8c68edcf
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.8.4 b/metadata/md5-cache/dev-java/ant-jsch-1.8.4
index 25cb3e59be7d..07ec45cd1b5c 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=841260f3c8459b899a7c6c4d463f7edc
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.1 b/metadata/md5-cache/dev-java/ant-jsch-1.9.1
index e6809ef3586d..094cd79ae5b3 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=606e45f3a5ef8f5e95d0efc17bfec0c2
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.2 b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
index 5ef68465343a..6c363220fffd 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6292434449cb126c1eab02712324058d
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.8.2 b/metadata/md5-cache/dev-java/ant-junit-1.8.2
index 2d1f791b2c71..b9fc2babc191 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff54567c23088c2b3167a5bd0aaa534d
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.8.4 b/metadata/md5-cache/dev-java/ant-junit-1.8.4
index de7458d64997..ab2f5db8b4ec 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-junit-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50fd4555935c6e3a39a10089bf98e42c
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.1 b/metadata/md5-cache/dev-java/ant-junit-1.9.1
index 3448c3aff7f7..8e92100e9b4a 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd7c6f68704649e5c7c8959f7dd51221
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index c3e0ee91eb67..0a7f3821b5cc 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffe5924d1a955af9061e208a19c17628
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.8.2 b/metadata/md5-cache/dev-java/ant-junit4-1.8.2
index d7b85f73f73c..3905ffead8d4 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.8.2 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43292a392aadbd142c95b08c274f6b4c
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.8.4 b/metadata/md5-cache/dev-java/ant-junit4-1.8.4
index c116550a638b..82bdbcd5c488 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.8.4 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8ebe259ec5d1789152c198c2869f9a4
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.1 b/metadata/md5-cache/dev-java/ant-junit4-1.9.1
index 9f34f178c89b..72dfebc56f78 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.1 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e58ed5915391fb43d0d0eb033ca0e6bb
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.2 b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
index 8dfa2ac09bbc..953788c632f0 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d10a225be21cea6f7a5c0c556169ba40
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.8.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
index 25fbfc30f0e0..8827cd847c36 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8456c64a2eedcb35ccbf9b493540d33
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.8.4 b/metadata/md5-cache/dev-java/ant-nodeps-1.8.4
index cbf75c621db4..c3f1e0301133 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29bf38a5a0ab79901ffb00e0d93c51ad
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.1 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.1
index 5660b01ce8c4..a5e2de49ca3a 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0c0c8f6af2a6a4b7ea676e6bb2831d8
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index ab5f14103554..d4a1ea5d5bee 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db3ad4febd64a3a18ca4f662427e0ac7
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.1-r12 b/metadata/md5-cache/dev-java/ant-owanttask-1.1-r12
index 5943cc18d6e0..44a5ee1d0bcc 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.1-r12
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.1-r12
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.gentoo.org/~karltk/java/distfiles/owanttask-1.1-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=53e56b9ea70a81a244e2445c0876d492
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
index e28dde8b45c1..fe931ada923d 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54ab6daf53a9c7baaf7d62a6d1df0e2b
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.8.2 b/metadata/md5-cache/dev-java/ant-swing-1.8.2
index c91fc5b7b283..cfbad3d1bf4f 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a65d9139af75eb3fc6be815a26a63c01
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.8.4 b/metadata/md5-cache/dev-java/ant-swing-1.8.4
index 9e6bdf59998e..d20de34f68b8 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-swing-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5bdb4f4cc2bf25d093e6bfb3e90e8757
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.1 b/metadata/md5-cache/dev-java/ant-swing-1.9.1
index 1adb5bfc7262..052cebec8af7 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea674e41d92f9e0d873e53d2c8164f14
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.2 b/metadata/md5-cache/dev-java/ant-swing-1.9.2
index d2079fb5984c..68211917ae24 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffdfa20dbd6790b377b1f6e7c642eeed
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.8.2 b/metadata/md5-cache/dev-java/ant-testutil-1.8.2
index d00c8f692553..4c3833d31929 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e56b18b2c0bd9288778ee7ed62f26d94
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.8.4 b/metadata/md5-cache/dev-java/ant-testutil-1.8.4
index 4b86693fc5f9..ac7c50f242cc 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e01bd3e50bfca78e8c3a61ff1d388b34
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.1 b/metadata/md5-cache/dev-java/ant-testutil-1.9.1
index 774db371f2fd..8628970db9e7 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e021bf6ec9a63a1257b9631ddc094bb
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.2 b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
index f9cbba3af44d..959d3c9b88e0 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33938c10012725b71646037b4ded16b1
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.8.2 b/metadata/md5-cache/dev-java/ant-trax-1.8.2
index 8b8070613911..faefe5ce351f 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.8.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bee67a7237fedea7852f2da2ccae4d1e
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.8.4 b/metadata/md5-cache/dev-java/ant-trax-1.8.4
index b18a17d6e2f6..b203917bcb9a 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.8.4
+++ b/metadata/md5-cache/dev-java/ant-trax-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.8.4:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.4-src.tar.bz2 http://dev.gentoo.org/~sera/distfiles/ant-1.8.4-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9dd3f4717f2149f76be244fd19902909
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.1 b/metadata/md5-cache/dev-java/ant-trax-1.9.1
index b9be8b4cc683..98a0c5da8ea1 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.1
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.1-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.1-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7bda89589c39a2fdb5896c4cbde8b1ce
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index 36e4c4ced3c9..630e5f98faa4 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 http://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea05039eda6e5a2825ce99b9f1ee9fe6
diff --git a/metadata/md5-cache/dev-java/antenna-1.0.2-r1 b/metadata/md5-cache/dev-java/antenna-1.0.2-r1
index 93284f1f45de..be3fe2199376 100644
--- a/metadata/md5-cache/dev-java/antenna-1.0.2-r1
+++ b/metadata/md5-cache/dev-java/antenna-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/antlr:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/antenna/antenna-src-1.0.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36322a1b77624b4eee96a2bfbab68f6a
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r2 b/metadata/md5-cache/dev-java/antlr-2.7.7-r2
index 6fb3fcdf612c..1df92ac2d928 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r2
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jdk-1.3 mono? ( dev-lang/mono ) >=dev-java/java-config-2.2.0 python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=949d24e3a6602e11edf4127c8b9f1049
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r5 b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
index ec61339a2389..15ef804d5eba 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r5
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r5
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[pyth
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e1679f9f635fccf9762436fd3ba9112
diff --git a/metadata/md5-cache/dev-java/antlr-3.1.3-r3 b/metadata/md5-cache/dev-java/antlr-3.1.3-r3
index e858fe2da5c4..4968bb79c57b 100644
--- a/metadata/md5-cache/dev-java/antlr-3.1.3-r3
+++ b/metadata/md5-cache/dev-java/antlr-3.1.3-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/stringtemplate-3.2:0 >=dev-java/antlr-2.7.7:0[java] gunit? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=http://www.antlr.org/download/antlr-3.1.3.tar.gz mirror://gentoo/antlr-3.1.3-generated.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b6633ce7ddfa49a6005ab7c63637509
diff --git a/metadata/md5-cache/dev-java/antlr-4.4 b/metadata/md5-cache/dev-java/antlr-4.4
index e19ceb0b4eda..53a169ba93fe 100644
--- a/metadata/md5-cache/dev-java/antlr-4.4
+++ b/metadata/md5-cache/dev-java/antlr-4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2:0 gunit? ( dev-java/junit:4 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.4.zip http://www.antlr3.org/download/antlr-3.5.2-complete-no-st3.jar http://www.antlr.org/download/antlr-4.3-complete.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec6241f0d5c2b2b7792cf7791d72625a
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index 84b85e9ae289..7594a8b45c65 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2441c1dffc30c98a51693939ba870d7e
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r3 b/metadata/md5-cache/dev-java/appframework-1.03-r3
index ae20be8ec3ea..fd2a4727fc1c 100644
--- a/metadata/md5-cache/dev-java/appframework-1.03-r3
+++ b/metadata/md5-cache/dev-java/appframework-1.03-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/swing-worker:0 >=dev-java/java-config-2.2.0 s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://appframework.dev.java.net/downloads/AppFramework-1.03-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=354b5af94614e07279c92cde9ed4acbd
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
index 10c5ff6688b1..748573e42f0c 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
@@ -9,5 +9,5 @@ LICENSE=Apple
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa016a3648dacdcdd80ee93278a26d26
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0 b/metadata/md5-cache/dev-java/apt-mirror-1.0
index 3b8166f30f4e..6c40a267b9fd 100644
--- a/metadata/md5-cache/dev-java/apt-mirror-1.0
+++ b/metadata/md5-cache/dev-java/apt-mirror-1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=118ab16e95a9bc26b852d58cdfd8c786
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1 b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
index c7539c95661f..8a6422bf3b3d 100644
--- a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
+++ b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8c32b36c5a1eb50b99fe32c129648e6
diff --git a/metadata/md5-cache/dev-java/args4j-2.32 b/metadata/md5-cache/dev-java/args4j-2.32
index 22b4e314e32e..f443167c396a 100644
--- a/metadata/md5-cache/dev-java/args4j-2.32
+++ b/metadata/md5-cache/dev-java/args4j-2.32
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.32/args4j-2.32-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5b87c52babb8cf507d27442a36907d0
diff --git a/metadata/md5-cache/dev-java/asm-1.4.3-r3 b/metadata/md5-cache/dev-java/asm-1.4.3-r3
index f502f97199dd..08962f15b98a 100644
--- a/metadata/md5-cache/dev-java/asm-1.4.3-r3
+++ b/metadata/md5-cache/dev-java/asm-1.4.3-r3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6831511f7b66c253e8131ff63e67a2cc
diff --git a/metadata/md5-cache/dev-java/asm-1.4.3-r4 b/metadata/md5-cache/dev-java/asm-1.4.3-r4
index 5a120f0d4c88..407944f28b0d 100644
--- a/metadata/md5-cache/dev-java/asm-1.4.3-r4
+++ b/metadata/md5-cache/dev-java/asm-1.4.3-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=432860aba7cb885070ae96ab7773e67e
diff --git a/metadata/md5-cache/dev-java/asm-1.5.3 b/metadata/md5-cache/dev-java/asm-1.5.3
index 56242979f9f0..deaeb05244d9 100644
--- a/metadata/md5-cache/dev-java/asm-1.5.3
+++ b/metadata/md5-cache/dev-java/asm-1.5.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=1.5
 SRC_URI=http://download.forge.objectweb.org/asm/asm-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad655425e72223ea7db18119ddf2b792
diff --git a/metadata/md5-cache/dev-java/asm-1.5.3-r1 b/metadata/md5-cache/dev-java/asm-1.5.3-r1
index 42390d9382ef..0faaa12198eb 100644
--- a/metadata/md5-cache/dev-java/asm-1.5.3-r1
+++ b/metadata/md5-cache/dev-java/asm-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=1.5
 SRC_URI=http://download.forge.objectweb.org/asm/asm-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=412d6c261b6f9302e3218534aceca41a
diff --git a/metadata/md5-cache/dev-java/asm-2.0-r1 b/metadata/md5-cache/dev-java/asm-2.0-r1
index 2d8b6f9e8b5c..adef9336dc4e 100644
--- a/metadata/md5-cache/dev-java/asm-2.0-r1
+++ b/metadata/md5-cache/dev-java/asm-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/asm/asm-2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b57ad437f52b002b10d1e025cb39b1ff
diff --git a/metadata/md5-cache/dev-java/asm-2.2.3-r1 b/metadata/md5-cache/dev-java/asm-2.2.3-r1
index 06dd7b9a6da1..efa765cbc5c0 100644
--- a/metadata/md5-cache/dev-java/asm-2.2.3-r1
+++ b/metadata/md5-cache/dev-java/asm-2.2.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=2.2
 SRC_URI=http://download.forge.objectweb.org/asm/asm-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9a0515a0be2389f6396eb11dcf9001c
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1 b/metadata/md5-cache/dev-java/asm-3.3.1
index 11b7e873ac70..001bb3d39f0a 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00e60010675123ac9d4578109559fffc
diff --git a/metadata/md5-cache/dev-java/asm-4.0 b/metadata/md5-cache/dev-java/asm-4.0
index 1fc32bf10baf..3629b0596ac7 100644
--- a/metadata/md5-cache/dev-java/asm-4.0
+++ b/metadata/md5-cache/dev-java/asm-4.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf1fd020ba3b7aa714cdb90a362ea2a1
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index c2909eceb07c..2b54e3e4e1b4 100644
--- a/metadata/md5-cache/dev-java/asm-5.0.3
+++ b/metadata/md5-cache/dev-java/asm-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.3.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ac81da769fb7e77f0e54026945b050e
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1 b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
index 8b78c86b1a75..05f96dc1eca7 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> aspectj-1.7.3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49e1d8b8d0878b50920bb5468585f64b
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.4 b/metadata/md5-cache/dev-java/aspectj-1.7.4
index 6af87e118a6b..f3d01ed6ff34 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.4
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.4
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:4 dev-java/commons-logging:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.4-src.jar&r=1 -> aspectj-1.7.4-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8f5f22821c238e7eee94817cf17f30e
diff --git a/metadata/md5-cache/dev-java/aspectwerkz-2.0 b/metadata/md5-cache/dev-java/aspectwerkz-2.0
index f64239e31358..89cfd7e3e59d 100644
--- a/metadata/md5-cache/dev-java/aspectwerkz-2.0
+++ b/metadata/md5-cache/dev-java/aspectwerkz-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:1.5 dev-java/concurrent-util:0 dev-java/d
 RESTRICT=test
 SLOT=2
 SRC_URI=http://dist.codehaus.org/aspectwerkz/distributions/aspectwerkz-2.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab04c1cee9ed8f2ea4f7230654f31255
diff --git a/metadata/md5-cache/dev-java/aspectwerkz-2.0-r1 b/metadata/md5-cache/dev-java/aspectwerkz-2.0-r1
index 9a497c620b0a..66c4e0ee7a5b 100644
--- a/metadata/md5-cache/dev-java/aspectwerkz-2.0-r1
+++ b/metadata/md5-cache/dev-java/aspectwerkz-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:1.5 dev-java/dom4j:1 dev-java/jrexx:0 dev
 RESTRICT=test
 SLOT=2
 SRC_URI=http://dist.codehaus.org/aspectwerkz/distributions/aspectwerkz-2.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f66791e65c35721d22a193240f1c4ee
diff --git a/metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3 b/metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3
index 3ffcefda50f8..9419d6fb5a63 100644
--- a/metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3
+++ b/metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:1.5 dev-java/concurrent-util:0 dev-java/d
 RESTRICT=test
 SLOT=2
 SRC_URI=http://dist.codehaus.org/aspectwerkz/distributions/aspectwerkz-2.0.RC2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19ace8874c7b78b1c45833427431c8e8
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
index 7d30bd458d2d..2ca25cdc8064 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d0b842678302c1f03163042cce57506
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
index 11328e1d4ffb..76010799b6c6 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f07f169311eccbcd540c113c6b6bdfc
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1 b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
index dbe01ac42f89..3ca2988d1c8f 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/avalon-framework:4.1 dev-java/log4j:0 java-virtuals/jaf:0 java-virtuals/javamail:0 java-virtuals/jms:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://apache/avalon/logkit/source/logkit-1.2.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0847de4cc3b7115c2a9b7c8cb924e3ed
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
index 20cb793f96ed..ee3f988ad10d 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/log4j java-virtuals/jms java-virtuals/javamail =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1897d8aaeaa4c41147576a93ab304f48
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
index ce0aa68ba3b2..3d8c77bcbcb9 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 java-virtuals/javamail:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ef3162febc7c2b809aa9e234c7c27d3
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
index d2880cc61c59..a3a89dc352ec 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=17913f06d24ebfa488ccebac33c948b3
diff --git a/metadata/md5-cache/dev-java/balloontip-1.2.1 b/metadata/md5-cache/dev-java/balloontip-1.2.1
index 410e5edaa9c0..6c83c4685f11 100644
--- a/metadata/md5-cache/dev-java/balloontip-1.2.1
+++ b/metadata/md5-cache/dev-java/balloontip-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/balloontip/downloads/download/balloontip_1.2.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad14c1b64e35edb2fb1b830c61387109
diff --git a/metadata/md5-cache/dev-java/base64-2.3.7 b/metadata/md5-cache/dev-java/base64-2.3.7
index fea60d07374e..84a2897dc9fd 100644
--- a/metadata/md5-cache/dev-java/base64-2.3.7
+++ b/metadata/md5-cache/dev-java/base64-2.3.7
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/iharder/base64/2.3/Base64-v2.3.7.zip -> base64-2.3.7.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36ccddc8293c1f3295dae3f89cc29abc
diff --git a/metadata/md5-cache/dev-java/batik-1.7-r3 b/metadata/md5-cache/dev-java/batik-1.7-r3
index c20f788076e6..02d1137bfca8 100644
--- a/metadata/md5-cache/dev-java/batik-1.7-r3
+++ b/metadata/md5-cache/dev-java/batik-1.7-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core >=dev-java/java-config-2.2.0
 SLOT=1.7
 SRC_URI=mirror://apache/xmlgraphics/batik/batik-src-1.7.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33db3a0e94bc793a74c92b204c2db927
diff --git a/metadata/md5-cache/dev-java/batik-1.8 b/metadata/md5-cache/dev-java/batik-1.8
index c6f44b274c3c..3c528d8fc84f 100644
--- a/metadata/md5-cache/dev-java/batik-1.8
+++ b/metadata/md5-cache/dev-java/batik-1.8
@@ -4,10 +4,10 @@ DESCRIPTION=Java based SVG toolkit
 EAPI=5
 HOMEPAGE=https://xmlgraphics.apache.org/batik/
 IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:1.5 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=1.8
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7962df543581bd46cb5ba01645df02d6
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4161ba56907f5995a63e5eeb90a9a0ff
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r2 b/metadata/md5-cache/dev-java/bcel-5.2-r2
index 32fc0a1d6230..200b991fc7c6 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2-r2
+++ b/metadata/md5-cache/dev-java/bcel-5.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/bcel/source/bcel-5.2-src.tar.gz findbugs? ( http://dev.gentoo.org/~fordfrog/distfiles/findbugs-bcel-5.2_p20070531.patch.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df9ac36d0101fed8fcdc619599385656
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index 7186430f19ad..7abb53a80158 100644
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ b/metadata/md5-cache/dev-java/bcel-6.0_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3699a06287399424912bffc88706f108
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r3 b/metadata/md5-cache/dev-java/bcmail-1.38-r3
index 53cff40994e5..423ab281753f 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r3
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/bcprov:1.38 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=027f0f5791ee359bdc3a9fe06c3646e8
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r2 b/metadata/md5-cache/dev-java/bcmail-1.45-r2
index b5b812b2ac5b..dc53029d6d01 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.45-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/bcprov:1.45 =dev-java/junit-3.8* dev-java/sun-jaf java-virtuals/javamail >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78202930496f3dab634bb04c4edd5867
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50 b/metadata/md5-cache/dev-java/bcmail-1.50
index ee3e2c8687cf..d7c131eeb109 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.50
+++ b/metadata/md5-cache/dev-java/bcmail-1.50
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] ~dev-java/bcpkix-1.50:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d9810c2f4c3af551d485909a1b3f107
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50 b/metadata/md5-cache/dev-java/bcpg-1.50
index 71176f39f19a..7d5c018bac18 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.50
+++ b/metadata/md5-cache/dev-java/bcpg-1.50
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] >=dev-java/java-config
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-150.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bbe07253dc03b1a8ae5d40a74d3f1935
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.50 b/metadata/md5-cache/dev-java/bcpkix-1.50
index dcae21ac9171..717760ccc0c8 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.50
+++ b/metadata/md5-cache/dev-java/bcpkix-1.50
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/bcprov-1.50:0[test?] >=dev-java/java-config
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcpkix-jdk15on-150.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ddbc1f25385724afcfc42ec0ef701f7
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r2 b/metadata/md5-cache/dev-java/bcprov-1.38-r2
index 82366082b64d..ba73a2cd68f6 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.38-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk14-138.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a081438656b36b30182768b56e4a32d8
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r3 b/metadata/md5-cache/dev-java/bcprov-1.38-r3
index 180f618f4810..d2c0e3627fd9 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.38-r3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk14-138.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a68b8ad4274459dd591c4f71c3a109ce
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40-r1 b/metadata/md5-cache/dev-java/bcprov-1.40-r1
index 0842b88dd01d..92f3d199b6d6 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.40-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.40-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.40
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15-140.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57f09edd62ae72dbb295a3f5929e14e0
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45 b/metadata/md5-cache/dev-java/bcprov-1.45
index 0682a5ac15f3..5bf1265aa0de 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.45
+++ b/metadata/md5-cache/dev-java/bcprov-1.45
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15-145.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=373f8cbcc715e1f94a6d755a5db56506
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45-r1 b/metadata/md5-cache/dev-java/bcprov-1.45-r1
index 81249757580f..8c3279c25dc1 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.45-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.45-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15-145.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10092944121b2b5950441a6b6976d9a5
diff --git a/metadata/md5-cache/dev-java/bcprov-1.48-r1 b/metadata/md5-cache/dev-java/bcprov-1.48-r1
index 86accae00af4..a90451df8a95 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.48-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.48-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.48
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-148.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56e02a3d90b297533741613b8cb6e82d
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r2 b/metadata/md5-cache/dev-java/bcprov-1.49-r2
index 53fa26e0fd50..19611455c5de 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.49-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.49-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ced11231d816f6eb92682ae8f34d658a
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r3 b/metadata/md5-cache/dev-java/bcprov-1.49-r3
index 96251359d73b..093e82bc5fd4 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.49-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.49-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.49
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c77f36d409c702375a48ad2c1fd7899
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50 b/metadata/md5-cache/dev-java/bcprov-1.50
index 8355221646c6..91c3060258cc 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50
+++ b/metadata/md5-cache/dev-java/bcprov-1.50
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afbcdbf57cf1f3fce87a81f26aaa5429
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45-r1 b/metadata/md5-cache/dev-java/bctsp-1.45-r1
index 1ac24b01e1c7..0a3b3da8208a 100644
--- a/metadata/md5-cache/dev-java/bctsp-1.45-r1
+++ b/metadata/md5-cache/dev-java/bctsp-1.45-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bctsp-jdk15-145.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24049aca44cc78924eb756c8d92b70c0
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1 b/metadata/md5-cache/dev-java/beansbinding-1.2.1
index 30c145407cd2..3f742fd75d95 100644
--- a/metadata/md5-cache/dev-java/beansbinding-1.2.1
+++ b/metadata/md5-cache/dev-java/beansbinding-1.2.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://beansbinding.dev.java.net/files/documents/6779/73673/beansbinding-1.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=836cac530807d84df10485fbf2ddc61d
diff --git a/metadata/md5-cache/dev-java/biojava-1.6 b/metadata/md5-cache/dev-java/biojava-1.6
index eb4a3fc1d536..eac0c9110390 100644
--- a/metadata/md5-cache/dev-java/biojava-1.6
+++ b/metadata/md5-cache/dev-java/biojava-1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/jgrapht:0 dev-java/commons-cli:1 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/bytecode:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.biojava.org/download/bj16/all/biojava-1.6-all.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbc5fedabaa5a3484757efbcd29ab299
diff --git a/metadata/md5-cache/dev-java/biojava-1.7 b/metadata/md5-cache/dev-java/biojava-1.7
index d29313919933..eca5fce530c5 100644
--- a/metadata/md5-cache/dev-java/biojava-1.7
+++ b/metadata/md5-cache/dev-java/biojava-1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/jgrapht:0 dev-java/commons-cli:1 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-collections:0 dev-java/bytecode:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.biojava.org/download/bj17/all/biojava-1.7-all.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa5d439873bcd8bf0f18a6da3dec2a4a
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r1 b/metadata/md5-cache/dev-java/blowfishj-2.14-r1
index 5abc9fd8978b..a5c7b77092be 100644
--- a/metadata/md5-cache/dev-java/blowfishj-2.14-r1
+++ b/metadata/md5-cache/dev-java/blowfishj-2.14-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b5972fe86a7d9e49d8af86a44b60bd98
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r2 b/metadata/md5-cache/dev-java/blowfishj-2.14-r2
index d28717e05b16..b2021507aad4 100644
--- a/metadata/md5-cache/dev-java/blowfishj-2.14-r2
+++ b/metadata/md5-cache/dev-java/blowfishj-2.14-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c41b40d1d14a21cbd890cdd04a0327bf
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
index a160a7acdd85..c3e4a9237d71 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/bndlib:0 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce70e86ed583c881dbf9c7a4cf09306e
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index 132057e31b5a..ac14ea25ab9d 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/os
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b8197b6d43219c0bbcb35872a84e896
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index cc40df716b73..664270bb2c0a 100644
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 >=dev-java/nekohtml-1.9.10:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18b95415a40a48f9a89613dd58835ef1
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3 b/metadata/md5-cache/dev-java/browserlauncher2-1.3
index 25f278ccb136..1b8862dee471 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66757fa96ffaa56fcfa05837c4d481a6
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index 90d5c62a2200..d7134c746378 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd7f04bf18af0bb39c470ddb2b4ff347
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r1 b/metadata/md5-cache/dev-java/bsf-2.4.0-r1
index 4b553a19e0d6..0447067c9e2e 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r1
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/xalan:0 python? ( >=dev-java/jython-2.1-r5:0 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cd91ca646c2e9b74bfd7a70078da530
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4 b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
index 83ea8e5ab99a..7c6652bd3cda 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 java-virtuals/servlet-api:3.0 readline? ( dev-java/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.beanshell.org/bsh-2.0b4-src.jar mirror://gentoo/beanshell-icon.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff56302cfbdc454ee1aa04ba1d02c779
diff --git a/metadata/md5-cache/dev-java/burlap-3.0.8-r3 b/metadata/md5-cache/dev-java/burlap-3.0.8-r3
index ef64da4be057..2abde8729e3c 100644
--- a/metadata/md5-cache/dev-java/burlap-3.0.8-r3
+++ b/metadata/md5-cache/dev-java/burlap-3.0.8-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 dev-java/hessian:3.0.8 dev-java/caucho-services:3.0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7
 SLOT=3.0
 SRC_URI=mirror://gentoo/burlap-3.0.8.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61ac948f9a8fb70a2159c9bcbb281685
diff --git a/metadata/md5-cache/dev-java/bytecode-20081007 b/metadata/md5-cache/dev-java/bytecode-20081007
index b39dff3eba2c..8c21bd04963d 100644
--- a/metadata/md5-cache/dev-java/bytecode-20081007
+++ b/metadata/md5-cache/dev-java/bytecode-20081007
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~serkan/distfiles/bytecode-20081007.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7663ce522d2933772407ca6e6ebd4081
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.10 b/metadata/md5-cache/dev-java/bytelist-1.0.10
index 936724fff17b..2aa979cf58ce 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.10
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jruby/bytelist/tarball/1.0.10 -> bytelist-1.0.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d790499e654e0c59191dd11f051f570
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.1.2 b/metadata/md5-cache/dev-java/c3p0-0.9.1.2
index 37f7620a5110..b399f7b5a62f 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.1.2
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=0
 SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.1.2.src.tgz mirror://gentoo/c3p0-0.9.1.2-codegen.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad1161d53e6c5649bab124f2bec3e457
diff --git a/metadata/md5-cache/dev-java/cacao-0.99.4 b/metadata/md5-cache/dev-java/cacao-0.99.4
index 0d98500de923..59d1b446b1c5 100644
--- a/metadata/md5-cache/dev-java/cacao-0.99.4
+++ b/metadata/md5-cache/dev-java/cacao-0.99.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e72fba2357c97504b1485e0a43bc8860
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index ea2a212a1076..86547ae88a21 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8003172fdab1d5663842b3f68de8d8fd
diff --git a/metadata/md5-cache/dev-java/castor-0.9.9.1-r7 b/metadata/md5-cache/dev-java/castor-0.9.9.1-r7
index 3b454c6a95bf..3aefcea44ad5 100644
--- a/metadata/md5-cache/dev-java/castor-0.9.9.1-r7
+++ b/metadata/md5-cache/dev-java/castor-0.9.9.1-r7
@@ -9,5 +9,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-logging-1.0.4 dev-java/jakarta-oro:2.0 dev-java/jakarta-regexp:1.3 dev-java/ldapsdk:4.1 dev-java/xerces:1.3 dev-java/cglib:3 java-virtuals/transaction-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=0.9
 SRC_URI=http://dist.codehaus.org/castor/0.9.9.1/castor-0.9.9.1-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00d3f8e1762de92e62f14222397a0f56
diff --git a/metadata/md5-cache/dev-java/castor-1.1.1-r3 b/metadata/md5-cache/dev-java/castor-1.1.1-r3
index c6ab9bf7399c..e4e99f52aa70 100644
--- a/metadata/md5-cache/dev-java/castor-1.1.1-r3
+++ b/metadata/md5-cache/dev-java/castor-1.1.1-r3
@@ -9,5 +9,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-logging =dev-java/jakarta-oro-2.0* =dev-java/jakarta-regexp-1.3* java-virtuals/transaction-api =dev-java/ldapsdk-4.1* dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://dist.codehaus.org/castor/1.1.1/castor-1.1.1-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e52dafe2221ee8668b45deb099557a03
diff --git a/metadata/md5-cache/dev-java/caucho-services-3.0.8-r2 b/metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
index 1062d9b07f5b..35009dde4519 100644
--- a/metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
+++ b/metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://gentoo/caucho-services-3.0.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e30c75cfb9465cdda20f0b52ae5ffc13
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
index 9e51e31f3e05..0326ca7ccd23 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af94e2333aff04ba50bd500c9e7a1f8c
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
index f07dac3dcc29..be4c4ccba908 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0
 SLOT=1.2
 SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56d8e9864900461e54baa7777db7a64e
diff --git a/metadata/md5-cache/dev-java/cglib-3.0 b/metadata/md5-cache/dev-java/cglib-3.0
index 25a7f8f1c749..ad31b71e48e4 100644
--- a/metadata/md5-cache/dev-java/cglib-3.0
+++ b/metadata/md5-cache/dev-java/cglib-3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-con
 RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3
 SRC_URI=mirror://sourceforge/cglib/cglib-src-3.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cb389deb0adceffa5e6a6d36ce516dc
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index 9ce4df31e5cc..81c97646a792 100644
--- a/metadata/md5-cache/dev-java/cglib-3.1
+++ b/metadata/md5-cache/dev-java/cglib-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87e051d4acdb72e092350cb941c3a7e7
diff --git a/metadata/md5-cache/dev-java/charva-1.1.4-r1 b/metadata/md5-cache/dev-java/charva-1.1.4-r1
index 493824f73d71..4a445277d694 100644
--- a/metadata/md5-cache/dev-java/charva-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/charva-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 sys-libs/ncurses dev-java/commons-logging:0 >=dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/charva/charva/charva-1.1.4/charva.zip -> charva-1.1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f0aea38382d3c8ad97e0c682c43a3e4
diff --git a/metadata/md5-cache/dev-java/classmate-0.9.0 b/metadata/md5-cache/dev-java/classmate-0.9.0
index 5d21138a5644..018e9639e5b2 100644
--- a/metadata/md5-cache/dev-java/classmate-0.9.0
+++ b/metadata/md5-cache/dev-java/classmate-0.9.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00f5fd93cdb9bf8d8be40b2938c489a5
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1 b/metadata/md5-cache/dev-java/cldc-api-1.1
index 7552d7af38ea..2cfe79b35103 100644
--- a/metadata/md5-cache/dev-java/cldc-api-1.1
+++ b/metadata/md5-cache/dev-java/cldc-api-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=1.1
 SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=213b93357b483c903497edcd4c3e653e
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1-r1 b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
index cba37d18cd2a..739f37c0ae6a 100644
--- a/metadata/md5-cache/dev-java/cldc-api-1.1-r1
+++ b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95cc4708d9ed0f20dfcf4fcad8db35dc
diff --git a/metadata/md5-cache/dev-java/cocoon-2.1.11 b/metadata/md5-cache/dev-java/cocoon-2.1.11
index 7c3bdb06a838..ce5cbb2c6f83 100644
--- a/metadata/md5-cache/dev-java/cocoon-2.1.11
+++ b/metadata/md5-cache/dev-java/cocoon-2.1.11
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/cocoon/cocoon-2.1.11-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6aee3c706cf9b84b3c80797cb0a001b5
diff --git a/metadata/md5-cache/dev-java/codemodel-2.1 b/metadata/md5-cache/dev-java/codemodel-2.1
index 0de04b0fa458..8bc4aee0db95 100644
--- a/metadata/md5-cache/dev-java/codemodel-2.1
+++ b/metadata/md5-cache/dev-java/codemodel-2.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jaxb.dev.java.net/2.1/JAXB2_src_20061211.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=399e7336e8ed53aa62c7d3145eaa2d95
diff --git a/metadata/md5-cache/dev-java/codemodel-2.1-r1 b/metadata/md5-cache/dev-java/codemodel-2.1-r1
index 12a48b2d84e1..1f86c4798fbd 100644
--- a/metadata/md5-cache/dev-java/codemodel-2.1-r1
+++ b/metadata/md5-cache/dev-java/codemodel-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.1/codemodel-2.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82ba14a93c21047c93c9de27e87eccb3
diff --git a/metadata/md5-cache/dev-java/codemodel-2.6 b/metadata/md5-cache/dev-java/codemodel-2.6
index 5c3eae2a817d..c1e405631114 100644
--- a/metadata/md5-cache/dev-java/codemodel-2.6
+++ b/metadata/md5-cache/dev-java/codemodel-2.6
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.6/codemodel-2.6-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c1665cb08cd7fcb1597abeb855adeb2
diff --git a/metadata/md5-cache/dev-java/cofoja-1.1_p150 b/metadata/md5-cache/dev-java/cofoja-1.1_p150
index cd3d56075b73..8565458ec315 100644
--- a/metadata/md5-cache/dev-java/cofoja-1.1_p150
+++ b/metadata/md5-cache/dev-java/cofoja-1.1_p150
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 >=dev-java/java-config-2.2.0 source? (
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/cofoja/cofoja-1.1_p150.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db779de588d99dcee289e4d36409c9e1
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r1 b/metadata/md5-cache/dev-java/colt-1.2.0-r1
index f024aa28ce0e..e18b3884b64f 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=colt
 RDEPEND=>=virtual/jre-1.4 >=dev-java/concurrent-util-1.3.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd168744a1bdc2ad1f3c8a8a1bef0a99
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r2 b/metadata/md5-cache/dev-java/colt-1.2.0-r2
index 3ec7a6ed038a..c2063827443d 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=colt
 RDEPEND=>=virtual/jre-1.4 >=dev-java/concurrent-util-1.3.4:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=737a2ed8221a80031c9b85ad37f7fca9
diff --git a/metadata/md5-cache/dev-java/commons-attributes-2.2-r2 b/metadata/md5-cache/dev-java/commons-attributes-2.2-r2
index d3e59fe4bf0d..8f1e50c3c7e4 100644
--- a/metadata/md5-cache/dev-java/commons-attributes-2.2-r2
+++ b/metadata/md5-cache/dev-java/commons-attributes-2.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/gjdoc:0 dev-java/qdox:1.6 dev-java/xjavadoc:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/attributes/source/commons-attributes-2.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f38c739ad1a1f75a14cf42070289c0cc
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.8.0 b/metadata/md5-cache/dev-java/commons-beanutils-1.8.0
index 40de43b182d1..247f39c997e4 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.8.0
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 !<=dev-java/commons-betwixt-0.7-r1:0.7 !dev-java/commons-beanutils-collections >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.8.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8fa2232dc33c2d064f4255bc2cdb27d
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.8.3 b/metadata/md5-cache/dev-java/commons-beanutils-1.8.3
index adf9323fcb54..7fac285a4d49 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.8.3
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.8.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.8.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=114374a9bf720a286d0e3130e16bbf16
diff --git a/metadata/md5-cache/dev-java/commons-betwixt-0.8 b/metadata/md5-cache/dev-java/commons-betwixt-0.8
index 524fd4e805da..03dc8be936b5 100644
--- a/metadata/md5-cache/dev-java/commons-betwixt-0.8
+++ b/metadata/md5-cache/dev-java/commons-betwixt-0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 >=dev-java/commons-logging-1.0.2:0 dev-java/commons-beanutils:1.7 >=dev-java/commons-digester-1.6:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.7
 SRC_URI=mirror://apache/commons//betwixt/source/commons-betwixt-0.8-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6d03eb0dcf2ecf106ffbe96d0e58514e
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.2 b/metadata/md5-cache/dev-java/commons-cli-1.2
index ea4cf46a82fa..af152f1b86dd 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.2
+++ b/metadata/md5-cache/dev-java/commons-cli-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4ccf936ba15fa529ea699f5fb46905
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index 834cd1dff837..1e73ca0a0370 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ b/metadata/md5-cache/dev-java/commons-codec-1.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e1aa7dc9d03c872f4a357aa994eef31
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1
index 9ac543cacd12..0ce4b3ab4579 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 test-framework? ( =dev-java/junit-3.8* ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f4967e4272fb4dc91e63a0880f8c387
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.4.1 b/metadata/md5-cache/dev-java/commons-compress-1.4.1
index 5e55672b2722..f4068e49b0e7 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.4.1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xz-java >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.4.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cad9ee3a72f811efd039d9867f517821
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.8.1 b/metadata/md5-cache/dev-java/commons-compress-1.8.1
index 3d14bb91fe2b..2bf8914553df 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.8.1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xz-java >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.8.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0438d4e849f71691000d03f177ef1959
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1 b/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
index c917a5b8bd2f..df708cc2866a 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xz-java >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.8.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b09755f8eecd9fc0ad0a9ce049b5d27e
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6 b/metadata/md5-cache/dev-java/commons-configuration-1.6
index b9ffa2c23ef1..89bd88386115 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/comm
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64d78c41932069e2e2c1428db0a0579f
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r1 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r1
index 74b6d69bdad1..517ca34c88bc 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r1
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/comm
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9377498d048b413528eba169904c0e05
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.15 b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
index 545f4e02f0b2..55f0e76b7d74 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.15
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=889452a80e3846560b357cab39d05d44
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.7 b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
index 995b8167da5d..d24b4b678af4 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.7
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.7-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d60d5bd59a43f1c118b64bdd994ad925
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.9 b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
index ea13a00cc949..9aa66dc20a57 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4bd8981c466b832bfbbb94515edce58
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2 b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
index 4c18486c2ac7..55afcd420c4c 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
+++ b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-pool:0 java-virtuals/transaction-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39caaf248e04277b2ad25a646c2cb564
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index 2491340292f8..eba9241e628b 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-2.1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool:2 java-virtuals/transaction-api:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03d2da68a48540307be7e8a7e48104af
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.1 b/metadata/md5-cache/dev-java/commons-dbutils-1.1
index f06f34dcb374..733617918e4c 100644
--- a/metadata/md5-cache/dev-java/commons-dbutils-1.1
+++ b/metadata/md5-cache/dev-java/commons-dbutils-1.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/dbutils/source/commons-dbutils-1.1-src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a02049a0513139e74a3977f0c2d2a4b9
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
index dc8bc41ded0e..4620ce8ffb8c 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c95d79ebe3250a107a2c15d37f7a41c9
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1 b/metadata/md5-cache/dev-java/commons-digester-2.1
index 042859c38a2e..a8f61fc9524b 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
 RESTRICT=test
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76921261e591e77a893d198675df9b82
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r1 b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
index d9b1ca13d135..334508adfede 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6134898c40be3bc4e62b31cddf4b884
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.4 b/metadata/md5-cache/dev-java/commons-discovery-0.4
index 2edb4bee22a7..b37daa2524ac 100644
--- a/metadata/md5-cache/dev-java/commons-discovery-0.4
+++ b/metadata/md5-cache/dev-java/commons-discovery-0.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4869dce88eaff16a8058b171d747cc0
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
index f6580077a4be..55820fb9815b 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58695e882f07fe028c5a5caffa0ac88d
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1 b/metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1
index 97fd11249ffd..8cf100c874e9 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6b619d9a3032284f45be3c4210ebc02
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.2.2 b/metadata/md5-cache/dev-java/commons-fileupload-1.2.2
index 8f843d96588e..653b8f383e1d 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.2.2
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.2.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78009bbcbec386403e05a20e85bce932
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 69c3a59641dc..91e3e7188d17 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4fea7be5d9e4dfeae46058af7ceabe08
diff --git a/metadata/md5-cache/dev-java/commons-grant-1.0 b/metadata/md5-cache/dev-java/commons-grant-1.0
index d16ca9d524ee..08feb4b23fd4 100644
--- a/metadata/md5-cache/dev-java/commons-grant-1.0
+++ b/metadata/md5-cache/dev-java/commons-grant-1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://jpackage/1.6/generic/free/SRPMS/jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f67747854f780cd99a90fbd05c95807a
diff --git a/metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2 b/metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2
index b0f824686042..c53bf9cacf90 100644
--- a/metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2
+++ b/metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/commons-collections dev-java/jdepend >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/distfiles/graph2-0.8.1.cvs20040118.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbbcfa01cd1353414f99ac1547b107eb
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1 b/metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1
index 1915769c300e..d28ba0d62a8b 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 dev-java/commons-logging >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/httpclient/source/commons-httpclient-2.0.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5947ae62383a0083331e5e809b1be51d
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1
index 7d9d8d9b639a..783848242751 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging dev-java/commons-codec >=dev-
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=77d0124614843c9cd29a9af0503df53f
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
index ff18a46be285..8c2c2a579f49 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Jakarta Commons HttpClient library
 EAPI=5
 HOMEPAGE=http://hc.apache.org/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-codec:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dafc3cf2ed4ce013031334788354eaca
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=43dfa8d8932098f67a99471dd474c389
diff --git a/metadata/md5-cache/dev-java/commons-io-2.0.1 b/metadata/md5-cache/dev-java/commons-io-2.0.1
index 92e1205380b5..9cf94409d7ef 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.0.1
+++ b/metadata/md5-cache/dev-java/commons-io-2.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a053a4878428fbc45e712a1f11c206a
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index 2b6d9452f9e7..c59e70ae048f 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.4
+++ b/metadata/md5-cache/dev-java/commons-io-2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b48fa4b9d2a988665e421bd3bce40630
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r5 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
index f1bd8de478a2..b8840d09ec60 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/commons-discovery:0 dev-java/commons-jexl:1.0 dev-java/commons-lang:0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/jakarta-jstl:0 dev-java/jaxen:1.1 dev-java/junit:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8fa1484a3653632e64a94907988a987
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r6 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r6
index ced5d7256c6a..34a5d18d60c4 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r6
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/commons-discovery:0 dev-java/commons-jexl:1.0 dev-java/commons-lang:0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/tomcat-jstl-spec:1.2.5 dev-java/jaxen:1.1 dev-java/junit:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b659b002ae8afe39175cb6963a924b5
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1 b/metadata/md5-cache/dev-java/commons-jexl-1.1
index 052dd8dfa788..34bebe0133d2 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-1.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging =dev-java/junit-3* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09d97691ad6e5b36f4cc2e3c1a766698
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
index 787c30270934..844c73ee164a 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18f79d8d63e94ab845b976bf3ec13c20
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3 b/metadata/md5-cache/dev-java/commons-jxpath-1.3
index 60f61e38577f..d3b4c39f99b1 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-beanutils:1.7 dev-java/servletapi:2.4 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=652ea0d185a188a87db8441cb1af2705
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
index 952851219023..7c7d4f81cabc 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 java-virtuals/servlet-api:2.5 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5108a36d79b75e5a334067e2ffb80a7d
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r2 b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
index 523fa1d53b8e..299f46ac3d39 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa2edba9a9b1ccc67f491060558eb8da
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6 b/metadata/md5-cache/dev-java/commons-lang-2.6
index 90c5c8016f87..c235d787f2cb 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7716fd9904e76d2a4096481a01e972f
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.1 b/metadata/md5-cache/dev-java/commons-lang-3.1
index 1d7caf7fbdb3..2a2a538a95fa 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d89956d5047090e3351a3a24e2f5154c
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.3.2 b/metadata/md5-cache/dev-java/commons-lang-3.3.2
index e459379076fc..8e4c6eead2e2 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.3.2
+++ b/metadata/md5-cache/dev-java/commons-lang-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.3
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=766202645814bf1099d7cfaa299e85ac
diff --git a/metadata/md5-cache/dev-java/commons-launcher-1.1-r1 b/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
index 65fda162d9a8..cd79ca386da2 100644
--- a/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
+++ b/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/launcher/source/commons-launcher-1.1-src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c6c7c9471584d29519a551e58b7a82b
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.1.1 b/metadata/md5-cache/dev-java/commons-logging-1.1.1
index d81017a7eb00..95ce58d5de88 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.1.1
+++ b/metadata/md5-cache/dev-java/commons-logging-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 avalon-logkit? ( dev-java/avalon-logkit:1.2 ) log4j? (
 RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b603d7cb5f56d2491f7a6e9a87c0a0cd
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2 b/metadata/md5-cache/dev-java/commons-logging-1.2
index 2858d5c0bead..53d1cd2339f7 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 avalon-logkit? ( dev-java/avalon-logkit:1.2 ) log4j? (
 RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=73befb196b002e6439b3769d2c041180
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r1 b/metadata/md5-cache/dev-java/commons-math-2.1-r1
index e673b9db6baa..cb518fcf2069 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0147c3dc4020ef90d621a000fa5ec57
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 3bdc80218ee9..0496c5d014a8 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.2
+++ b/metadata/md5-cache/dev-java/commons-math-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0bb51ddec42f50c2769216dc986d342a
diff --git a/metadata/md5-cache/dev-java/commons-modeler-2.0.1 b/metadata/md5-cache/dev-java/commons-modeler-2.0.1
index 40ad90da712f..f360c2562d45 100644
--- a/metadata/md5-cache/dev-java/commons-modeler-2.0.1
+++ b/metadata/md5-cache/dev-java/commons-modeler-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/mx4j-core:3.0 >=dev-java/commons-logging-1.0.3:0 commons-digester? ( >=dev-java/commons-digester-1.4.1:0 ) >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/modeler/source/commons-modeler-2.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c01cda3ba6f69c29592161a93ff971d
diff --git a/metadata/md5-cache/dev-java/commons-net-1.4.1-r1 b/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
index 15f4bd543614..c8c0a817b6ed 100644
--- a/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/jakarta-oro-2.0.8-r2 >=dev-java/java-config
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/net/source/commons-net-1.4.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ffbd280d7b02401b823cb2a23cc448e
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index 19046968ed4d..e8ad4af43f53 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.2
+++ b/metadata/md5-cache/dev-java/commons-net-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c5057178c755ecb4b2fe30b6820773a
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index 6af9274d8ba7..068a4a68fd45 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7210df518c0c3c25c9349bf985754492
diff --git a/metadata/md5-cache/dev-java/commons-pool-2.2 b/metadata/md5-cache/dev-java/commons-pool-2.2
index f6a138f258a6..4220a4ab6a3e 100644
--- a/metadata/md5-cache/dev-java/commons-pool-2.2
+++ b/metadata/md5-cache/dev-java/commons-pool-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/pool/source/commons-pool2-2.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef8d77ad256bb4871d19d1a82d12d913
diff --git a/metadata/md5-cache/dev-java/commons-primitives-1.0-r2 b/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
index 97a90dc5fca2..a3e54c71f099 100644
--- a/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
+++ b/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/primitives/source/commons-primitives-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=adc76032f91474b9eaf0d805f64bb7d8
diff --git a/metadata/md5-cache/dev-java/commons-transaction-1.2 b/metadata/md5-cache/dev-java/commons-transaction-1.2
index a3f79b05d0ad..9ba42c0d94f8 100644
--- a/metadata/md5-cache/dev-java/commons-transaction-1.2
+++ b/metadata/md5-cache/dev-java/commons-transaction-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-codec:0 java-virtuals/transaction-api dev-java/log4j:0 dev-java/commons-logging:0 dev-java/glassfish-connector-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/transaction/source/commons-transaction-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be43f1b5dca24c0dbad9861c99508637
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.0 b/metadata/md5-cache/dev-java/commons-validator-1.4.0
index 848666a54d34..6bbaef1f481c 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=16f225cb1e6fcdcb48d9eacfbba220d5
diff --git a/metadata/md5-cache/dev-java/commons-vfs-1.0 b/metadata/md5-cache/dev-java/commons-vfs-1.0
index 4e9004077978..ecea476cd869 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-1.0
+++ b/metadata/md5-cache/dev-java/commons-vfs-1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging dev-java/commons-net =dev-java/commons-httpclient-3* dev-java/jsch dev-java/commons-collections dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/vfs/source/commons-vfs-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f55f07768852c00d9e99ed460bff67e
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
index d125ea378882..e30d000cdf21 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/commons-net-3.2:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f3e1393f873d4f7ca8ee51f615d7527
diff --git a/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1 b/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
index 54bf8390995c..e74c90b8e5d0 100644
--- a/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
+++ b/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain sun-concurrent-util MIT
 RDEPEND=>=virtual/jre-1.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-concurrent-util-1.3.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6130b9ff70d1fe8446ffb004141137b
diff --git a/metadata/md5-cache/dev-java/constantine-0.6 b/metadata/md5-cache/dev-java/constantine-0.6
index 649d77cb308f..11bd60a3d996 100644
--- a/metadata/md5-cache/dev-java/constantine-0.6
+++ b/metadata/md5-cache/dev-java/constantine-0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/constantine-0.6.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ced2efa01d605ec6ef8ef29169ecb4fc
diff --git a/metadata/md5-cache/dev-java/constantine-0.7 b/metadata/md5-cache/dev-java/constantine-0.7
index 46c1e087c107..5d4401d47298 100644
--- a/metadata/md5-cache/dev-java/constantine-0.7
+++ b/metadata/md5-cache/dev-java/constantine-0.7
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/constantine-0.7.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc1209ce705b3558dd59afc45c7dbb4c
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0 b/metadata/md5-cache/dev-java/cortado-0.6.0
index cb0c34be8ee9..d90fd75a9090 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a63289989e6f14efa7bd0043842e129
diff --git a/metadata/md5-cache/dev-java/cos-20021105-r3 b/metadata/md5-cache/dev-java/cos-20021105-r3
index 4d449e3eef9b..160418b4dd84 100644
--- a/metadata/md5-cache/dev-java/cos-20021105-r3
+++ b/metadata/md5-cache/dev-java/cos-20021105-r3
@@ -9,5 +9,5 @@ LICENSE=cos
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://servlets.com/cos/cos-05Nov2002.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e93fccfc77eb970b03d13a1780b42370
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
index f0308799b9b0..445a9d04d7b0 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/cpptasks-1.0b4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=583e69ec704d7cd0df98b813e2fe673c
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index fd96c6cd2923..ed57b89e1ae9 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5169c29685ca85aca980addb6121eb88
diff --git a/metadata/md5-cache/dev-java/css-validator-20120222 b/metadata/md5-cache/dev-java/css-validator-20120222
index 6326c72d14a8..c364417440c6 100644
--- a/metadata/md5-cache/dev-java/css-validator-20120222
+++ b/metadata/md5-cache/dev-java/css-validator-20120222
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.5 java-virtuals/servlet-api:2.5 dev-java/velocity dev-java/commons-lang:2.1 dev-java/tagsoup dev-java/jigsaw dev-java/xerces:2 dev-java/htmlparser >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/css-validator-20120222.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a6256c54a7ed3c3858dc2ad7531b78f
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.14 b/metadata/md5-cache/dev-java/cssparser-0.9.14
index dc041961705b..9dff94a9933e 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.14
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/sac:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.14-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56ce09afd6f1c4ba9832b5ce2383cb10
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.15 b/metadata/md5-cache/dev-java/cssparser-0.9.15
index d2e41d0bac13..bea7fb3fda11 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.15
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/sac:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.15-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d075c688ae21ae5745d00f0b5fcf4734
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index dbb15a96c0df..178777c6cda6 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk11-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk11-7.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f11bd091a90f2ab18a6d25e88a4d83e7
diff --git a/metadata/md5-cache/dev-java/db4o-jdk12-7.4 b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
index 66d9812ddb3d..1a5936b1df69 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk12-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk12-7.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c497c647a095dacf62780af5f2bcf58f
diff --git a/metadata/md5-cache/dev-java/db4o-jdk5-7.4 b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
index 8b32f09b21fa..a54f6917f041 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk5-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 dev-java/db4o-jdk12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk5-7.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5bc702203814137badcfb310cb9b8eb6
diff --git a/metadata/md5-cache/dev-java/dbunit-2.4.1 b/metadata/md5-cache/dev-java/dbunit-2.4.1
index f564063e9efe..948260a7ed5e 100644
--- a/metadata/md5-cache/dev-java/dbunit-2.4.1
+++ b/metadata/md5-cache/dev-java/dbunit-2.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/slf4j-nop dev-java/slf4j-api dev-java/poi:3.2 dev-java/commons-collections:0 dev-java/ant-core dev-java/junit >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbunit/dbunit-2.4.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb11b33190eb82cf4eb823e3329ccce3
diff --git a/metadata/md5-cache/dev-java/dbunit-2.4.5 b/metadata/md5-cache/dev-java/dbunit-2.4.5
index 9b769bcd03bc..1aeffbd8c6a8 100644
--- a/metadata/md5-cache/dev-java/dbunit-2.4.5
+++ b/metadata/md5-cache/dev-java/dbunit-2.4.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/slf4j-nop:0 dev-java/slf4j-api:0 dev-java/poi:3.2 dev-java/commons-collections:0 dev-java/ant-core:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dbunit/dbunit-2.4.5-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e9195ea19233e08f49c7e8dab3f9bfa
diff --git a/metadata/md5-cache/dev-java/dbus-java-2.7-r1 b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
index 1be0fc782b4f..c91ba6810d1b 100644
--- a/metadata/md5-cache/dev-java/dbus-java-2.7-r1
+++ b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/libmatthew-java-0.7-r1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9e779db80925ddf769ccbc5cee05a31
diff --git a/metadata/md5-cache/dev-java/disruptor-3.2.0 b/metadata/md5-cache/dev-java/disruptor-3.2.0
index 19c5f2287eca..1a3312f0cd2e 100644
--- a/metadata/md5-cache/dev-java/disruptor-3.2.0
+++ b/metadata/md5-cache/dev-java/disruptor-3.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/lmax/disruptor/3.2.0/disruptor-3.2.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=253f65ba3d1ddb210a1aede026a25a65
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index 83114d7be75b..e251c883ee5e 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.6
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=562f062f1231c0729cf3566168e1a0cd
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r4 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r4
index 1a230d231ecc..a5fabc9ff3f9 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r4
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r4
@@ -9,5 +9,5 @@ LICENSE=dom4j
 RDEPEND=dev-java/jaxme:0 dev-java/relaxng-datatype:0 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=758ed6a9e20957eeb6428bec9540d930
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
index ae26d473052e..763103eb0763 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
@@ -9,5 +9,5 @@ LICENSE=dom4j
 RDEPEND=>=virtual/jre-1.4 dev-java/jaxme:0 dev-java/jsr173:0 >=dev-java/msv-20050627-r2:0 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/relaxng-datatype:0 dev-java/xerces:2 >=dev-java/xsdlib-20050627-r2:0 dev-java/xml-commons-external:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f98cc3cd15559410c217cd4e8156a06
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2 b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
index a01a1f8ceff8..239567a5d1da 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-java/commons-io:1 dev-java/jsap:0 dev-java/log4j:0 dev-java/commons-collections:0 dev-java/colt:0 dev-java/fastutil:5.0 dev-java/commons-configuration:0 dev-java/commons-lang:2.1 dev-java/junit:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsiutils.dsi.unimi.it/dsiutils-1.0.10-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6702c3c35f1c3e7dfb888028a3f930a6
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r1 b/metadata/md5-cache/dev-java/dtdparser-1.21-r1
index 0c44f276a7be..8cccf8d63f8b 100644
--- a/metadata/md5-cache/dev-java/dtdparser-1.21-r1
+++ b/metadata/md5-cache/dev-java/dtdparser-1.21-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.21
 SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d98216a69372b8fa7d267a4124fd34c
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r2 b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
index 5b0e3d582977..7e85f0f5f46e 100644
--- a/metadata/md5-cache/dev-java/dtdparser-1.21-r2
+++ b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.21
 SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e06e0ba65bbbd47fdbbc9afa1d6bfef
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4 b/metadata/md5-cache/dev-java/dynalang-0.4
index e60f4ff7ca68..1bb17f699075 100644
--- a/metadata/md5-cache/dev-java/dynalang-0.4
+++ b/metadata/md5-cache/dev-java/dynalang-0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e40357316519476040e3663d0ef87ddb
diff --git a/metadata/md5-cache/dev-java/easymock-3.2-r1 b/metadata/md5-cache/dev-java/easymock-3.2-r1
index 5f06b6e3a2c1..1b6d2d0055d9 100644
--- a/metadata/md5-cache/dev-java/easymock-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-3.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock/3.2/easymock-3.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db2bd3916ad6f8b178a12ff2bc596960
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1 b/metadata/md5-cache/dev-java/easymock-3.3.1
index 5ccf5f0db126..a15d3a09832d 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock/3.3.1/easymock-3.3.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f28d460d5ed9ad94a80b3487b265dfcd
diff --git a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1 b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
index f158c1ce2d19..3eaa56481904 100644
--- a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e1d231e93e599475827607f5673215c
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index 38373c86f9c2..eab8000da651 100644
--- a/metadata/md5-cache/dev-java/easyneurons-2.3
+++ b/metadata/md5-cache/dev-java/easyneurons-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/colt:0 dev-java/appframework:0 dev-java/commons-collections:0 dev-java/absolutelayout:0 dev-java/jung:0 dev-java/xstream:0 ~dev-java/neuroph-2.3 dev-java/javahelp:0 dev-java/appframework:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c6f822f8cdf512af9590e896410eeb4
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
index 81133f7f542f..d1a7bc5bfbb8 100644
--- a/metadata/md5-cache/dev-java/echo2-2.1.1
+++ b/metadata/md5-cache/dev-java/echo2-2.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d649133047c8292dfee5654e73ab2c4e
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3 b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
index e81ce5aac6ab..f419fd86be34 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc[gcj] || ( app-eselect/eselect-java >=app-eselect/eselect-ecj-0.6 ) >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3ded586ce85069ff58c318de8ae2de7
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1 b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
index 19ed92c7c666..fe355c884035 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc[gcj] || ( app-eselect/eselect-java >=app-eselect/eselect-ecj-0.6 ) >=dev-java/java-config-2.2.0
 SLOT=3.6
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ec875ac10737f71fe30783325d47fa3
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2 b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
index bb83ab30ba98..1297bab1c048 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc[gcj] || ( app-eselect/eselect-java >=app-eselect/eselect-ecj-0.6 ) >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f91061a2d191c2b82818f48530a5bed
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
index 094255dc0012..2b180076a32f 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] || ( app-eselect/eselect-java >=app-eselect/eselect-ecj-0.6 ) >=dev-java/java-config-2.2.0
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11308a8026cd5771f765519c76719adc
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.1 b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.1
index 442fdf03ebb3..1e01ff013687 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.7.1 )
 RDEPEND=>=app-eselect/eselect-ecj-0.3 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/ecjsrc-3.7.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea507a2548ec7b02ef2d6cd6af954424
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1
index 09c4ca65ad48..84ce282c7c3f 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.7.2 )
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/ecjsrc-3.7.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=885ca84c69b7fa88e16070a39e257a79
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
index fa26a19df613..3f511e9cca86 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.2.1 )
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90ce01597d3d9d05adbb6075634f0a40
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.1
index 0776a3367cad..04793859b71b 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.4.1 )
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.1-201409250400/ecjsrc-4.4.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e10fdb1b499d46856aa32fef5f29f1e
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
index b405bac5c970..c4b7798e8ea6 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.4.2 )
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=265ebd8602e58eb1cc139380e77b5d94
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index 228db6edbb05..96e7b4788958 100644
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c74f6cd11c7039e12ddf74b05b031b05
diff --git a/metadata/md5-cache/dev-java/ecs-1.4.2-r1 b/metadata/md5-cache/dev-java/ecs-1.4.2-r1
index 141c59af3ecb..03737eb2f1e0 100644
--- a/metadata/md5-cache/dev-java/ecs-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/ecs-1.4.2-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/jakarta-regexp-1.3* >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b3caa0a51d920857d2e4a55bd961419
diff --git a/metadata/md5-cache/dev-java/ecs-1.4.2-r2 b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
index 71c693bec2bb..11b2f038cbe0 100644
--- a/metadata/md5-cache/dev-java/ecs-1.4.2-r2
+++ b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jakarta-regexp:1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0fb6d8ecd37bceb30a7d3d5355bd3215
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.0.4 b/metadata/md5-cache/dev-java/edtftpj-2.0.4
index bffe12e2b66f..eb9de0bd4599 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.0.4
+++ b/metadata/md5-cache/dev-java/edtftpj-2.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.0.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11c77a0a98b5f6afeed2b1ca25100a54
diff --git a/metadata/md5-cache/dev-java/ehcache-1.1-r1 b/metadata/md5-cache/dev-java/ehcache-1.1-r1
index 524570efd689..4a55dce65ff5 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.1-r1
+++ b/metadata/md5-cache/dev-java/ehcache-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections dev-java/concurrent-util dev-java/commons-logging >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc30836a93d3b79d1f66cffdc6ff59e1
diff --git a/metadata/md5-cache/dev-java/ehcache-1.1-r2 b/metadata/md5-cache/dev-java/ehcache-1.1-r2
index 656d3711e7e9..9986d1834591 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.1-r2
+++ b/metadata/md5-cache/dev-java/ehcache-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 dev-java/concurrent-util:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db517ade0e75885c01906e61b51b9f05
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r2 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r2
index 4fe3f7d271c0..2718ac0025da 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r2
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections dev-java/commons-logging ~dev-java/servletapi-2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ac9a24565c06fa1b8240b9fc1659ac2
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
index 3581c6f29d40..eea1bfa90be3 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc42b7eb539bebf19a7ea9955b822bc7
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
index 674caeed6184..41de14d65e89 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e84357f34c736278b178a6b99e30a9a5
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r2 b/metadata/md5-cache/dev-java/emma-2.0.5312-r2
index b2bdcefa40c5..1295f29cfbaa 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r2
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 launcher? ( !sci-biology/emboss ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9e29acb541645195882acbb50ff618a
diff --git a/metadata/md5-cache/dev-java/excalibur-logger-2.1-r2 b/metadata/md5-cache/dev-java/excalibur-logger-2.1-r2
index 82f44ba6bb2d..173bb9283510 100644
--- a/metadata/md5-cache/dev-java/excalibur-logger-2.1-r2
+++ b/metadata/md5-cache/dev-java/excalibur-logger-2.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/avalon-framework:4.2 dev-java/log4j:0 dev-java/servletapi:2.4 java-virtuals/javamail java-virtuals/jms >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/excalibur/excalibur-logger/source/excalibur-logger-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7f34484ddcd3a247ba926189d18ff4e
diff --git a/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2 b/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2
index 69286ce97b66..ba1ca80459d6 100644
--- a/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2
+++ b/metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2
@@ -9,5 +9,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.4 dev-java/cdegroot-db dev-java/commons-logging >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/exolabcore-20050205.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=053d92fce4f6ea886ca5d342b2fe02e2
diff --git a/metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1 b/metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1
index 8ca5635d378a..91cf66f71839 100644
--- a/metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1
+++ b/metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1
@@ -8,5 +8,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.4 =dev-java/jakarta-oro-2.0* dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/exolabtools-20050205.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=655cd4120c97a033298e9614202d59b9
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1 b/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1
index 8fa7e4cd0c67..ee64ed140d27 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://fi.dev.java.net/files/documents/2634/45735/FastInfoset_src_1.2.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f06a1c5e64f8eaa60cc2a25584ce8695
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2 b/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2
index aed29484f0dc..5403ecd08fd3 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://fi.dev.java.net/files/documents/2634/45735/FastInfoset_src_1.2.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=367894104beda5766e52cabf51ad41c4
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.11 b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
index 64b63ad2c401..3f6970a5c12c 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.11
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/sun/xml/fastinfoset/FastInfoset/1.2.11/FastInfoset-1.2.11-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24dc201915edf66d52af7561ecaa8b90
diff --git a/metadata/md5-cache/dev-java/fastutil-4.3.1-r1 b/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
index baa41f7ed41e..81899c14b4dc 100644
--- a/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
+++ b/metadata/md5-cache/dev-java/fastutil-4.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.3
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56cf50e2f5b31fd58ffc62ecc1851aa1
diff --git a/metadata/md5-cache/dev-java/fastutil-4.4.2-r1 b/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
index d5d6910ab612..cafa842d3a36 100644
--- a/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
+++ b/metadata/md5-cache/dev-java/fastutil-4.4.2-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.4.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1403ca7bb7727ff5a12826778419c330
diff --git a/metadata/md5-cache/dev-java/fastutil-5.1.3 b/metadata/md5-cache/dev-java/fastutil-5.1.3
index 647a6115e391..0ac4f32f0eb1 100644
--- a/metadata/md5-cache/dev-java/fastutil-5.1.3
+++ b/metadata/md5-cache/dev-java/fastutil-5.1.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-5.1.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba5f0fcb58acae8384e452b8a379bdf5
diff --git a/metadata/md5-cache/dev-java/fastutil-6.5.4 b/metadata/md5-cache/dev-java/fastutil-6.5.4
index 45257f8e4a77..bafaa2304e74 100644
--- a/metadata/md5-cache/dev-java/fastutil-6.5.4
+++ b/metadata/md5-cache/dev-java/fastutil-6.5.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-6.5.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c6b85563d28c604cafe2f56435cc571
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r1 b/metadata/md5-cache/dev-java/fec-1.0.4-r1
index 00248e49fef0..b02ca3dbc35a 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r1
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 dev-java/log4j dev-java/concurrent-util >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/fec-1.0.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=464d938bfdc8197768fcd95c92662672
diff --git a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6 b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
index af34f2efb8d7..379676a05862 100644
--- a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+++ b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/kxml:2 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e37dffaf04cf9c4cecc1fc9440e7cd8
diff --git a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0 b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
index 1852885cc07b..43a7c78054d2 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.command-0.12.0-project.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bb29424b8338ac2828681c64e5b1529
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0 b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
index 9c111981800d..30b0591d47ae 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7fd3190ab1070c2d6df56802fa74364
diff --git a/metadata/md5-cache/dev-java/felix-shell-1.4.3 b/metadata/md5-cache/dev-java/felix-shell-1.4.3
index 5e5bd198424a..fd543bf1530a 100644
--- a/metadata/md5-cache/dev-java/felix-shell-1.4.3
+++ b/metadata/md5-cache/dev-java/felix-shell-1.4.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f061154c35c4f8aadd1a586a5e7b298
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.2.0 b/metadata/md5-cache/dev-java/felix-utils-1.2.0
index 0ff175c47b31..f8e3a503b3c1 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.2.0
+++ b/metadata/md5-cache/dev-java/felix-utils-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9925843dfae053327625916ea49c346d
diff --git a/metadata/md5-cache/dev-java/flute-1.3-r1 b/metadata/md5-cache/dev-java/flute-1.3-r1
index f9fddea07c86..22ed46be95ce 100644
--- a/metadata/md5-cache/dev-java/flute-1.3-r1
+++ b/metadata/md5-cache/dev-java/flute-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.4 dev-java/sac >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.w3.org/2002/06/flutejava-1.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5caf5e8cd6858e616999ab8da3dc96d5
diff --git a/metadata/md5-cache/dev-java/flute-1.3-r2 b/metadata/md5-cache/dev-java/flute-1.3-r2
index 0ad9767eebf9..2d728a8e3d98 100644
--- a/metadata/md5-cache/dev-java/flute-1.3-r2
+++ b/metadata/md5-cache/dev-java/flute-1.3-r2
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.4 dev-java/sac >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.w3.org/2002/06/flutejava-1.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=380bc530f247638b22f8fd9cbf547a4d
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index 03c49359d7d3..86dd9c8b87d6 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -10,5 +10,5 @@ RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) >=dev-java/itext-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd32a4c0a7bc7a63f041299a679a1d92
diff --git a/metadata/md5-cache/dev-java/fontbox-0.1.0 b/metadata/md5-cache/dev-java/fontbox-0.1.0
index ac12518f8970..8fcfe920db9d 100644
--- a/metadata/md5-cache/dev-java/fontbox-0.1.0
+++ b/metadata/md5-cache/dev-java/fontbox-0.1.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/fontbox/FontBox-0.1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b9a05703a3991ca47423df0b4a2133ed
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1 b/metadata/md5-cache/dev-java/fontbox-1.7.1
index 741fb71483c0..f3d6c1634e65 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aee2d969301d3d19f9a53a85b541d708
diff --git a/metadata/md5-cache/dev-java/fop-0.95 b/metadata/md5-cache/dev-java/fop-0.95
index 3aa5313b48e7..7bd6be77d072 100644
--- a/metadata/md5-cache/dev-java/fop-0.95
+++ b/metadata/md5-cache/dev-java/fop-0.95
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-0.95-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fdee9d8c1b28f3f79e2645a25587a2c
diff --git a/metadata/md5-cache/dev-java/fop-1.1 b/metadata/md5-cache/dev-java/fop-1.1
index 79043a90b5e4..11b3c9936f86 100644
--- a/metadata/md5-cache/dev-java/fop-1.1
+++ b/metadata/md5-cache/dev-java/fop-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-1.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acefd3315995e230c04d6100f6dbb31c
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
index 1204fafcb9cd..3f1646a79921 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
@@ -8,5 +8,5 @@ LICENSE=Werken-1.1.1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=082c684dfc0b4b1608d499b5372d7088
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
index 893e16cb6590..02c1230dd4de 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
@@ -9,5 +9,5 @@ LICENSE=Werken-1.1.1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=262de47042a24fef00070808b5717eea
diff --git a/metadata/md5-cache/dev-java/freehep-export-2.1.1 b/metadata/md5-cache/dev-java/freehep-export-2.1.1
index f206ba9796f3..fd8a8c65ceb8 100644
--- a/metadata/md5-cache/dev-java/freehep-export-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-export-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-swing-2.0.3 dev-java/freehep-misc-deps dev-java/freehep-util >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-export/2.1.1/freehep-export-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb523fb87ab9f9e5b3cd4b3d2913b68f
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
index 8ff65b0eab7d..7dafec09034d 100644
--- a/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphics2d/2.1.1/freehep-graphics2d-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=252c9ccd2c138cdc49fe5683180d11e6
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
index fb31aa09c68d..167a6ae3752c 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphics2d-2.1.1 dev-java/freehep-export dev-java/freehep-io dev-java/freehep-util dev-java/freehep-swing >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio/2.1.1/freehep-graphicsio-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25f877f1fcbb17891ed501ec330aa91b
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
index fad7c695348f..650cc8046131 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.2 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/jdom dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-emf/2.1.1/freehep-graphicsio-emf-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8376e47a296d8c5248866df75289548
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
index 01305d38dfe8..50731d74c58f 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-java/2.1.1/freehep-graphicsio-java-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf17b62df0201ea97ad3b23dc0622cc5
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
index e3fc8f6461b7..11944f599be9 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-pdf/2.1.1/freehep-graphicsio-pdf-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ecadc09e99aa53e1fa463d77cdd9ace
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
index dcd7f183434f..93f2228b29e9 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-ps/2.1.1/freehep-graphicsio-ps-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae0dd35f410a9a57c985d045e771f4ef
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
index fd56c1e83ebb..e889c21747fd 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-xml >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-svg/2.1.1/freehep-graphicsio-svg-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=816c737ebc0a574d7e1246ce8b74f305
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
index fd4591cd82f0..c01d04883dc3 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-swf/2.1.1/freehep-graphicsio-swf-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=23de0bcfa80c4059896586822be0cd1f
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
index dca5780edfa4..6f587e9026ac 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-export >=dev-java/freehep-graphicsio-2.1.1 dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-tests/2.1.1/freehep-graphicsio-tests-2.1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=209a104723761a100ae8c97837373297
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.0.2 b/metadata/md5-cache/dev-java/freehep-io-2.0.2
index feca7a93183b..86c45039710b 100644
--- a/metadata/md5-cache/dev-java/freehep-io-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-io-2.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.1 dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-io/2.0.2/freehep-io-2.0.2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c166e65e72e83851b45ddb4ca233ff5
diff --git a/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1 b/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
index d7f25490ec37..14afc096428f 100644
--- a/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
+++ b/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-xdr-2.0.3 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-mcfio/2.0.1/freehep-mcfio-2.0.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd510bbb8d119320f6530553e27926fa
diff --git a/metadata/md5-cache/dev-java/freehep-misc-deps-0.1 b/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
index 2f71b58b054f..f8410192a832 100644
--- a/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
+++ b/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/netbeans/openide-lookup/1.9-patched-1.0/openide-lookup-1.9-patched-1.0.jar http://java.freehep.org/maven2/org/freehep/jas-plotter/2.2.3/jas-plotter-2.2.3.jar http://java.freehep.org/maven2/hep/aida/aida/3.3/aida-3.3.jar http://java.freehep.org/maven2/hep/testdata/hbook/JAS/1.0/JAS-1.0.hbook http://java.freehep.org/maven2/hep/testdata/hbook/pawdemo/1.0/pawdemo-1.0.hbook http://java.freehep.org/maven2/hep/testdata/hbook/rowwise/1.0/rowwise-1.0.hbook
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0c67d8787fe43c79c7100b6d31edcb9
diff --git a/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0 b/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
index 5ee1bd3d2ca7..a7680f7d7e14 100644
--- a/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
+++ b/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-swing-2.0.3 >=dev-java/freehep-xml-2.1.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-parameterdatabase/2.0/freehep-parameterdatabase-2.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba8697e7dd13a187b9602ad0f7ae0ca6
diff --git a/metadata/md5-cache/dev-java/freehep-record-2.0 b/metadata/md5-cache/dev-java/freehep-record-2.0
index b25f0976d7c6..74105d6f534f 100644
--- a/metadata/md5-cache/dev-java/freehep-record-2.0
+++ b/metadata/md5-cache/dev-java/freehep-record-2.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-record/2.0/freehep-record-2.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d5ceb5e0ae2266f557053d9aecd7aed
diff --git a/metadata/md5-cache/dev-java/freehep-rootio-2.0.9 b/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
index ee63de1bc1ae..e6de12a923d3 100644
--- a/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
+++ b/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/bcel-5.2 dev-java/freehep-misc-deps >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-rootio/2.0.9/freehep-rootio-2.0.9-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9742f97ece66d396f8ec17ae6f242fcc
diff --git a/metadata/md5-cache/dev-java/freehep-rtti-2.0.1 b/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
index 1421905d412e..e41a07b41ae6 100644
--- a/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
+++ b/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/bcel >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-rtti/2.0.1/freehep-rtti-2.0.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f97c9c4ac1d6b0dd0e3cf8e283d2fe15
diff --git a/metadata/md5-cache/dev-java/freehep-sio-2.0 b/metadata/md5-cache/dev-java/freehep-sio-2.0
index 6945992c5505..ca9a1fecc052 100644
--- a/metadata/md5-cache/dev-java/freehep-sio-2.0
+++ b/metadata/md5-cache/dev-java/freehep-sio-2.0
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-xdr-2.0.3 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-sio/2.0/freehep-sio-2.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d0b6077c2cc49fabb9b0e46e95d8e51
diff --git a/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2 b/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
index 4182feb7c724..b673a2d8f046 100644
--- a/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-mcfio-2.0.1 >=dev-java/junit-3.8.2 dev-java/freehep-xdr >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-stdhep/2.0.2/freehep-stdhep-2.0.2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=668f4cb6452cbca28a9312548f21431d
diff --git a/metadata/md5-cache/dev-java/freehep-swing-2.0.3 b/metadata/md5-cache/dev-java/freehep-swing-2.0.3
index 66cd266d03b1..3392d41278bc 100644
--- a/metadata/md5-cache/dev-java/freehep-swing-2.0.3
+++ b/metadata/md5-cache/dev-java/freehep-swing-2.0.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/junit >=dev-java/freehep-util-2.0.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-swing/2.0.3/freehep-swing-2.0.3-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1becacd9807e9129eb0bfa05afb0c72f
diff --git a/metadata/md5-cache/dev-java/freehep-util-2.0.2 b/metadata/md5-cache/dev-java/freehep-util-2.0.2
index d0d0d0559234..e8b718a14b7b 100644
--- a/metadata/md5-cache/dev-java/freehep-util-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-util-2.0.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-misc-deps dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-util/2.0.2/freehep-util-2.0.2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e06ab2fd442fa21d4e1f7f1c537c999
diff --git a/metadata/md5-cache/dev-java/freehep-xdr-2.0.3 b/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
index 1e830c1ef495..d4c937989011 100644
--- a/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
+++ b/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-xdr/2.0.3/freehep-xdr-2.0.3-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a094e2cdfa0369d403470c449bebbfac
diff --git a/metadata/md5-cache/dev-java/freehep-xml-2.1.2 b/metadata/md5-cache/dev-java/freehep-xml-2.1.2
index 6a5d681fad4a..b4a9dbecb033 100644
--- a/metadata/md5-cache/dev-java/freehep-xml-2.1.2
+++ b/metadata/md5-cache/dev-java/freehep-xml-2.1.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-io-2.0.2 >=dev-java/freehep-util-2.0.2 >=dev-java/freehep-swing-2.0.3 dev-java/jdom dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-xml/2.1.2/freehep-xml-2.1.2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b9e164ef40691ce0c6b5e185bba7291
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.13 b/metadata/md5-cache/dev-java/freemarker-2.3.13
index ddc697a07ba1..f38e9589f1aa 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.13
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.13
@@ -9,5 +9,5 @@ LICENSE=freemarker
 RDEPEND=>=virtual/jre-1.4 dev-java/javacc >=dev-java/jython-2.2:0 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b00eabd3a461881f61be345297a5725f
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.13-r1 b/metadata/md5-cache/dev-java/freemarker-2.3.13-r1
index bfd338879874..5868c5676794 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.13-r1
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.13-r1
@@ -9,5 +9,5 @@ LICENSE=freemarker
 RDEPEND=>=dev-java/jython-2.2:0 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3f5ee9f5235e945c330adc7355db490
diff --git a/metadata/md5-cache/dev-java/fscript-1.17 b/metadata/md5-cache/dev-java/fscript-1.17
index 15aba5bef0df..a6e831d40032 100644
--- a/metadata/md5-cache/dev-java/fscript-1.17
+++ b/metadata/md5-cache/dev-java/fscript-1.17
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85563cca48860c9fd8b8fb79d6d9bfe9
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
index dd74b115a073..6534476b6d07 100644
--- a/metadata/md5-cache/dev-java/fscript-1.17-r1
+++ b/metadata/md5-cache/dev-java/fscript-1.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76a98ae52f616f0dfffbdac4a6aaf219
diff --git a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2 b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
index c2bc49fe6080..eb6b87623f63 100644
--- a/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
+++ b/metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db7dcf790da5d0c4be848d69cb766045
diff --git a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
index 5047ded57663..8f3c9cc2acc5 100644
--- a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d06ba689819869d1c6675437cba3387f
diff --git a/metadata/md5-cache/dev-java/glassfish-deployment-api-1.2 b/metadata/md5-cache/dev-java/glassfish-deployment-api-1.2
index 8da3bcbec75a..f29aea1a44f2 100644
--- a/metadata/md5-cache/dev-java/glassfish-deployment-api-1.2
+++ b/metadata/md5-cache/dev-java/glassfish-deployment-api-1.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d23acaa55deb2e4e1866588a5d99c369
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index 2c227394991f..c3b323fb12cc 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ed245a50c1386343bc0a34195e59160
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index 7fa6882ddaa4..060afd5f9af6 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b3b67a56e4305342d7db17e52e66cbe2
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
index 45167125f596..6f936857e472 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c648904fc1e3f4a210297e3481e0c5ab
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
index c3d1f4a9d754..a8f03066fb34 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=17b73a169f6bcfdeabef1d77fbaf7bbc
diff --git a/metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44 b/metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44
index 5af453aa9d0c..24e34f974630 100644
--- a/metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44
+++ b/metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://download.java.net/javaee5/trunk/promoted/source/glassfish-v2-b44-src.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=45911c4515827b8ecba4d92eaff13a3a
diff --git a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
index 6c9fea7e93d5..932f0c152e3f 100644
--- a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
@@ -8,5 +8,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1c6378f71ccc39f9e43515095b8e07e
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index 207ce3e0a1a3..e92552c32ef2 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70e5b43d69d7e77d05d8700254e07c7e
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1 b/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
index a033e830e2b9..318e8675a3dc 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
+++ b/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://glazedlists.dev.java.net/files/documents/1073/38679/glazedlists-1.7.0-source_java15.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d1db685b32a8948bb2824ef9f62fcfa
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0 b/metadata/md5-cache/dev-java/glazedlists-1.8.0
index af13ff60a930..f64234714ac8 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fdc260499622916f4f32021b29ac721
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
index ec6726373204..bf389b6b521a 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.9-r2 ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf ) gjdoc? ( >=dev-java/antlr-2.7.1:0 ) gmp? ( >=dev-libs/gmp-4.2.4 ) gstreamer? ( >=media-libs/gstreamer-0.10.10:0.10 >=media-libs/gst-plugins-base-0.10.10:0.10 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.0 media-libs/freetype >=x11-libs/cairo-1.1.9 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) qt4? ( dev-qt/qtgui:4 ) xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=978a0c9932040a1d60c3f6083f691c71
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
index 8ef5756c5684..6d595ed3bf35 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0
 SLOT=1.0
 SRC_URI=mirror://gnu/classpath/inetlib-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff61e1518e90bfe7f94d80a9efc0c914
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
index eea4f08b22b6..bf89e53179f4 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0
 SLOT=1.1
 SRC_URI=mirror://gnu/classpath/inetlib-1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6492aa4f60b4a6fb7a322c02968f94a7
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
index 696c01cf346a..ba465f9c6c0d 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6acd7efa4ba52af86fc4238e7f2abd86
diff --git a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3 b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3
index e9b2819402fa..a059152e0a98 100644
--- a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3
+++ b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-logging:0 dev-java/commons-cli:1 java-virtuals/javamail:0 dev-java/java-getopt:1 dev-java/log4j:0 dev-java/concurrent-util:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-hylafax/gnu-hylafax/1.0.3/gnu-hylafax-1.0.3-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acba35882845f2260969adacfa08fe9b
diff --git a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1 b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1
index 79991c0417e5..3b9e3944b9f2 100644
--- a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-cli:1 java-virtuals/javamail:0 dev-java/java-getopt:1 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-hylafax/gnu-hylafax/1.0.3/gnu-hylafax-1.0.3-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa451d9472e5b029c77e9e33cbb94ce0
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
index cf5ede9a14b4..07d19c2a7e94 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd90d5bf9aab7ac03d4cedcdedeec12c
diff --git a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2 b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
index f9a578d420fb..bede0583e9c3 100644
--- a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
+++ b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 =dev-java/gnu-jaf-1* =dev-java/gnu-classpath-inetlib-1.0* !<=dev-java/mx4j-3.0.1 !<=dev-java/mx4j-3.0.1-r2 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/mail-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f86fd1d98fcd8bfb542f34f2b264094
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
index 65491db0bd9c..6e3434fb08df 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f812ec64449bc7722d94a313ad5aa5b3
diff --git a/metadata/md5-cache/dev-java/groovy-1.6.8 b/metadata/md5-cache/dev-java/groovy-1.6.8
index e7ba491de67c..c3194d5bfa11 100644
--- a/metadata/md5-cache/dev-java/groovy-1.6.8
+++ b/metadata/md5-cache/dev-java/groovy-1.6.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 !<dev-java/groovy-1.6.3 dev-java/asm:2.2 dev-java/antl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.6.8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87dc7fa572556c59ee1a0a67889f2de5
diff --git a/metadata/md5-cache/dev-java/groovy-1.7.10 b/metadata/md5-cache/dev-java/groovy-1.7.10
index 6eccba4cb91d..c886dd6de686 100644
--- a/metadata/md5-cache/dev-java/groovy-1.7.10
+++ b/metadata/md5-cache/dev-java/groovy-1.7.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 !<dev-java/groovy-1.6.3 >=dev-java/asm-3.2 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.7.10.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c915e47e04427dbd853950ee0cfd46ec
diff --git a/metadata/md5-cache/dev-java/groovy-1.7.5 b/metadata/md5-cache/dev-java/groovy-1.7.5
index 161fff66df83..4ed1b84d4084 100644
--- a/metadata/md5-cache/dev-java/groovy-1.7.5
+++ b/metadata/md5-cache/dev-java/groovy-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 !<dev-java/groovy-1.6.3 >=dev-java/asm-3.2 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.7.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ac7639c30ece46ea01c5a7204a18076a
diff --git a/metadata/md5-cache/dev-java/groovy-1.8.5 b/metadata/md5-cache/dev-java/groovy-1.8.5
index bde95174860d..eff0d98918be 100644
--- a/metadata/md5-cache/dev-java/groovy-1.8.5
+++ b/metadata/md5-cache/dev-java/groovy-1.8.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/asm-3.2 >=dev-java/ant-core-1.8.0 >=dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.8.5.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88cd97169ef80c5d485e36a771b0aef0
diff --git a/metadata/md5-cache/dev-java/groovy-1.8.5-r1 b/metadata/md5-cache/dev-java/groovy-1.8.5-r1
index 6daa02b49b74..b86aa6a4928c 100644
--- a/metadata/md5-cache/dev-java/groovy-1.8.5-r1
+++ b/metadata/md5-cache/dev-java/groovy-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/asm-3.2:3 >=dev-java/ant-core-1.8.0:0 >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.8.5.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4806ce499d0ecfea5cde242094ea96bc
diff --git a/metadata/md5-cache/dev-java/gson-2.3.1 b/metadata/md5-cache/dev-java/gson-2.3.1
index 363fc9798a6d..7baa832ba74f 100644
--- a/metadata/md5-cache/dev-java/gson-2.3.1
+++ b/metadata/md5-cache/dev-java/gson-2.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2.2
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b328d2098a8a86fa6e14301e1d9fdfda
diff --git a/metadata/md5-cache/dev-java/guava-07 b/metadata/md5-cache/dev-java/guava-07
index 81e53f6b07d5..cf2ad3c1fa56 100644
--- a/metadata/md5-cache/dev-java/guava-07
+++ b/metadata/md5-cache/dev-java/guava-07
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://guava-libraries.googlecode.com/files/guava-r07.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f4fc0e7b0fc0aecd187269df4939ad0
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1 b/metadata/md5-cache/dev-java/guava-13.0.1
index 7be82691f36a..5b7afacdfd99 100644
--- a/metadata/md5-cache/dev-java/guava-13.0.1
+++ b/metadata/md5-cache/dev-java/guava-13.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bea6efdcc3cf84e22124cf205f05d412
diff --git a/metadata/md5-cache/dev-java/guava-14.0.1 b/metadata/md5-cache/dev-java/guava-14.0.1
index 1e71b636cbec..07f365dae7d3 100644
--- a/metadata/md5-cache/dev-java/guava-14.0.1
+++ b/metadata/md5-cache/dev-java/guava-14.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=14
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/14.0.1/guava-14.0.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6d7fe8e33da38fd4dd0ee19fdc75ebd
diff --git a/metadata/md5-cache/dev-java/guava-15.0 b/metadata/md5-cache/dev-java/guava-15.0
index 96e613973eac..10864bfee130 100644
--- a/metadata/md5-cache/dev-java/guava-15.0
+++ b/metadata/md5-cache/dev-java/guava-15.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=15
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0/guava-15.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=764bbbf509291d4a3c2dbc23ace1864c
diff --git a/metadata/md5-cache/dev-java/guava-16.0.1 b/metadata/md5-cache/dev-java/guava-16.0.1
index 1c624190ca8a..a8f642007746 100644
--- a/metadata/md5-cache/dev-java/guava-16.0.1
+++ b/metadata/md5-cache/dev-java/guava-16.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=16
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/16.0.1/guava-16.0.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b0fc7f466cff085f34aea65bf7d8785
diff --git a/metadata/md5-cache/dev-java/guava-17.0 b/metadata/md5-cache/dev-java/guava-17.0
index 0ffddb757c66..6734443f9dd4 100644
--- a/metadata/md5-cache/dev-java/guava-17.0
+++ b/metadata/md5-cache/dev-java/guava-17.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=17
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/17.0/guava-17.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c4db1d5e87b3bf5bb1a746283add2254
diff --git a/metadata/md5-cache/dev-java/guava-18.0 b/metadata/md5-cache/dev-java/guava-18.0
index ca5a1545e487..5e6920a64787 100644
--- a/metadata/md5-cache/dev-java/guava-18.0
+++ b/metadata/md5-cache/dev-java/guava-18.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=18
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e75facbe8f747261b00559fc331f810f
diff --git a/metadata/md5-cache/dev-java/guice-2.0-r1 b/metadata/md5-cache/dev-java/guice-2.0-r1
index 6a2c2ad09280..b0baeb45a027 100644
--- a/metadata/md5-cache/dev-java/guice-2.0-r1
+++ b/metadata/md5-cache/dev-java/guice-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( virtual/jre:1.6 virtual/jre:1.7 ) dev-java/aopalliance:1 dev-java/a
 RESTRICT=test
 SLOT=2
 SRC_URI=http://google-guice.googlecode.com/files/guice-2.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6891b73516774617c14cfd54b34a8a5b
diff --git a/metadata/md5-cache/dev-java/guice-3.0-r1 b/metadata/md5-cache/dev-java/guice-3.0-r1
index c72b37f8bd89..9c6860cfc1f5 100644
--- a/metadata/md5-cache/dev-java/guice-3.0-r1
+++ b/metadata/md5-cache/dev-java/guice-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/aopalliance:1 dev-java/javax-inject:0 dev-jav
 RESTRICT=test
 SLOT=3
 SRC_URI=http://google-guice.googlecode.com/files/guice-3.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ce25c7eca1ca501eaee75571db21993
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1
index bf8b649a2d13..f92bd7060533 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b7cdfaeadf1975d5747a3bec6579c51
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.2 b/metadata/md5-cache/dev-java/hamcrest-core-1.2
index 239ba0377c1a..5c7718712a69 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.2
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=046c0ed19e77f4f5d38e0b363958d456
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3
index 5f236295de34..fde23fabb642 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af259f25cde414e1f24ac045ecf02c1b
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index 1c8b4255360a..30e088354f8d 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8287e9465e40c31ed43dabf8238248c
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.2 b/metadata/md5-cache/dev-java/hamcrest-generator-1.2
index f794ee6a2526..3865f0dbff10 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.2
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eeedf4b70eea9cce52f6e17d069119cd
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
index dfe299700d88..94f149fa02cf 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80c2e07f9a007b001f169fa49c2a2c1c
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 6d2e310b0a57..982adf11ca94 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d92dc0596bfffe4460a663299b02696
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.1 b/metadata/md5-cache/dev-java/hamcrest-library-1.1
index c6568b7401da..eaa5c4ab7cb4 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 dev-java/hamcrest-generator:0 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f408b591c00930a40e4b3daf43d8ae0
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
index 5fcc3146e6bf..82cf87e9f33b 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=http://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa2caab36aef0528752a5851dd2453fd
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
index ade2448a859c..59bf38866765 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1302e56c3b1f8ff315e5b4521ee4e86b
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index 228497a237a7..179b5249fef8 100644
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a7191aabe065eda5de51c9283390fad
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r1 b/metadata/md5-cache/dev-java/helpgui-1.1-r1
index e31e81b7735f..f1bbad447b4b 100644
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r1
+++ b/metadata/md5-cache/dev-java/helpgui-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33fcc80a55d02e9c6d69f1f8a36bec78
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
index 895343378918..f0b54a340810 100644
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r2
+++ b/metadata/md5-cache/dev-java/helpgui-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a70f9a3120223aa59bc8ddd62b87bf4
diff --git a/metadata/md5-cache/dev-java/hessian-3.0.20 b/metadata/md5-cache/dev-java/hessian-3.0.20
index a1857c7aa818..561a781f9566 100644
--- a/metadata/md5-cache/dev-java/hessian-3.0.20
+++ b/metadata/md5-cache/dev-java/hessian-3.0.20
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://hessian.caucho.com/download/hessian-3.0.20-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da89d1d15943273958d0c6d0c3f3c60e
diff --git a/metadata/md5-cache/dev-java/hessian-3.0.8-r5 b/metadata/md5-cache/dev-java/hessian-3.0.8-r5
index d5f5551732f8..840225e1fe38 100644
--- a/metadata/md5-cache/dev-java/hessian-3.0.8-r5
+++ b/metadata/md5-cache/dev-java/hessian-3.0.8-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 dev-java/caucho-services:3.0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.0.8
 SRC_URI=http://www.caucho.com/hessian/download/hessian-3.0.8-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e5cece64024835b9da7076b06f6498c
diff --git a/metadata/md5-cache/dev-java/hessian-3.1.6 b/metadata/md5-cache/dev-java/hessian-3.1.6
index 54976565b2ad..7c0c780c255e 100644
--- a/metadata/md5-cache/dev-java/hessian-3.1.6
+++ b/metadata/md5-cache/dev-java/hessian-3.1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=http://hessian.caucho.com/download/hessian-3.1.6-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2dd2d65205e028e8482478e0ab374048
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.3 b/metadata/md5-cache/dev-java/hessian-4.0.3
index 62905da0c9fa..156c061ea4cb 100644
--- a/metadata/md5-cache/dev-java/hessian-4.0.3
+++ b/metadata/md5-cache/dev-java/hessian-4.0.3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=http://hessian.caucho.com/download/hessian-4.0.3-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c27b04304bd4c00f8708b3e19a6e151
diff --git a/metadata/md5-cache/dev-java/hibernate-3.1.3-r4 b/metadata/md5-cache/dev-java/hibernate-3.1.3-r4
index b5d57615c1af..c6fbbe31df41 100644
--- a/metadata/md5-cache/dev-java/hibernate-3.1.3-r4
+++ b/metadata/md5-cache/dev-java/hibernate-3.1.3-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/antlr-2.7.7:0[java] dev-java/c3p0:0 dev-java/cglib:3 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/ehcache:0 dev-java/oscache:0 dev-java/proxool:0 dev-java/swarmcache:1.0 java-virtuals/transaction-api:0 dev-java/sun-jacc-api:0 dev-java/ant-core:0 dev-java/asm:2.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=3.1
 SRC_URI=mirror://sourceforge/hibernate/hibernate-3.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a78febd4b381e8269b211ccde2f06bd
diff --git a/metadata/md5-cache/dev-java/hibernate-annotations-3.2.0 b/metadata/md5-cache/dev-java/hibernate-annotations-3.2.0
index 192f476a3a60..a06aa9d7a209 100644
--- a/metadata/md5-cache/dev-java/hibernate-annotations-3.2.0
+++ b/metadata/md5-cache/dev-java/hibernate-annotations-3.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/lucene:1 dev-java/commons-logging:0 dev-java/dom4j:1 dev-java/glassfish-persistence:0 dev-java/hibernate:3.1 dev-java/lucene:2.1 >=dev-java/java-config-2.2.0
 SLOT=3.2
 SRC_URI=mirror://sourceforge/hibernate/hibernate-annotations-3.2.0.GA.tar.gz mirror://sourceforge/hibernate/hibernate-3.2.0.ga.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=066a3ada81044ad0e343b660b9f01a18
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r1 b/metadata/md5-cache/dev-java/higlayout-1.0-r1
index 5da80ca9b150..e4fabac09a7f 100644
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r1
+++ b/metadata/md5-cache/dev-java/higlayout-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c14ac13d720f7e96290b305b0138ee3
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r2 b/metadata/md5-cache/dev-java/higlayout-1.0-r2
index f7944ff23c4b..32e9c084d16f 100644
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r2
+++ b/metadata/md5-cache/dev-java/higlayout-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0dca83b7351170afaa7b14e1e5f4b42d
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0 b/metadata/md5-cache/dev-java/hoteqn-4.0.0
index a73e621425d3..8b0803528a17 100644
--- a/metadata/md5-cache/dev-java/hoteqn-4.0.0
+++ b/metadata/md5-cache/dev-java/hoteqn-4.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbb95cb88dc3e483a8f068b48ef45e25
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.4-r1 b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
index 8f02e8ef411c..22a946b7beba 100644
--- a/metadata/md5-cache/dev-java/htmlparser-1.4-r1
+++ b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://about.validator.nu/htmlparser/htmlparser-1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=adede91840dc65957469a87aaebcaad9
diff --git a/metadata/md5-cache/dev-java/htmlparser-org-1.6 b/metadata/md5-cache/dev-java/htmlparser-org-1.6
index 55c411ccbe18..d550670a116d 100644
--- a/metadata/md5-cache/dev-java/htmlparser-org-1.6
+++ b/metadata/md5-cache/dev-java/htmlparser-org-1.6
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlparser/htmlparser1_6_20060610.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=59a002aaddc789b7b827c9dada637a1c
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
index 4906bc79cbf1..681b57622a55 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.3[deprecated] dev-java/ehcache:1.2 dev-java/spymemcached:0 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.3
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.3.1-src.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/httpcomponents-client/httpcomponents-client-4.3.1-build.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c43413cf3973a55c991d3633cacc9992
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.2.4 b/metadata/md5-cache/dev-java/httpcomponents-core-4.2.4
index 65be53b35d73..411ccfe1c788 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.2.4
+++ b/metadata/md5-cache/dev-java/httpcomponents-core-4.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.2.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c25478d09bd9dd4ac59681118f203c40
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.3 b/metadata/md5-cache/dev-java/httpcomponents-core-4.3
index 303c57f111be..eb3396780d76 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.3
+++ b/metadata/md5-cache/dev-java/httpcomponents-core-4.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.3
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.3-src.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/httpcomponents-core/httpcomponents-core-4.3-build.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=37adc29e76a62dfea52ce7939d5e1eea
diff --git a/metadata/md5-cache/dev-java/httpunit-1.7 b/metadata/md5-cache/dev-java/httpunit-1.7
index 4a0865b39312..cc88c7d29ad9 100644
--- a/metadata/md5-cache/dev-java/httpunit-1.7
+++ b/metadata/md5-cache/dev-java/httpunit-1.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/junit-3.8:0 dev-java/rhino:1.6 dev-java/jtidy:0 java-virtuals/servlet-api:2.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/httpunit/httpunit-1.7.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fde376647b6ede324b40675e72dfb28
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
index 9a76ab4bdbc9..5da57c500212 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0.5
+++ b/metadata/md5-cache/dev-java/ical4j-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14b855f0314cfae5ab2f08df1a5dd19e
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0_beta2 b/metadata/md5-cache/dev-java/ical4j-1.0_beta2
index a82af1e9885e..f496939bcecf 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0_beta2
+++ b/metadata/md5-cache/dev-java/ical4j-1.0_beta2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging dev-java/commons-codec >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0-beta2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3de410bfaba027f3d4efaa7b8a1b9a99
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1 b/metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1
index e50a1cf30cc7..9bcdc1112fdb 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0-beta2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ec9775ff1d0b4bfcb97e010c80accf2
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.5 b/metadata/md5-cache/dev-java/icedtea-6.1.13.5
index 655943ce119a..e850fcd4b810 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.5
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.5
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( || ( dev-java/icedtea-web:0 >=dev-java/icedtea-web-1.3.2:6 )
 RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= >=media-libs/lcms-2.5 javascript? ( dev-java/rhino:1.6 ) kerberos? ( virtual/krb5 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5:2= >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.5.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b32-15_jul_2014.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=99fc48ca593f51939113d00f8cc07ab4
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.7 b/metadata/md5-cache/dev-java/icedtea-6.1.13.7
index ff504178f6bd..658fdb9556d3 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.7
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.7
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1
 RESTRICT=test
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.7.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b35-14_apr_2015.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-6.1.13-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-6.1.13-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=77e58a3b9379b452a8dda1c6b7094315
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.4.8 b/metadata/md5-cache/dev-java/icedtea-7.2.4.8
index fb535d435397..4e846c835f5e 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.4.8
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.4.8
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( || ( dev-java/icedtea-web:0[icedtea7] >=dev-java/icedtea-web
 RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= ) kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 !dev-java/icedtea:0 X? ( >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5:2= >=x11-libs/cairo-1.8.8:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXt >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.4.8.tar.xz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/archive/2b38d8f0e43f.tar.gz -> icedtea-2.4-openjdk-2b38d8f0e43f.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/corba/archive/58b31c5bf14e.tar.gz -> icedtea-2.4-corba-58b31c5bf14e.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxp/archive/95d394340fda.tar.gz -> icedtea-2.4-jaxp-95d394340fda.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jaxws/archive/bce4362b2996.tar.gz -> icedtea-2.4-jaxws-bce4362b2996.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk/archive/22d79652f370.tar.gz -> icedtea-2.4-jdk-22d79652f370.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/archive/6f93cec20d27.tar.gz -> icedtea-2.4-hotspot-6f93cec20d27.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/langtools/archive/43cdaf529543.tar.gz -> icedtea-2.4-langtools-43cdaf529543.tar.gz http://icedtea.classpath.org/download/drops/cacao/e215e36be9fc.tar.gz -> icedtea-2.4-cacao-e215e36be9fc.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz -> icedtea-2.4-jamvm-ac22c9948434e528ece451642b4ebde40953ee7e.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f697fa0c8effda9ce06e97e8e29e5b83
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.5.5 b/metadata/md5-cache/dev-java/icedtea-7.2.5.5
index 34eba39369ce..b9ae44994f1c 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.5.5
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.5.5
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 >=media-libs/libpng-1.
 RESTRICT=test
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.5.5.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/openjdk.tar.bz2 -> icedtea-2.5-openjdk-f8c87dd516ff.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/corba.tar.bz2 -> icedtea-2.5-corba-52db6f325d61.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxp.tar.bz2 -> icedtea-2.5-jaxp-80b5a93b1406.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jaxws.tar.bz2 -> icedtea-2.5-jaxws-3706d41e1476.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/jdk.tar.bz2 -> icedtea-2.5-jdk-fb9961d8dfda.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/langtools.tar.bz2 -> icedtea-2.5-langtools-3ffd17553e8c.tar.bz2 arm? ( http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/aarch64.tar.bz2 -> icedtea-2.5-aarch64-1939c010fd37.tar.bz2 ) arm64? ( http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/aarch64.tar.bz2 -> icedtea-2.5-aarch64-1939c010fd37.tar.bz2 ) !arm? ( !arm64? ( http://icedtea.classpath.org/download/drops/icedtea7/2.5.5/hotspot.tar.bz2 -> icedtea-2.5-hotspot-cac66550581b.tar.bz2 ) ) http://icedtea.classpath.org/download/drops/cacao/e215e36be9fc.tar.gz -> icedtea-2.5-cacao-e215e36be9fc.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-2.5-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=47c143ed6893f492f34854136d828e43
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index d2a33f02ccf1..20b1c5c76b5f 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58c69ee5e491a7bdca32171580b27c50
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
index d764d7548fda..7ae5b31db485 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=icedtea7? ( || ( dev-java/icedtea:7 dev-java/icedtea-bin:7 ) ) !icedtea7? ( || ( dev-java/icedtea:7 dev-java/icedtea-bin:7 dev-java/icedtea:6 dev-java/icedtea-bin:6 ) ) app-eselect/eselect-java tagsoup? ( dev-java/tagsoup ) nsplugin? ( >=dev-libs/glib-2.16 ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.5.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	java-vm-2	caa0212cf1c60716fd4b3ab09268be3e	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e1baa5d693c86a9fe3759bd2b36a4200
diff --git a/metadata/md5-cache/dev-java/icu4j-3.8.1-r1 b/metadata/md5-cache/dev-java/icu4j-3.8.1-r1
index ba631fb70c17..fb3b88ac7343 100644
--- a/metadata/md5-cache/dev-java/icu4j-3.8.1-r1
+++ b/metadata/md5-cache/dev-java/icu4j-3.8.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-src.jar doc? ( http://download.icu-project.org/files/icu4j/3.8.1/icu4j-3_8_1-docs.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9750398203b743793051e67a761c4d29
diff --git a/metadata/md5-cache/dev-java/icu4j-4.0.1.1 b/metadata/md5-cache/dev-java/icu4j-4.0.1.1
index 995e5000adf9..1f6fda49f0ec 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.0.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-4.0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test ) x86-fbsd? ( test )
 SLOT=4
 SRC_URI=http://download.icu-project.org/files/icu4j/4.0.1.1/icu4j-4_0_1_1-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.0.1.1/icu4j-4_0_1_1-docs.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d4c09e580ab5dc589094f7e69bf55f4
diff --git a/metadata/md5-cache/dev-java/icu4j-4.2.1.1 b/metadata/md5-cache/dev-java/icu4j-4.2.1.1
index d0034e151c88..b503b59562ba 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.2.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-4.2.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test ) x86-fbsd? ( test )
 SLOT=4.2
 SRC_URI=http://download.icu-project.org/files/icu4j/4.2.1.1/icu4j-4_2_1_1-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.2.1.1/icu4j-4_2_1_1-docs.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c5a24f4844b53df0e191f9eee0f9235f
diff --git a/metadata/md5-cache/dev-java/icu4j-4.4.1.1 b/metadata/md5-cache/dev-java/icu4j-4.4.1.1
index 4848616ede0f..ef717af8a3ff 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.4.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-4.4.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test )
 SLOT=4.4
 SRC_URI=http://download.icu-project.org/files/icu4j/4.4.1.1/icu4j-4_4_1_1-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.4.1.1/icu4j-4_4_1_1-docs.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c4bba214860833a3e51c1f3b2e9c206
diff --git a/metadata/md5-cache/dev-java/icu4j-4.4.2 b/metadata/md5-cache/dev-java/icu4j-4.4.2
index 731e7fcf36f7..1c6ebd91267b 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.4.2
+++ b/metadata/md5-cache/dev-java/icu4j-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test )
 SLOT=4.4
 SRC_URI=http://download.icu-project.org/files/icu4j/4.4.2/icu4j-4_4_2-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.4.2/icu4j-4_4_2-docs.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=388e22360652fa4caf90522f2a0e5a74
diff --git a/metadata/md5-cache/dev-java/icu4j-49.1 b/metadata/md5-cache/dev-java/icu4j-49.1
index edf19e1417f8..211d2ea5ff9c 100644
--- a/metadata/md5-cache/dev-java/icu4j-49.1
+++ b/metadata/md5-cache/dev-java/icu4j-49.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=49
 SRC_URI=http://download.icu-project.org/files/icu4j/49.1/icu4j-49_1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=91b2650b95751afd40966108d37581dc
diff --git a/metadata/md5-cache/dev-java/icu4j-52.1 b/metadata/md5-cache/dev-java/icu4j-52.1
index fd578d3c91ad..adb6873754bc 100644
--- a/metadata/md5-cache/dev-java/icu4j-52.1
+++ b/metadata/md5-cache/dev-java/icu4j-52.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/52.1/icu4j-52_1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43b688482e3cb80d60a5d537e7e93c54
diff --git a/metadata/md5-cache/dev-java/icu4j-53.1 b/metadata/md5-cache/dev-java/icu4j-53.1
index 4418d32dc574..240cdfc19556 100644
--- a/metadata/md5-cache/dev-java/icu4j-53.1
+++ b/metadata/md5-cache/dev-java/icu4j-53.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/53.1/icu4j-53_1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b37ca2b48c391bb7c9faa41339e8f9f1
diff --git a/metadata/md5-cache/dev-java/icu4j-54.1.1 b/metadata/md5-cache/dev-java/icu4j-54.1.1
index 2ce6cd3d7784..dd3ebe1a817c 100644
--- a/metadata/md5-cache/dev-java/icu4j-54.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-54.1.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/54.1.1/icu4j-54_1_1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f137c0ad3bee279b5d8e4d78fe952da6
diff --git a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7 b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
index 15cd2c790672..5c90441741cc 100644
--- a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
+++ b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/idm-console-framework-1.1.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63653cf65bd0c7b65cd9339739d0c271
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.2 b/metadata/md5-cache/dev-java/invokebinder-1.2
index 74a4a7789d2b..fab68b72187a 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.2
+++ b/metadata/md5-cache/dev-java/invokebinder-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://github.com/headius/invokebinder/archive/invokebinder-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79b527cc220151e8f520b6a254004327
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r1 b/metadata/md5-cache/dev-java/iso-relax-20050331-r1
index db347e060ba5..7703487c99bc 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r1
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=292a96c5b987547ab866d927360b1ee1
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r2 b/metadata/md5-cache/dev-java/iso-relax-20050331-r2
index ff0b41992df8..e67173214edf 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r2
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c27cba76b70338fa82c1ef2e223795cd
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22 b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22
index da3fa49f184c..40299a44d556 100644
--- a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-buildtools/2.22/istack-commons-buildtools-2.22-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b16918d18fad59500786c2e36afa615
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620 b/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
index 77a7166f8578..2757e3225fe4 100644
--- a/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
+++ b/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=mirror://gentoo/istack-commons-20090620-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a446a714c39b68344660286b8259f38c
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22 b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
index 0631f289b37f..0929d5fb4e35 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-runtime/2.22/istack-commons-runtime-2.22-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff243fc89c0c80292fba70b2a4ac8ff3
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1
index 749b96cce446..322dbeb8b2bb 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/jaf >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/istack-commons-20070122.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=22dc5b29ceb247c2ccf7ab33e0d9ee4c
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1 b/metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1
index 769a31d70ac1..7e73893fd1f2 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/jaf java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=mirror://gentoo/istack-commons-20090620-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0feca0658543ad8bfdb00366c6ef753a
diff --git a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22 b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
index 048cbd4b7502..1ee27533a556 100644
--- a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/args4j:2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-soimp/2.22/istack-commons-soimp-2.22-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cdcaa4d54a6f06237ad4152171abb66
diff --git a/metadata/md5-cache/dev-java/istack-commons-tools-2.22 b/metadata/md5-cache/dev-java/istack-commons-tools-2.22
index 5eaf78235d44..ce10779b727a 100644
--- a/metadata/md5-cache/dev-java/istack-commons-tools-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-tools-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-tools/2.22/istack-commons-tools-2.22-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f79142c0134a1b2c7268fdd6c507469
diff --git a/metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1 b/metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1
index 20c4f4cb120b..07d141a2c1c3 100644
--- a/metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/istack-commons-20070122.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f44335fc461fb540a2ee80a1ddd3825d
diff --git a/metadata/md5-cache/dev-java/istack-commons-tools-20090620 b/metadata/md5-cache/dev-java/istack-commons-tools-20090620
index 18891eec513f..a757a1e80120 100644
--- a/metadata/md5-cache/dev-java/istack-commons-tools-20090620
+++ b/metadata/md5-cache/dev-java/istack-commons-tools-20090620
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=mirror://gentoo/istack-commons-20090620-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=23eaa7a8bd2242a9bff33547dcf03f57
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5-r2 b/metadata/md5-cache/dev-java/itext-2.1.5-r2
index 26da5d4c8a7b..fba0de5dc16b 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5-r2
+++ b/metadata/md5-cache/dev-java/itext-2.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/itext/iText-src-2.1.5.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0fdd3f658a131e672e192ca46020f69
diff --git a/metadata/md5-cache/dev-java/itext-5.5.4 b/metadata/md5-cache/dev-java/itext-5.5.4
index 372f4c6b6e32..899a466f4aec 100644
--- a/metadata/md5-cache/dev-java/itext-5.5.4
+++ b/metadata/md5-cache/dev-java/itext-5.5.4
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-java/bcmail:0 >=dev-java/bcprov-1.49:0 dev-java/bcpkix:0 dev-java/xml-security:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=5
 SRC_URI=mirror://sourceforge/itext/itext-5.5.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1433e9ac84527eed66f2055c0839bbd0
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 2bd5335821af..914f2c9ecf06 100644
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ b/metadata/md5-cache/dev-java/j2ssh-0.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7ef805faf67fb314df19d1c6510a8fb
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
index e7eaa9400c2f..fa879279d116 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/commons-httpclient:3 dev-java/slf4j-api:0 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f892f524a3e67667932c222792ba5101
diff --git a/metadata/md5-cache/dev-java/jackson-1.9.13 b/metadata/md5-cache/dev-java/jackson-1.9.13
index 6b00f91face5..ca229ad88357 100644
--- a/metadata/md5-cache/dev-java/jackson-1.9.13
+++ b/metadata/md5-cache/dev-java/jackson-1.9.13
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/codehaus/jackson/jackson-core-lgpl/1.9.13/jackson-core-lgpl-1.9.13-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f4ac8c51c947f4bb9031fe9168a2175
diff --git a/metadata/md5-cache/dev-java/jackson-2.5.1 b/metadata/md5-cache/dev-java/jackson-2.5.1
index 100e99837403..8393ded43337 100644
--- a/metadata/md5-cache/dev-java/jackson-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33396c6c88768454a5e22953c6a6bd12
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.5.1 b/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
index 33a8fb472caf..fc8f856ea3f1 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d87c92fe40551fe68601f410b5feff72
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1 b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
index be693fd400ad..5a18b3eb2540 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69e1d3121743fb08afc2da2d80a17838
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
index 83346d18e97a..a48ef29532e0 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a65b36d1551aed9f38c1c5ffc7eb3f1
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
index c307bf94c845..f8a252a8144e 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-databind-2.5.1:2 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-yaml/archive/jackson-dataformat-yaml-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3bcfd379c08a1f8b81ac54804913bbab
diff --git a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1 b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
index cd78d4ea76c3..1eec5f0d9688 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotations-2.5.1:2 ~dev-java/jackson-databind-2.5.1:2 dev-java/stax2-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/jackson-module-jaxb-annotations-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2627e82cdc18732316924d993d606148
diff --git a/metadata/md5-cache/dev-java/jacl-1.3.3 b/metadata/md5-cache/dev-java/jacl-1.3.3
index fc728c7e25fa..20ce09c075f9 100644
--- a/metadata/md5-cache/dev-java/jacl-1.3.3
+++ b/metadata/md5-cache/dev-java/jacl-1.3.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.3.3.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b0db78eee1ec3099ebe53f008b65c46
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1 b/metadata/md5-cache/dev-java/jacl-1.4.1
index 873b26fb9c56..8834fce017e4 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/tcl-8.4.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0648318c40626532524264b442a020e
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r1 b/metadata/md5-cache/dev-java/jade-3.3-r1
index 48b72ab370b1..02e1687d7b04 100644
--- a/metadata/md5-cache/dev-java/jade-3.3-r1
+++ b/metadata/md5-cache/dev-java/jade-3.3-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/JADE-src-3.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b4dc73f8c4161ca075e9439e0524bdb
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r2 b/metadata/md5-cache/dev-java/jade-3.3-r2
index c020fc11c29b..80dad975fddf 100644
--- a/metadata/md5-cache/dev-java/jade-3.3-r2
+++ b/metadata/md5-cache/dev-java/jade-3.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/JADE-src-3.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9359ff28f4adf4e79b3249bc042caf82
diff --git a/metadata/md5-cache/dev-java/jaffl-0.5.1 b/metadata/md5-cache/dev-java/jaffl-0.5.1
index 3ee516031c7a..21b0e09cc27d 100644
--- a/metadata/md5-cache/dev-java/jaffl-0.5.1
+++ b/metadata/md5-cache/dev-java/jaffl-0.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/jffi:0.4 dev-java/jnr-x86asm:0 dev-java/asm:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/wmeissner/jaffl/tarball/0.5.1 -> jaffl-0.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80f0c99f09a90e98c71b76e53513df7f
diff --git a/metadata/md5-cache/dev-java/jaffl-0.5.11 b/metadata/md5-cache/dev-java/jaffl-0.5.11
index c78f1a1a22c5..11819c2ccd07 100644
--- a/metadata/md5-cache/dev-java/jaffl-0.5.11
+++ b/metadata/md5-cache/dev-java/jaffl-0.5.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/jffi:1.2 dev-java/jnr-x86asm:0 dev-java/asm:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/jnr/jnr-ffi/tarball/0.5.11 -> jaffl-0.5.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=183e7c1eebae972a8846d17c35325b3d
diff --git a/metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2 b/metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2
index e92b791ae579..cebb2af0a5c4 100644
--- a/metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2
+++ b/metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/servletapi:2.4 dev-java/xalan >=dev-java/java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/taglibs/standard/source/jakarta-taglibs-standard-1.1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a08d31efe6e1452c67cede3fb7fe431a
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
index 3871c82f4ed9..c67a1fced71d 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2685e5910be391775c07b915fdd64ec
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
index 69f354b57253..51cec44d2b1e 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ebaefedf8a9f400b1a6c86de2185e8aa
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
index 003eb2332bfa..30b5f65124ce 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e6b556821a2a9ab3edcb979b3ed86a7
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
index 4002befd35ba..ab82a3350ba5 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29a5234e020d4f821fe0e85be737e44d
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
index da3b5d457872..36c9a9d0c581 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f39530df5d741cc94c204865454fc383
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
index d5b8e446fb62..f1eda6cc5937 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.5
 SRC_URI=http://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0b185a0916179a864d974d89027ad79
diff --git a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3 b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
index d576d62686f8..f08423e2436c 100644
--- a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
+++ b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/xml-im-exporter:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://archive.apache.org/dist/jakarta/slide/source/jakarta-slide-webdavclient-src-2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf36f02d401473576b28d914cbe82924
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r3 b/metadata/md5-cache/dev-java/jal-20031117-r3
index 54a9cfc2e0b9..aeff30b0ac85 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r3
+++ b/metadata/md5-cache/dev-java/jal-20031117-r3
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://vigna.dsi.unimi.it/jal/jal-20031117-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7508ead5e50c679e1012edb2491f6b5a
diff --git a/metadata/md5-cache/dev-java/jama-1.0.3 b/metadata/md5-cache/dev-java/jama-1.0.3
index 0c7d857b6082..643e83d6c60f 100644
--- a/metadata/md5-cache/dev-java/jama-1.0.3
+++ b/metadata/md5-cache/dev-java/jama-1.0.3
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://math.nist.gov/javanumerics/jama/Jama-1.0.3.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c36eb601337a4abb8bc819ed21ce1529
diff --git a/metadata/md5-cache/dev-java/jamon-1.01-r3 b/metadata/md5-cache/dev-java/jamon-1.01-r3
index 63d0faaf04e0..1db2f2da483d 100644
--- a/metadata/md5-cache/dev-java/jamon-1.01-r3
+++ b/metadata/md5-cache/dev-java/jamon-1.01-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://sourceforge/jamonapi/JAMonAll_103005.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ceb45d279c1cfa3a754f7a1c1da4c5c
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index bc7df6b6fb3d..7e822df33fa1 100644
--- a/metadata/md5-cache/dev-java/janino-2.7.0
+++ b/metadata/md5-cache/dev-java/janino-2.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://janino.net/download/janino-2.7.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=668f9dc710d238f1510a28bca55f010a
diff --git a/metadata/md5-cache/dev-java/jansi-1.1 b/metadata/md5-cache/dev-java/jansi-1.1
index 2b31b65a9a8c..31d616090c3d 100644
--- a/metadata/md5-cache/dev-java/jansi-1.1
+++ b/metadata/md5-cache/dev-java/jansi-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jna >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jansi.fusesource.org/repo/release/org/fusesource/jansi/jansi/1.1/jansi-1.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14e415d1cc872d3abbfa5f48a986373c
diff --git a/metadata/md5-cache/dev-java/jansi-1.11 b/metadata/md5-cache/dev-java/jansi-1.11
index 5e9ec0ce34c1..1d6279e8776e 100644
--- a/metadata/md5-cache/dev-java/jansi-1.11
+++ b/metadata/md5-cache/dev-java/jansi-1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=827609a92832fd9868415b3b0c3a1c00
diff --git a/metadata/md5-cache/dev-java/jansi-1.11-r1 b/metadata/md5-cache/dev-java/jansi-1.11-r1
index 41d0b60a026b..839f48330a51 100644
--- a/metadata/md5-cache/dev-java/jansi-1.11-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.11
 SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a1eeb244028c56e6e7e0e0781747dc8f
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.5 b/metadata/md5-cache/dev-java/jansi-native-1.5
index b5b87ec32e90..093f69927682 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.5
+++ b/metadata/md5-cache/dev-java/jansi-native-1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/tarball/jansi-native-1.5 -> jansi-native-1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1ebd5a9ac2ff4a8eb6e6bf80c037641
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r1 b/metadata/md5-cache/dev-java/japitools-0.9.7-r1
index c1979e622bb4..5e2db937e544 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7139ce1f0f60b56285e5a01859a50747
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.7 b/metadata/md5-cache/dev-java/jarbundler-1.7
index 4d2ceded4309..609b54b9504e 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.7
+++ b/metadata/md5-cache/dev-java/jarbundler-1.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6316045952fc3af6151ae3b5bc93a66d
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r1 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r1
index 8ed08bc890e1..703f835dfdb9 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r1
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7 >=dev-java/xerces-2.8.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d835e0bf241b4909ad4fcae128fe68b0
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
index 3890005312e1..d516a6bdccfc 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7cca43b02ab93b46ea0b3b830cb4c01a
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index 9b395d9ab646..157f90dd9d98 100644
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ b/metadata/md5-cache/dev-java/jarbundler-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c83367bc14f8dcd96d1d4435c5836702
diff --git a/metadata/md5-cache/dev-java/jarjar-0.9 b/metadata/md5-cache/dev-java/jarjar-0.9
index 4bad359be99b..baa703bb5c58 100644
--- a/metadata/md5-cache/dev-java/jarjar-0.9
+++ b/metadata/md5-cache/dev-java/jarjar-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/asm-2.0* =dev-java/gnu-regexp-1* >=dev-java/ant-core-1.7.0 dev-java/java-getopt >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/jarjar/jarjar-src-0.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4220a4939c0d7970c0deec1b75086f7
diff --git a/metadata/md5-cache/dev-java/jarjar-1.4 b/metadata/md5-cache/dev-java/jarjar-1.4
index 6171e893a7ed..50a89b31d95c 100644
--- a/metadata/md5-cache/dev-java/jarjar-1.4
+++ b/metadata/md5-cache/dev-java/jarjar-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-get
 RESTRICT=test
 SLOT=1
 SRC_URI=http://jarjar.googlecode.com/files/jarjar-src-1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10dcfa2a3e678711362fe7360e320074
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.3 b/metadata/md5-cache/dev-java/java-dep-check-0.3
index 1f8da7b84e60..cd4a812fdc8b 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.3
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/asm:3 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b4b9c2313846d61375faccec3cbe117
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.13 b/metadata/md5-cache/dev-java/java-getopt-1.0.13
index 27124a0d4180..30ad51bd88ae 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.13
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.13
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a2fd66f80231d4698bcd06b8f413b08f
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14 b/metadata/md5-cache/dev-java/java-getopt-1.0.14
index b9e9c303207a..fb8cc58e7eca 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4caf19553eb77c80c249c1dde1f3ef2
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.19 b/metadata/md5-cache/dev-java/java-gnome-4.0.19
index 1bdac6fdb4b3..7627fa47360d 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.19
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.22.0:2 >=gnome-base/libglade-2.6.
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2fd5e02ca2f2d61ba93501f8318a53b
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.20 b/metadata/md5-cache/dev-java/java-gnome-4.0.20
index 0de24373deb5..7f5e7925f90d 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.20
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.22.0:2 >=gnome-base/libglade-2.6.
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.20.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bee332b5f6d20c5188450ec04c956829
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.1.3 b/metadata/md5-cache/dev-java/java-gnome-4.1.3
index 2f5d4468c627..3eb6b4373b22 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.1.3
+++ b/metadata/md5-cache/dev-java/java-gnome-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/enchant:0 dev-libs/atk:0 >=dev-libs/glib-2.28:2 dev-libs/libuni
 RESTRICT=test
 SLOT=4.1
 SRC_URI=mirror://gnome/sources/java-gnome/4.1/java-gnome-4.1.3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=74cd1260b1220e962b393f52b32eccd2
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.2.3 b/metadata/md5-cache/dev-java/java-service-wrapper-3.2.3
index 3e19c59400de..4cf97365f9c9 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.2.3
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.2.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/wrapper/wrapper_3.2.3_src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=816bc4fcbc5942c5c920469b715511d4
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.3.1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.3.1
index 815d3543be4f..ff63d495e6d6 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.3.1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.3.1
@@ -8,5 +8,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.3.1/wrapper_3.3.1_src.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a28bb6878acb952adbbcd78ea86429c
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.3.3 b/metadata/md5-cache/dev-java/java-service-wrapper-3.3.3
index c030d3a763cc..b6f2ee71577a 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.3.3
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.3.3
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.3.3/wrapper_3.3.3_src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4c7148701492b0464530afed59b636f
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14
index c436f5efd76e..d7dc734ed66c 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.14/wrapper_3.5.14_src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5aa057c22f8a1a0c888721569c9f7ec6
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1
index d48dcf8dcd27..db63694826d0 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.14/wrapper_3.5.14_src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6280ba2884ce81a1b62f34585b9f9eb
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25
index 6644db712bde..a0e86315e6b3 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=96a62f0f0e82c5acec516e7e6d7c0547
diff --git a/metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1 b/metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1
index d20d3d7f5876..21be259634b1 100644
--- a/metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1
+++ b/metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/base64:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/java-xmlbuilder/java-xmlbuilder-0.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5846054c9b750ccf7d2e05a9a52663b
diff --git a/metadata/md5-cache/dev-java/javacc-4.0-r4 b/metadata/md5-cache/dev-java/javacc-4.0-r4
index 85e963273498..542a9c40724e 100644
--- a/metadata/md5-cache/dev-java/javacc-4.0-r4
+++ b/metadata/md5-cache/dev-java/javacc-4.0-r4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://javacc.dev.java.net/files/documents/17/26783/javacc-4.0src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d74f3a603a0d9153db78275638a6cb17
diff --git a/metadata/md5-cache/dev-java/javacc-4.2 b/metadata/md5-cache/dev-java/javacc-4.2
index c90c079f000b..f00fc2a7a1a9 100644
--- a/metadata/md5-cache/dev-java/javacc-4.2
+++ b/metadata/md5-cache/dev-java/javacc-4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://javacc.dev.java.net/files/documents/17/117795/javacc-4.2src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=328bb236721fee12c3e10fbde233402c
diff --git a/metadata/md5-cache/dev-java/javacc-5.0 b/metadata/md5-cache/dev-java/javacc-5.0
index a577a95608b0..69b9e46a8d6b 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0
+++ b/metadata/md5-cache/dev-java/javacc-5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://javacc.dev.java.net/files/documents/17/142527/javacc-5.0src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=755d9fc7a6249cfd91f048a963b61507
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r1 b/metadata/md5-cache/dev-java/javacc-5.0-r1
index 3f0abb6b6244..1dadf006ee23 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r1
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82aaa08444e4086caba04157212b3262
diff --git a/metadata/md5-cache/dev-java/javacup-0.10k-r1 b/metadata/md5-cache/dev-java/javacup-0.10k-r1
index ae80e398fa6c..8fc29e61baf7 100644
--- a/metadata/md5-cache/dev-java/javacup-0.10k-r1
+++ b/metadata/md5-cache/dev-java/javacup-0.10k-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab4cbfb46d394fa6072f91ff34fab1f4
diff --git a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608 b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
index 890f84edb844..8f81f9e4e378 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
+++ b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/javacup-0.11a_beta20060608.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=741921e1a6935ff7b7e7b097b8b2d8e7
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
index da8ad019f3c8..3e48e6341437 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://javahelp.dev.java.net/files/documents/5985/145533/javahelp2-src-2.0.05_svn63.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f5e61a8a9032f6570877262fbcf3a14
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r1 b/metadata/md5-cache/dev-java/javassist-2.6-r1
index 6948571e23a0..aeefb476647a 100644
--- a/metadata/md5-cache/dev-java/javassist-2.6-r1
+++ b/metadata/md5-cache/dev-java/javassist-2.6-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=96897890486bf2e0c96ff128ea58f3c0
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r2 b/metadata/md5-cache/dev-java/javassist-2.6-r2
index 67c03fab4038..098367005875 100644
--- a/metadata/md5-cache/dev-java/javassist-2.6-r2
+++ b/metadata/md5-cache/dev-java/javassist-2.6-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee4f30abf56bc166dbbc23f9c372b6a9
diff --git a/metadata/md5-cache/dev-java/javassist-3.14.0 b/metadata/md5-cache/dev-java/javassist-3.14.0
index c92b3a9f942c..a14e44ff2a91 100644
--- a/metadata/md5-cache/dev-java/javassist-3.14.0
+++ b/metadata/md5-cache/dev-java/javassist-3.14.0
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/project/jboss/Javassist/3.14.0.GA/javassist-3.14.0-GA.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=01e2c617c0f557aa801230bd16c9b27e
diff --git a/metadata/md5-cache/dev-java/javassist-3.14.0-r1 b/metadata/md5-cache/dev-java/javassist-3.14.0-r1
index 681250ec59ba..856817329874 100644
--- a/metadata/md5-cache/dev-java/javassist-3.14.0-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.14.0-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/project/jboss/Javassist/3.14.0.GA/javassist-3.14.0-GA.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cd9b3cae7cb28466d0021f06de81c41
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index 6f0bdd6c0f41..661daf0dcbae 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72cd7268ad9e93880f19e26206974c98
diff --git a/metadata/md5-cache/dev-java/javassist-3.4 b/metadata/md5-cache/dev-java/javassist-3.4
index ff3657d31e6c..12bd356c615e 100644
--- a/metadata/md5-cache/dev-java/javassist-3.4
+++ b/metadata/md5-cache/dev-java/javassist-3.4
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/jboss/javassist-3.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f5211ce0ce9bf60c358333565fa0da3
diff --git a/metadata/md5-cache/dev-java/javassist-3.4-r1 b/metadata/md5-cache/dev-java/javassist-3.4-r1
index 4fd0d3eb21fa..058154b7ece2 100644
--- a/metadata/md5-cache/dev-java/javassist-3.4-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.4-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/jboss/javassist-3.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ead2660671909ad4822d30ea2eeb35bd
diff --git a/metadata/md5-cache/dev-java/javassist-3.7 b/metadata/md5-cache/dev-java/javassist-3.7
index dcbdb4facda4..dd95ab1cef59 100644
--- a/metadata/md5-cache/dev-java/javassist-3.7
+++ b/metadata/md5-cache/dev-java/javassist-3.7
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/jboss/javassist-3.7.GA.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c366b83761c4b7389386e2607afe5bc
diff --git a/metadata/md5-cache/dev-java/javassist-3.7-r1 b/metadata/md5-cache/dev-java/javassist-3.7-r1
index 0ca709cb29af..804d04994264 100644
--- a/metadata/md5-cache/dev-java/javassist-3.7-r1
+++ b/metadata/md5-cache/dev-java/javassist-3.7-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/jboss/javassist-3.7.GA.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=540df4bb3924e12e3cc90b0ff9817764
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r1 b/metadata/md5-cache/dev-java/javax-inject-1-r1
index 2cbd6b149f14..144a0af0c0d8 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r1
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://atinject.googlecode.com/files/javax.inject-1-bundle.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ca9856349aa2c09730758ee204530f
diff --git a/metadata/md5-cache/dev-java/javolution-2.2.4-r1 b/metadata/md5-cache/dev-java/javolution-2.2.4-r1
index 4a8b58b119f9..6ddc6d4b7450 100644
--- a/metadata/md5-cache/dev-java/javolution-2.2.4-r1
+++ b/metadata/md5-cache/dev-java/javolution-2.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2.4
 SRC_URI=http://javolution.org/javolution-2.2.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4864330cef0cb28aba24cfaba7b6b3d6
diff --git a/metadata/md5-cache/dev-java/javolution-2.2.4-r2 b/metadata/md5-cache/dev-java/javolution-2.2.4-r2
index 3892f5747505..f3d47f5bb248 100644
--- a/metadata/md5-cache/dev-java/javolution-2.2.4-r2
+++ b/metadata/md5-cache/dev-java/javolution-2.2.4-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2.4
 SRC_URI=http://javolution.org/javolution-2.2.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4328ba811677c467912854423f73cdf2
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2 b/metadata/md5-cache/dev-java/javolution-4.0.2
index c8aeb04feeda..b4d545f704e0 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cfc9b9767e55797106d1c97cfe6d7be
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
index 44c8105b453c..a8d98a047efb 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e27a11e7a2921c0698ca3c35b3dca9ee
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index 7b9bdfa09e7a..3224713dea90 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz http://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e80f5f92f5a57e69e4a415ebe7b084f
diff --git a/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01 b/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01
index 2c357797ab16..d6427588a6dd 100644
--- a/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01
+++ b/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 =dev-java/servletapi-2.4* dev-java/fastinfoset dev-java/jaxp dev-java/jsr67 dev-java/jsr101 dev-java/jsr173 dev-java/relaxng-datatype dev-java/saaj dev-java/sax dev-java/sun-jaf dev-java/sun-javamail dev-java/xsdlib >=dev-java/xerces-2.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jax-rpc-1.1.3.01.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20130184524ed4d1cd8b60d4780bfa72
diff --git a/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1 b/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1
index b1a15fafb3a5..7b9b2e04d47b 100644
--- a/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1
+++ b/metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 =dev-java/servletapi-2.4* dev-java/fastinfoset dev-java/jaxp dev-java/jsr67 dev-java/jsr101 dev-java/jsr173 dev-java/relaxng-datatype dev-java/saaj dev-java/sax dev-java/sun-jaf java-virtuals/javamail dev-java/xsdlib >=dev-java/xerces-2.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jax-rpc-1.1.3.01.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b0a1d029aba1c634e8fc5431f8b7ea11
diff --git a/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1 b/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
index 1c43d28d4250..69147455a39d 100644
--- a/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime:0 dev-java/jax-ws-api:2 dev-java/jaxb:2 dev-java/jsr173:0 >=dev-java/jsr181-1.0 dev-java/jsr250:0 dev-java/sun-httpserver-bin:2 dev-java/jsr67:0 dev-java/saaj:0 dev-java/sjsxp:0 dev-java/stax-ex:0 dev-java/sun-jaf:0 dev-java/txw2-runtime:0 dev-java/xmlstreambuffer:0 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07074d96f44fc3c97d23977df30544c6
diff --git a/metadata/md5-cache/dev-java/jax-ws-api-2.0 b/metadata/md5-cache/dev-java/jax-ws-api-2.0
index 112a29f2101f..2d71988b7db4 100644
--- a/metadata/md5-cache/dev-java/jax-ws-api-2.0
+++ b/metadata/md5-cache/dev-java/jax-ws-api-2.0
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr67 =dev-java/jaxb-2* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/files/documents/4202/34734/jaxws-api-fcs-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eba2d6691f764b79ce953e45ede78e14
diff --git a/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1 b/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1
index 8d7bf095e74c..8325a1b23a8e 100644
--- a/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime:0 dev-java/istack-commons-tools:0 dev-java/jaxb:2 dev-java/jaxb-tools:2 dev-java/txw2-runtime:0 dev-java/jsr173:0 >=dev-java/jsr181-1.0:0 dev-java/jax-ws-api:2 dev-java/jax-ws:2 dev-java/codemodel:2 dev-java/apt-mirror:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba0b5aa9b28a2ff1faf3ef30ed4d7a03
diff --git a/metadata/md5-cache/dev-java/jaxb-2.1.2-r1 b/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
index 20db9560e5a2..2d8a305bb4bd 100644
--- a/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
+++ b/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime:0 dev-java/jsr173:0 java-virtuals/jaf dev-java/txw2-runtime:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jaxb.dev.java.net/2.1.2/JAXB2_src_20070125.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b27531677c1d262e4d19306e3a51eff
diff --git a/metadata/md5-cache/dev-java/jaxb-tools-2.1.2 b/metadata/md5-cache/dev-java/jaxb-tools-2.1.2
index ea2bc4a9e609..0a54467a50a5 100644
--- a/metadata/md5-cache/dev-java/jaxb-tools-2.1.2
+++ b/metadata/md5-cache/dev-java/jaxb-tools-2.1.2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/codemodel:2 dev-java/iso-relax:0 dev-java/istack-commons-runtime:0 dev-java/istack-commons-tools:0 dev-java/jaxb:2 dev-java/jsr173:0 dev-java/msv:0 dev-java/relaxng-datatype:0 dev-java/rngom:0 dev-java/sun-dtdparser:0 dev-java/sun-jaf:0 dev-java/txw2-runtime:0 dev-java/xml-commons-resolver:0 dev-java/xsdlib:0 dev-java/xsom:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jaxb.dev.java.net/2.1.2/JAXB2_src_20070125.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8fef962f35ce091a55d9bae17b80991
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.1 b/metadata/md5-cache/dev-java/jaxen-1.1.1
index 5c5f920aa581..4743e11890ec 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.1
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/dom4j-1* dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00d2c91546b0b6af4d6e8ad8ebee7ea8
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4 b/metadata/md5-cache/dev-java/jaxen-1.1.4
index 8fc344a6126e..4dde4a4de74f 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.4
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/xom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f577b2c24f6e9748a1a847c5db0d3ec6
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2 b/metadata/md5-cache/dev-java/jaxme-0.5.2
index 23875eaa8900..82c987c42c64 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c32ad55c4bab3e375c077fdf20bb7d85
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2-r1 b/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
index 33cf98d2770c..a6d590ec396b 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/antlr:0[java] >=dev-java/xerces-2.7 =dev-java/junit-3.8* >=dev-java/log4j-1.2.8:0 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=946aa588fd81bb6ae89662850e6292cd
diff --git a/metadata/md5-cache/dev-java/jaxp-1.4-r1 b/metadata/md5-cache/dev-java/jaxp-1.4-r1
index 050dab6d465c..83b0054a8b6d 100644
--- a/metadata/md5-cache/dev-java/jaxp-1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxp-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jaxp-1.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=addcd8d12f5c842a42972a9ecbc7b3b3
diff --git a/metadata/md5-cache/dev-java/jaxr-1.0.6 b/metadata/md5-cache/dev-java/jaxr-1.0.6
index d1d83d803f11..a541848f7c47 100644
--- a/metadata/md5-cache/dev-java/jaxr-1.0.6
+++ b/metadata/md5-cache/dev-java/jaxr-1.0.6
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 =dev-java/jaxb-2* dev-java/jsr173 dev-java/jsr67 dev-java/jsr93 dev-java/sun-jaf >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jaxr-1.0.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a8cdb8da4ec0cabcfa201857e9815f1
diff --git a/metadata/md5-cache/dev-java/jazzy-0.5.2 b/metadata/md5-cache/dev-java/jazzy-0.5.2
index 9fde8caad6d4..ae0912220e4e 100644
--- a/metadata/md5-cache/dev-java/jazzy-0.5.2
+++ b/metadata/md5-cache/dev-java/jazzy-0.5.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f3695a0e8ae32debadeed91dfcea7dd
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
index 7811b33beb25..3ed153f71342 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/bitcollider/jBitcollider-0.8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9d831b1c2d2541ac2adf44ccacf5f6e
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.4 b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
index 07cf2a24bfbf..c05217e4602b 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.4
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e95c1614d2732763d0eb0eec4d07166
diff --git a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1 b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
index c4a3ddb6675a..599c8dabfd9f 100644
--- a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
+++ b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logmanager/archive/1.5.1.Final.tar.gz -> jboss-logmanager-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e7d06b73eb769ce4e50135a5bb77b18
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
index dfe07bafc67d..7d58b277e232 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4868d052e43fad21135d4f8355b37c2c
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.0 b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
index 14885d4e9f7a..dac8f8636f3e 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.0.Final.tar.gz -> jboss-modules-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63f096f6f625995423262e0795dd509f
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
index bb68bfb61523..ea55ab4b0f77 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5b9e27d04cefc4447d7603664ac7e28
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.3.3 b/metadata/md5-cache/dev-java/jcalendar-1.3.3
index 4d1695cf167a..0afb9c647adc 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.3.3
+++ b/metadata/md5-cache/dev-java/jcalendar-1.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.3.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10e284888dec7e5ada76da07b115d43e
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index 57d99feddde8..c4299cb8b167 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 dev-java/jgoodies-looks:2.6 >=dev-java/java-config-2.2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c363dd4ddc285db2fb10c2fe242405b
diff --git a/metadata/md5-cache/dev-java/jchardet-1.1 b/metadata/md5-cache/dev-java/jchardet-1.1
index 9a791f14f525..7c5936d803a1 100644
--- a/metadata/md5-cache/dev-java/jchardet-1.1
+++ b/metadata/md5-cache/dev-java/jchardet-1.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jchardet/jchardet/jchardet-1.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=507377711b7ec07102fd193697b1e9f7
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r2 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
index 8039fa49e901..2ced377b141e 100644
--- a/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
+++ b/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 vi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=383253f614a6ad1e19ba28b1d598b87e
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
index b62b65592e84..b838b2ff6230 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://jcifs.samba.org/src/jcifs-1.3.17.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e7c4c0c86f79ec9db0ed90b3c05e20ac
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
index 5d1214110d2e..8782a391c4b8 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e66cc9862114be3ed478d48b4a192d60
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.0-r1 b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
index ef6039b94d2d..877c4976dcb8 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.0-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jclasslib/jclasslib_unix_3_0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ebbfc7985ec544b653bd7c21e7c019d8
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r1 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r1
index ab97c4a3662e..e22794e6cd88 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r1
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e73f534daa1239a2995c886c7982bf42
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
index 83368c702482..0e68405d3a25 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47725eccb5b176f971159f5f8aedaed5
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
index 2b3664bc51aa..1e379b0412c3 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.11
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e5c88ca6f29b4962911b0a13893cbd9
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index b8d88c2bd048..78ac0a8c2c3d 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.4
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jcodings-1.0.4-git.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fffdcaf7465479763bfd4a8c77e81b5c
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.5 b/metadata/md5-cache/dev-java/jcodings-1.0.5
index 2b7cad4131c2..b62a6e2feb4e 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.5
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/jruby/jcodings/tarball/1.0.5 -> jcodings-1.0.5-git.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d90255b72a474c934d1be88c64c5e2f
diff --git a/metadata/md5-cache/dev-java/jcommander-1.32 b/metadata/md5-cache/dev-java/jcommander-1.32
index 62d2683838ff..713033f0eb42 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.32
+++ b/metadata/md5-cache/dev-java/jcommander-1.32
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.32.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9df6eaf38a69d43be4db768e46f9c33
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.16 b/metadata/md5-cache/dev-java/jcommon-1.0.16
index b9cb2cf79a4b..1f368000f3be 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.16
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.16
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.16.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0d110b73cc26a5b4c81523281cf6c46
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.18 b/metadata/md5-cache/dev-java/jcommon-1.0.18
index 6c60c7b50520..828e6f6e9c49 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.18
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55f04262f7908f82c013bd594264cc36
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.23 b/metadata/md5-cache/dev-java/jcommon-1.0.23
index bd05b28962a3..427e873165e8 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.23
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.23.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c12bfa01f24df10ad9d52a7514449ea
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
index e4ad348a98ea..5c3ddbb50d6c 100644
--- a/metadata/md5-cache/dev-java/jcs-2.0
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cceabe5f6840907a09f9c5f0de514d04
diff --git a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3 b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
index db3041ebf40e..9aead52969e2 100644
--- a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
+++ b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=JDBC.3.00.JC3.tar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdb1ee5a518ccf0f045c0fafe5e383fe
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1
index 4501665ee8bc..83c3170c9559 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/log4j >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Jaybird-2.1.5-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41ff9e964f38f59da972f64567dd060e
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2
index dbf2d787b1ba..bdc2a44408e0 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/log4j >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Jaybird-2.1.5-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0342a9d8bca0a0afaf7c1438b38332ec
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6
index a393a2ab3921..a18fb494f237 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/log4j:0 dev-java/glassfish-connector-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Jaybird-2.1.6-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18a0ea0d3d1f39927ce9b4079f83b419
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7
index 9de41a7f6d64..28cb78087dc6 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/antlr:4 dev-java/log4j:0 dev-java/glassfish-connector-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/firebird/Jaybird-2.2.7-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc764efc29a7881572c8070cf5f634ae
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
index 77779aaf5c9a..0b696e80f801 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=4.0
 SRC_URI=http://download.microsoft.com/download/0/2/A/02AAE597-3865-456C-AE7F-613F99F850A8/sqljdbc_4.0.2206.100_enu.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=341ea53ec4720576de04f8f0148cc339
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.14 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.14
index 312b7d954491..7fb224d36013 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.14
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.14
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 log4j? ( dev-java/log4j ) c3p0? ( dev-java/c3p0 ) dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f478d34b66e2f3e727a8c5d5c0f0c7f9
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.18 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.18
index 6bbe1149e2f7..17a32d0d6f00 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.18
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.18
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j ) c3p0? (
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c4d1939df3d1a35572e08673e9d8063
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.23 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.23
index 058e13d4b0fa..f515679b1d82 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.23
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.23
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j ) c3p0? (
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.23.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5199391ba865d5f51dba486fe68c683
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index 3f6d680c1080..5a2def33c10a 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be21ffe484bc17260be28e2d387543d0
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
index 6691eb1d2c11..f004b3e24d4d 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.1
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms_g.jar ) ) jdbc-oracle-bin-10.1.0.5-ocrs12.jar doc? ( jdbc-oracle-bin-10.1.0.5-javadoc.zip ) examples? ( jdbc-oracle-bin-10.1.0.5-demo.tar ) nls? ( jdbc-oracle-bin-10.1.0.5-orai18n.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb4684168d38bbef285a633a7e588ea0
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
index 43b56604c30d..19a7ec967721 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.3-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.3-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e169044ca49f7dff8e3c591789c607ae
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
index 168871c7c7fc..b1dba21822ea 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.4-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.4-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3db00e0bf8d3efecf7570b361343a90e
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
index 91bab223ef1a..ca01c42000fc 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=9.2
 SRC_URI=!debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14.jar ) debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14_g.jar ) jdbc-oracle-bin-9.2.0.8-ocrs12.jar doc? ( jdbc-oracle-bin-9.2.0.8-javadoc.tar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09bd2efc6ea844bb0bf2c6c281598fd0
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603 b/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
index 88d93ecc585a..29a22481567b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-8.3-603.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f2a660dfcd53c58de8c55f75d57757f
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1 b/metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1
index 744c8ccbb37d..f9876a6283df 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-8.4-701.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29ee84e7020b67aa5926c4326a72d841
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index 4ddfb54ace20..c493da516b31 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d851598f54927a4bbb3576ef672050a1
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
index 8269890b47de..c549df2defc6 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=297b112f6c7a84dc66dea663bd6b9433
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
index e4c4702383f2..500b9f3ee9ed 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d02f423a8ed75ba3e2758dcad8f1bfc
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201
index 718712f224e0..c7ab5ba22a63 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1201.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f8c10dd7d97014e1c42da19bf6c9ec6
diff --git a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3 b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
index ff41198e6205..b6375a6b8f37 100644
--- a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
+++ b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jdbc2_0-stdext-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d02b8913fdfef2c67d5e5924466dab99
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index 88bfd5e7d97a..925df5b32353 100644
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r2
+++ b/metadata/md5-cache/dev-java/jdbm-0.12-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=564e7ba4556cfa640d27816a3e730758
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index 4585bc035762..25d28fb3465a 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r5
+++ b/metadata/md5-cache/dev-java/jdepend-2.9-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c77bc6366a89086c4f300ef900f625f0
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index c3ff8afcd328..c57b29ab089e 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bca08f7a800862df0d0e8ad4d629610
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index 874524236b35..8448dc56a340 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r4
@@ -9,5 +9,5 @@ PDEPEND=~dev-java/jdom-jaxen-1.0
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5eba7c55440382b0b865b6467d30dd4
diff --git a/metadata/md5-cache/dev-java/jdom-1.0_beta10-r4 b/metadata/md5-cache/dev-java/jdom-1.0_beta10-r4
index 56c794ade7f3..bbc237a0f3bf 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0_beta10-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0_beta10-r4
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0_beta10
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-b10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1aba09d3bef39e2673b21254095dbbf
diff --git a/metadata/md5-cache/dev-java/jdom-1.0_beta10-r6 b/metadata/md5-cache/dev-java/jdom-1.0_beta10-r6
index 8d90a4a390a3..0dec81396211 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0_beta10-r6
+++ b/metadata/md5-cache/dev-java/jdom-1.0_beta10-r6
@@ -9,5 +9,5 @@ PDEPEND=~dev-java/jdom-jaxen-1.0_beta10
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0_beta10
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-b10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1704db4844cc84f31ea6ebfa99d66767
diff --git a/metadata/md5-cache/dev-java/jdom-1.0_beta9-r2 b/metadata/md5-cache/dev-java/jdom-1.0_beta9-r2
index 71d761f8ad29..a8a8e2d77084 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0_beta9-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.0_beta9-r2
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0_beta9
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-b9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bda176d087b12d92c4eada155da31258
diff --git a/metadata/md5-cache/dev-java/jdom-1.0_beta9-r4 b/metadata/md5-cache/dev-java/jdom-1.0_beta9-r4
index b1818dfeb1e2..4415e00e3267 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0_beta9-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0_beta9-r4
@@ -9,5 +9,5 @@ PDEPEND=~dev-java/jdom-jaxen-1.0_beta9
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0_beta9
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-b9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba6353231ba2b0eb4bc3c1a2158ee936
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3 b/metadata/md5-cache/dev-java/jdom-1.1.3
index 3f82ca9751a4..1cd62ea38289 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=892754723f9d38bf8f162382833d172a
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6 b/metadata/md5-cache/dev-java/jdom-2.0.6
index 1ffb30ae198a..068c8b2e75e0 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=dev-java/iso-relax dev-java/jaxen:1.1 dev-java/xalan dev-java/xml-commons-external:1.4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://www.jdom.org/dist/binary/jdom-2.0.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc517854810bec9351512bf4de56d334
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
index fd45ab4c6977..aca79582bb34 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11cb3b453c2c315dbbff093b5e7e63a1
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1
index 1f60c5e7ac10..497cff8c060f 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0_beta10 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0
 SLOT=1.0_beta10
 SRC_URI=http://www.jdom.org/dist/source/jdom-b10.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=047dcd4fbf4126e6fe9d9d860b782766
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2
index 8940299c3c64..3039fe8e2014 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0_beta9 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0
 SLOT=1.0_beta9
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-b9.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6256a49feca1ac43e8942c299a64c07f
diff --git a/metadata/md5-cache/dev-java/jdynamite-1.2 b/metadata/md5-cache/dev-java/jdynamite-1.2
index bfb250ace8b0..c2a5a93c536b 100644
--- a/metadata/md5-cache/dev-java/jdynamite-1.2
+++ b/metadata/md5-cache/dev-java/jdynamite-1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jdynamite/jdynamite1_2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c4912703afaf764a067fe3dd15b57de
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
index 2fbfee0696c1..193fbf61a9b4 100644
--- a/metadata/md5-cache/dev-java/jebl-2013.02.18
+++ b/metadata/md5-cache/dev-java/jebl-2013.02.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e411ec0727a5e1ca9d923a4452cdf643
diff --git a/metadata/md5-cache/dev-java/jebl-9999 b/metadata/md5-cache/dev-java/jebl-9999
index 03fcde472a51..489a106f82a0 100644
--- a/metadata/md5-cache/dev-java/jebl-9999
+++ b/metadata/md5-cache/dev-java/jebl-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD doc elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=188a95c21691c01c237f1654f671851f
diff --git a/metadata/md5-cache/dev-java/jempbox-0.2.0 b/metadata/md5-cache/dev-java/jempbox-0.2.0
index 9b6f78a77848..e47bcdbaaff7 100644
--- a/metadata/md5-cache/dev-java/jempbox-0.2.0
+++ b/metadata/md5-cache/dev-java/jempbox-0.2.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jempbox/JempBox-0.2.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=152f169024e617040714a4ceadcbaf85
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1 b/metadata/md5-cache/dev-java/jempbox-1.7.1
index f3c672506c51..353e3e791753 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57e421768874adaaf4ff0a65edaac1a3
diff --git a/metadata/md5-cache/dev-java/jettison-1.0 b/metadata/md5-cache/dev-java/jettison-1.0
index e969963a48c0..d141e81b119d 100644
--- a/metadata/md5-cache/dev-java/jettison-1.0
+++ b/metadata/md5-cache/dev-java/jettison-1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jaxp-virtual >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repository.codehaus.org/org/codehaus/jettison/jettison/1.0/jettison-1.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=277dc9ffb34ea3c3814bd688b1916c27
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8
index 00667579ca32..3b5f6897843e 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57df6ef22b176cd2aa2ca4cc7c2f3f5d
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
index 9bed267ee5da..00d532c516d0 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f385e180d06bdf813fa895d97391982d
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.0 b/metadata/md5-cache/dev-java/jffi-1.0.0
index 84f6586be48a..002792b53d8f 100644
--- a/metadata/md5-cache/dev-java/jffi-1.0.0
+++ b/metadata/md5-cache/dev-java/jffi-1.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 virtual/libffi >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.4
 SRC_URI=mirror://gentoo/jffi-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3cf090ad6de3ff7442c3736764e31843
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.0-r1 b/metadata/md5-cache/dev-java/jffi-1.0.0-r1
index 2cabf0a7e814..8b20153762f0 100644
--- a/metadata/md5-cache/dev-java/jffi-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 virtual/libffi >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.4
 SRC_URI=mirror://gentoo/jffi-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0dc210dfcc9c03e24f1df62add6e348a
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.11 b/metadata/md5-cache/dev-java/jffi-1.0.11
index 7c38775749df..3e921791b654 100644
--- a/metadata/md5-cache/dev-java/jffi-1.0.11
+++ b/metadata/md5-cache/dev-java/jffi-1.0.11
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jffi/tarball/1.0.11 -> jffi-1.0.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80d1fb36f139f63ec5b4d463177789c5
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.11-r1 b/metadata/md5-cache/dev-java/jffi-1.0.11-r1
index 44be4ef69e8b..1af4f16d4b82 100644
--- a/metadata/md5-cache/dev-java/jffi-1.0.11-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jffi/tarball/1.0.11 -> jffi-1.0.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67cd51cc7b0929530e58124049ef96e7
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.5 b/metadata/md5-cache/dev-java/jffi-1.2.5
index 2e231b8b50e9..86ed082b0eb8 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.5
+++ b/metadata/md5-cache/dev-java/jffi-1.2.5
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/tarball/1.2.5 -> jffi-1.2.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=334b9c742845e83056fe6cefaf2c8341
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.6 b/metadata/md5-cache/dev-java/jffi-1.2.6
index 6c90ca31b6f5..ccb8da1a0637 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.6
+++ b/metadata/md5-cache/dev-java/jffi-1.2.6
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/tarball/1.2.6 -> jffi-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4c9348ca282e25ed776fc09c34e10bd
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.7 b/metadata/md5-cache/dev-java/jffi-1.2.7
index 81076699542a..355712ad5648 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.7
+++ b/metadata/md5-cache/dev-java/jffi-1.2.7
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/tarball/1.2.7 -> jffi-1.2.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5eb8d49fc7a1c8abb0f9729efd428bec
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.7-r2 b/metadata/md5-cache/dev-java/jffi-1.2.7-r2
index 73134700e9da..9fa901a8989e 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.7-r2
+++ b/metadata/md5-cache/dev-java/jffi-1.2.7-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/tarball/1.2.7 -> jffi-1.2.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6a6ceb5bc0fce2952a4a924bf06914c
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.8 b/metadata/md5-cache/dev-java/jffi-1.2.8
index 9cebeb9e4077..0db5eb3f0d75 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.8
+++ b/metadata/md5-cache/dev-java/jffi-1.2.8
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/1.2.8.tar.gz -> jffi-1.2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c37222a7de2c346da347d8b1496001a8
diff --git a/metadata/md5-cache/dev-java/jflex-1.4.3-r1 b/metadata/md5-cache/dev-java/jflex-1.4.3-r1
index d03747b612bf..d68ab0b4c7ab 100644
--- a/metadata/md5-cache/dev-java/jflex-1.4.3-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=dev-java/ant-core-1.7.0 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://sourceforge/jflex/jflex-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=35b0bbfabdbd0a0c2b721ba16ba7bf90
diff --git a/metadata/md5-cache/dev-java/jflex-1.4.3-r2 b/metadata/md5-cache/dev-java/jflex-1.4.3-r2
index 3ef732de26ce..cff8dd8f4d42 100644
--- a/metadata/md5-cache/dev-java/jflex-1.4.3-r2
+++ b/metadata/md5-cache/dev-java/jflex-1.4.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=dev-java/ant-core-1.7.0 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jflex/jflex-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc9b454378fa6af7998b5b6d1d378c4c
diff --git a/metadata/md5-cache/dev-java/jflex-1.5.0 b/metadata/md5-cache/dev-java/jflex-1.5.0
index ed1f0ea9d7b4..41c67204f774 100644
--- a/metadata/md5-cache/dev-java/jflex-1.5.0
+++ b/metadata/md5-cache/dev-java/jflex-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
 RESTRICT=test
 SLOT=1.5
 SRC_URI=http://jflex.de/jflex-1.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d24fba18b45b31481c5e08703d41138
diff --git a/metadata/md5-cache/dev-java/jflex-1.5.1 b/metadata/md5-cache/dev-java/jflex-1.5.1
index 86382b4a0f58..7f302789d001 100644
--- a/metadata/md5-cache/dev-java/jflex-1.5.1
+++ b/metadata/md5-cache/dev-java/jflex-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
 RESTRICT=test
 SLOT=1.5
 SRC_URI=http://jflex.de/jflex-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11b250cc6e9a146b2a06d696bc36aa37
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.0 b/metadata/md5-cache/dev-java/jflex-1.6.0
index b28f323f836e..8456a44dbf7b 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.0
+++ b/metadata/md5-cache/dev-java/jflex-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
 RESTRICT=test
 SLOT=1.6
 SRC_URI=http://jflex.de/jflex-1.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d656e5de898a3a8a970905359067d1ef
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3 b/metadata/md5-cache/dev-java/jformatstring-2.0.3
index 5056fd02bfd7..8c6f3936e4f1 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b81c043cc80bb9dd5e83462fd6f570f2
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.13 b/metadata/md5-cache/dev-java/jfreechart-1.0.13
index 5dff8cd4d5f8..bcb8044a7884 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.13
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/itext-1.4.6:0 dev-java/jcommon:1.0 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eca112c5c9710a8e8046fda4a62ae2a5
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.14 b/metadata/md5-cache/dev-java/jfreechart-1.0.14
index 8c33b1616770..b016bb0e585a 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.14
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/itext-2.1.5:0 >=dev-java/jcommon-1.0.17:1.0 servlet? ( java-virtuals/servlet-api:2.3 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2877aa7c7f63f70c3b7cfaffebe43dbb
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.19 b/metadata/md5-cache/dev-java/jfreechart-1.0.19
index 4959b25a0810..ad1b428cff84 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.19
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jcommon-1.0.23:1.0 dev-java/jfreesvg:2.1 servlet? ( java-virt
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.19.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dcacc52f6844d0bf169c624facf94247
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1 b/metadata/md5-cache/dev-java/jfreesvg-2.1
index ab97a141ea70..1221a9a61da3 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-2.1
+++ b/metadata/md5-cache/dev-java/jfreesvg-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4eeec734e3c07e9f8d4350eee889e041
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index f51da7254950..8bac63de8f33 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-3.0
+++ b/metadata/md5-cache/dev-java/jfreesvg-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f88563780747251280f7f2326f608f51
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
index ba468de9209f..602ff144afc2 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( x86? ( >=dev-java/jgoodies-binding-1.1 >=dev-java/jgoodies-forms-1.0 ) ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30dc83055328fdab9dde575da240fe00
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
index 9d67b61c6270..bfbcc1aa588f 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( >=dev-java/jgoodies-binding-1.1:1.0 >=dev-java/jgoodies-forms-1.0:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=112ce8f7d1be8c0901e3e042a1c60126
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
index 5400db24a9f6..b81e50b0602c 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf1ba5a286a038008aa66f5a8f03a3e6
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
index 1325ba5466da..518633e61535 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae1a581149b16ad1cc19b8e11920a7a5
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.2.1 b/metadata/md5-cache/dev-java/jgoodies-common-1.2.1
index bc4317f0b68a..519f95ee9ddf 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.2.1
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_2_1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef226406839e63dcf59f5c107935c8fc
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
index dd3fd7ff920a..4ec9e90eaabc 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56b77b57ff8d1a794b0651efba2bfe50
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
index e9c23a659822..054ea85eabe6 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9eef7d81fa3e4bec829c11ea3df7819
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
index 3fd20573babb..9d629f59a64d 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8080145519cabf686f71827d1ede31a4
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
index 783640de09c2..a98009e8d7c8 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/jgoodies-forms-1_8_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6247643cfd359e3bdd1b6ab97938d01
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
index c1432aa3ade9..2addf82ed659 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4.2 >=dev-java/java-config-2.2.0
 SLOT=1.2
 SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1a78e35921ec4fdba8ae9159c234780
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index a20eae07985a..9532b19308b4 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c729561d3059d44e122739628b09755a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
index ba93254c3e21..8674f31b5387 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8006d561a7dce4f9323410d0897dca61
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index 1c198f95c6d4..6eb323e12e73 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88fb254fb8e81fb4e5160cdcf67e39a2
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
index aaec20ee4d95..45afe140280e 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=715326f5b74e08f617fe1ef0f6069c30
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
index 4f6c9f9cbe68..e4474149392d 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgraph/jgraph-5.12.0.4-lgpl-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9baf7961740870eb03187bdb90cac30
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.3 b/metadata/md5-cache/dev-java/jgrapht-0.8.3
index 74c0b0e67abd..5cc56f93fd56 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.8.3
+++ b/metadata/md5-cache/dev-java/jgrapht-0.8.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.8.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a8e3850dd866c1658ef41c631330204
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index a32a92fe81e7..9ffd9437101d 100644
--- a/metadata/md5-cache/dev-java/jgroups-2.9.0
+++ b/metadata/md5-cache/dev-java/jgroups-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/bsh:0 dev-java/log4j:0 java-virtuals/jmx >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javagroups/JGroups-2.9.0.GA.src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6488ce293c3a6746bd084f9343ac867
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r1 b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
index 05f9a30b17e8..81022ffeb00d 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r1
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/ant-core:0 dev-java/bcel:0 java-virtuals/stax-api dev-java/xpp3:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c12f415dc2c64d8bd161930a91578c4c
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1
index 9172bce7ee98..88e05e00a283 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/bcel:0 java-virtuals/stax-api ~dev-java/jibx-1.1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd6006fcee9118b117f365227be9cba5
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index a69971c58644..da7fc7d3a98b 100644
--- a/metadata/md5-cache/dev-java/jicmp-1.0.2
+++ b/metadata/md5-cache/dev-java/jicmp-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f175f192b49f96e9595609f98337dd9
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r1 b/metadata/md5-cache/dev-java/jid3-0.46-r1
index e547a1ba76c3..1d2c993d98fe 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r1
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 test? ( =dev-java/junit-3.8* ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e254fa8e970b131c1c53d5e50c584ab
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index f806561df2c0..b7506af9d41f 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef997a72643ea40af1223355804d497a
diff --git a/metadata/md5-cache/dev-java/jigsaw-2.2.6 b/metadata/md5-cache/dev-java/jigsaw-2.2.6
index 529a50a3146f..143b6b27c598 100644
--- a/metadata/md5-cache/dev-java/jigsaw-2.2.6
+++ b/metadata/md5-cache/dev-java/jigsaw-2.2.6
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.5 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 dev-java/xerces:2 dev-java/jtidy >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f5451f9feb0de5e498b88ac914149e5
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index b8e81e66f8cb..018635647714 100644
--- a/metadata/md5-cache/dev-java/jinklevel-0.1
+++ b/metadata/md5-cache/dev-java/jinklevel-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mso.googlecode.com/files/jinklevel-0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b453f45a544b7c727832bb27e115225c
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
index d54e2b869d7a..9b3c6915cba7 100644
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20f0954e9b4b3bbd55c0f7ee783e6d19
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r2 b/metadata/md5-cache/dev-java/jisp-2.5.1-r2
index 41ae1ab064fb..b4ae7d483baf 100644
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r2
+++ b/metadata/md5-cache/dev-java/jisp-2.5.1-r2
@@ -8,5 +8,5 @@ LICENSE=SVFL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2.5
 SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7fc87eaa555696da00d00c106c19273
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r3 b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
index fdd3ec6b97fe..cb4218f1c6b8 100644
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r3
+++ b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
@@ -9,5 +9,5 @@ LICENSE=SVFL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=507cd1ed6958acbb7b6dd296d4d6179e
diff --git a/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2 b/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
index 97bf7a7cbda3..020d5f0a8589 100644
--- a/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
+++ b/metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=157b32a452189db5a24fb780c1fa2e25
diff --git a/metadata/md5-cache/dev-java/jlayer-1.0.1 b/metadata/md5-cache/dev-java/jlayer-1.0.1
index de7e7a02a9f9..69c73599c5e2 100644
--- a/metadata/md5-cache/dev-java/jlayer-1.0.1
+++ b/metadata/md5-cache/dev-java/jlayer-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.javazoom.net/javalayer/sources/jlayer1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87d00cf6667e9cf59e99c4c6216eef82
diff --git a/metadata/md5-cache/dev-java/jldap-20060300 b/metadata/md5-cache/dev-java/jldap-20060300
index a642836c1a52..c2c1bd09c069 100644
--- a/metadata/md5-cache/dev-java/jldap-20060300
+++ b/metadata/md5-cache/dev-java/jldap-20060300
@@ -8,5 +8,5 @@ LICENSE=OPENLDAP
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-httpclient-2.0* dev-java/openspml dev-java/openspml2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jldap-Mar_ndk_2006-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9cece2db11c3dbd8571ff7729bbac648
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r1 b/metadata/md5-cache/dev-java/jlex-1.2.6-r1
index 60dfc7c90395..e523227e1678 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r1
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r1
@@ -8,5 +8,5 @@ LICENSE=jlex
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d72db367280b517f7de276c8193b9e1
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r2 b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
index 55e6642e8b86..930fe1b85f0d 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r2
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
@@ -9,5 +9,5 @@ LICENSE=jlex
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8dc4488cfdc8487ec1f0bbada9691105
diff --git a/metadata/md5-cache/dev-java/jlfgr-1.0-r1 b/metadata/md5-cache/dev-java/jlfgr-1.0-r1
index c90dd832b078..53df43046734 100644
--- a/metadata/md5-cache/dev-java/jlfgr-1.0-r1
+++ b/metadata/md5-cache/dev-java/jlfgr-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=sun-jlfgr
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jlfgr-1_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=31c3e0bb637a6a6cf441992eeb686384
diff --git a/metadata/md5-cache/dev-java/jlibeps-0.1 b/metadata/md5-cache/dev-java/jlibeps-0.1
index 7a593ae1b401..5c1e5e07c371 100644
--- a/metadata/md5-cache/dev-java/jlibeps-0.1
+++ b/metadata/md5-cache/dev-java/jlibeps-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jlibeps/jlibeps-0.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=608ece0b8123dc73dd31f1b5b7ae3fc5
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index 77fefcda181e..f1fb5f4ce606 100644
--- a/metadata/md5-cache/dev-java/jline-1.0
+++ b/metadata/md5-cache/dev-java/jline-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jline/jline-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a458d78fd29e869e442cb052cbe62c3
diff --git a/metadata/md5-cache/dev-java/jline-2.12.1 b/metadata/md5-cache/dev-java/jline-2.12.1
index 3e4f38ed2bb7..7e47a820d8d0 100644
--- a/metadata/md5-cache/dev-java/jline-2.12.1
+++ b/metadata/md5-cache/dev-java/jline-2.12.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jansi:1.11 dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jline/jline2/archive/jline-2.12.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e1af10964421d370ead5cd1836af4828
diff --git a/metadata/md5-cache/dev-java/jmdns-1.0 b/metadata/md5-cache/dev-java/jmdns-1.0
index c0e32e3c5479..d2e32ce7dd83 100644
--- a/metadata/md5-cache/dev-java/jmdns-1.0
+++ b/metadata/md5-cache/dev-java/jmdns-1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jmdns/jmdns-1.0-Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b89e0602a3d6386ccb1f66e2c20e51aa
diff --git a/metadata/md5-cache/dev-java/jmdns-3.1.4 b/metadata/md5-cache/dev-java/jmdns-3.1.4
index 5e233c5d98a7..8270f508348b 100644
--- a/metadata/md5-cache/dev-java/jmdns-3.1.4
+++ b/metadata/md5-cache/dev-java/jmdns-3.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://sourceforge/jmdns/jmdns-3.1.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5135714085d7bf7300d1bc2173690603
diff --git a/metadata/md5-cache/dev-java/jmdns-3.4.1 b/metadata/md5-cache/dev-java/jmdns-3.4.1
index 2c7eeaa72ea9..e06d799afdbb 100644
--- a/metadata/md5-cache/dev-java/jmdns-3.4.1
+++ b/metadata/md5-cache/dev-java/jmdns-3.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.4
 SRC_URI=mirror://sourceforge/jmdns/jmdns-3.4.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7dbd060f091ca6fc405ec30e4507460b
diff --git a/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2 b/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
index 9824c9edc7dd..d1d0dd5d909b 100644
--- a/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
+++ b/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmf-2_1_1e-alljava.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=92496b1447bc28a5eddb19e3c0941e24
diff --git a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3 b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
index 023c7714a554..9f0a50017d55 100644
--- a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
+++ b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
@@ -8,5 +8,5 @@ LICENSE=sun-bcla-jmi
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a411a28796ef78e5cf26e0a6a2f52d8e
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0 b/metadata/md5-cache/dev-java/jmock-1.2.0
index 178dc526cb4d..339bc4aaccbd 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.codehaus.org/dist/jmock-1.2.0-jars.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffd02ccf6220de5055392d4fd9613f9b
diff --git a/metadata/md5-cache/dev-java/jmock-2.5.1 b/metadata/md5-cache/dev-java/jmock-2.5.1
index 81b8c6ed62a1..8040c815ad07 100644
--- a/metadata/md5-cache/dev-java/jmock-2.5.1
+++ b/metadata/md5-cache/dev-java/jmock-2.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/jre:1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://jmock.codehaus.org/dist/jmock-2.5.1-jars.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41f1489a5df629a83c778ce0847d4594
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1 b/metadata/md5-cache/dev-java/jmock-2.6.1
index 4542b3b2df42..ddf42f32cf54 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://www.jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8800b347437ae6ba4d29ef4354fbdf4a
diff --git a/metadata/md5-cache/dev-java/jna-3.4.0 b/metadata/md5-cache/dev-java/jna-3.4.0
index 8a3313874618..2b89047fb594 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.0
+++ b/metadata/md5-cache/dev-java/jna-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.0 -> jna-3.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3734af59bba3e2623dca5a07da051647
diff --git a/metadata/md5-cache/dev-java/jna-3.4.0-r1 b/metadata/md5-cache/dev-java/jna-3.4.0-r1
index 4e4942df7674..88a3a6a7ddc0 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.0-r1
+++ b/metadata/md5-cache/dev-java/jna-3.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.0 -> jna-3.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1650f3b1dbdb9001ac4966f1feb46f63
diff --git a/metadata/md5-cache/dev-java/jnlp-api-6.0.18 b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
index 9719b7f488b3..27d71e6577f1 100644
--- a/metadata/md5-cache/dev-java/jnlp-api-6.0.18
+++ b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~caster/distfiles/jnlp-api-6.0.18.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8320d31b6c0700463cc490bf1df5e8ba
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.2 b/metadata/md5-cache/dev-java/jnr-constants-0.8.2
deleted file mode 100644
index 24e3fd2befde..000000000000
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=4
-HOMEPAGE=http://github.com/jnr
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://github.com/jnr/jnr-constants/tarball/0.8.2 -> jnr-constants-0.8.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c27ebdebcc0b030263887aa10858a121
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1 b/metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1
deleted file mode 100644
index dc5f57191e20..000000000000
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=4
-HOMEPAGE=http://github.com/jnr
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0.8.2
-SRC_URI=http://github.com/jnr/jnr-constants/tarball/0.8.2 -> jnr-constants-0.8.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7588e8119f8d75edd572f025cfed3a4d
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.3 b/metadata/md5-cache/dev-java/jnr-constants-0.8.3
deleted file mode 100644
index 4036df751803..000000000000
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-constants
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.3 -> jnr-constants-0.8.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=384145ceb28393ce1042f63cd118dd40
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1 b/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
index 76a54cbe197b..ac9e6b834655 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.8.2
 SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.3 -> jnr-constants-0.8.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0e29240327b92c6c029000424206965
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.4 b/metadata/md5-cache/dev-java/jnr-constants-0.8.4
deleted file mode 100644
index 01cf9c5bafbe..000000000000
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-constants
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.4 -> jnr-constants-0.8.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bb4bcbb73a55eda4439fc30503e187cb
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.5 b/metadata/md5-cache/dev-java/jnr-constants-0.8.5
deleted file mode 100644
index ac065fb79aa5..000000000000
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A set of platform constants (e.g. errno values)
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-constants
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.5 -> jnr-constants-0.8.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f617cbfae7cb692e6c7fe2475c1b798e
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.6 b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
index b8bf4b8f866c..bb8fb446738d 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.6
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
@@ -4,10 +4,10 @@ DESCRIPTION=A set of platform constants (e.g. errno values)
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-constants
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7d84370386dd61c1fbe467dcf445c3eb
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0c7b1263b051d2f68fa36c5461fe97c1
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.4 b/metadata/md5-cache/dev-java/jnr-enxio-0.4
deleted file mode 100644
index 0fa0093bcd0c..000000000000
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Native Runtime Enhanced X-platform I/O
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-enxio
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://github.com/jnr/jnr-enxio/archive/0.4.tar.gz -> jnr-enxio-0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f239da6dddc6556aa892ba5c281d32ba
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.7 b/metadata/md5-cache/dev-java/jnr-enxio-0.7
index 92c452ac1f23..1f6bdcf66485 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Java Native Runtime Enhanced X-platform I/O
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-enxio
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=36cb969a03250c3fa8de034f92a07318
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4921844abcfaba22ef5fe290ce0d2dc1
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.5.10 b/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
index 21e2e4094c18..723211aa1bda 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.5
 SRC_URI=http://github.com/jnr/jnr-ffi/tarball/0.5.10 -> jnr-ffi-0.5.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54a3f26cc4201246ae275948730ad4d0
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0 b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
index 9a79087af03c..831cfc63aaac 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1
 RESTRICT=test
 SLOT=0.6
 SRC_URI=http://github.com/jnr/jnr-ffi/tarball/0.6.0 -> jnr-ffi-0.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30489cf0529e816eebd329fedb4b4ad3
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11
deleted file mode 100644
index a2737e49f7cc..000000000000
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An abstracted interface to invoking native functions from java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0.7
-SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.11 -> jnr-ffi-0.7.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a9de7ecadba97167e8bc5207a729f233
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
index d20e35096d17..4d370960216a 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An abstracted interface to invoking native functions from java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-ffi
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=dev-java/jffi-1.2.7-r1:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.7
 SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.11 -> jnr-ffi-0.7.11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=47496b0c05f120110954b9c63b9a5b66
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2b70e45dd7092b6e9b25a23b2ce76598
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.7 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.7
deleted file mode 100644
index 144385f925ca..000000000000
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An abstracted interface to invoking native functions from java
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0.7
-SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.7 -> jnr-ffi-0.7.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4224e79562a3efb1b6c15b17f4e4664f
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.9 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.9
deleted file mode 100644
index 6eb23db899e8..000000000000
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An abstracted interface to invoking native functions from java
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0.7
-SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.9 -> jnr-ffi-0.7.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=63b49eac8cf3ffec03e1f3d302087223
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10 b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
index 36a482fc2537..cbbfb62e7369 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=An abstracted interface to invoking native functions from java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-ffi
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/1.0.10.tar.gz -> jnr-ffi-1.0.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=42c56bdc0a6eca23f2af072d4929fb7c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a58b4ddf75cd1bac98b673ec77d36671
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-1.0.6 b/metadata/md5-cache/dev-java/jnr-ffi-1.0.6
deleted file mode 100644
index db9afbfc311e..000000000000
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jdk-1.5 test? ( dev-java/ant-junit:0 >=dev-java/junit-4.8:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An abstracted interface to invoking native functions from java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-ffi
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1
-SRC_URI=https://github.com/jnr/jnr-ffi/tarball/1.0.6 -> jnr-ffi-1.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8bbad76e2545f6a903a2fa68d7c4ac76
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
index 2a212754e197..3a66fe3f7b67 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=An abstracted interface to invoking native functions from java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-ffi
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e514a44329e75d182c05fa8261d43136
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4f0cffaeb08e9e3220805b83812c0cd7
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.0.1 b/metadata/md5-cache/dev-java/jnr-netdb-1.0.1
index 99fc303f51d8..39b9ba591fe5 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.0.1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/jaffl-0.5.1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/wmeissner/jnr-netdb/tarball/1.0.1 -> jnr-netdb-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d95caf09f5d9710fbebdc7338318e77a
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.0.6 b/metadata/md5-cache/dev-java/jnr-netdb-1.0.6
deleted file mode 100644
index 03562ba448a1..000000000000
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network services database access for java
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-netdb
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-netdb/tarball/1.0.6 -> jnr-netdb-1.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f11d10a902cccd5a97556e05db91a003
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.1 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.1
deleted file mode 100644
index 9c37ae181d3a..000000000000
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network services database access for java
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-netdb
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-netdb/tarball/1.1.1 -> jnr-netdb-1.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4b849cf9e42649e04ba728793b3add25
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.2
deleted file mode 100644
index 775468e852f6..000000000000
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network services database access for java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-netdb
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-netdb/tarball/1.1.2 -> jnr-netdb-1.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f657a7d31f9a0b78330f5ba77172dc66
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1
deleted file mode 100644
index 36e3922ed1be..000000000000
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-ffi:1 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Network services database access for java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-netdb
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-ffi:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.0
-SRC_URI=https://github.com/jnr/jnr-netdb/tarball/1.1.2 -> jnr-netdb-1.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2e85d906ae1f0812f26fdcfe11aedd95
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
index 98be0b91ebd6..336998fa6980 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Network services database access for java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-netdb
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d2de79e7c1b8a787c52493dc51bdd34e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=67654834b75923697924ac17f7ec3ed1
diff --git a/metadata/md5-cache/dev-java/jnr-posix-1.1.4 b/metadata/md5-cache/dev-java/jnr-posix-1.1.4
deleted file mode 100644
index ea02ea50c543..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 >=dev-java/jaffl-0.5.1:0 >=dev-java/constantine-0.7:0 test? ( dev-java/ant-junit4 dev-java/jffi:0.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=2
-HOMEPAGE=http://github.com/wmeissner/jnr-posix/
-IUSE=elibc_FreeBSD source test elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=virtual/jre-1.5 >=dev-java/jaffl-0.5.1:0 >=dev-java/constantine-0.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://github.com/wmeissner/jnr-posix/tarball/1.1.4 -> jnr-posix-1.1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ab1204d819e60628482af9fbc961b661
diff --git a/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1 b/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
index be5241f450f1..4005845133b5 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0.8.2 dev-java/jnr-ffi:0.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://github.com/jnr/jnr-posix/tarball/1.1.8 -> jnr-posix-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa31ef29613517a99e25e50de95920c4
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.0.0 b/metadata/md5-cache/dev-java/jnr-posix-2.0.0
deleted file mode 100644
index ba548c698724..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.6 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=4
-HOMEPAGE=http://github.com/jnr/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.6 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://github.com/jnr/jnr-posix/tarball/2.0.0 -> jnr-posix-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=874e7e4a56ec9e6c473688aa4b8f0142
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.3.0 b/metadata/md5-cache/dev-java/jnr-posix-2.3.0
deleted file mode 100644
index ad0f46cd422e..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=4
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.3.0 -> jnr-posix-2.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e4535168ead57b361ed66e130af90e0b
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.4.0 b/metadata/md5-cache/dev-java/jnr-posix-2.4.0
index 77d22bae6af0..fa4b45e47c7e 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.4.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
 DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-posix
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.4.0 -> jnr-posix-2.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ab47937b1afbbdbbdced6868304214ab
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b44dbd03c63548953b5d2fdd4754948f
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.5.0 b/metadata/md5-cache/dev-java/jnr-posix-2.5.0
deleted file mode 100644
index 0fa0c8d272f7..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-2.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.5.0 -> jnr-posix-2.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f7346aa4ce2edba65cdb2623481dbe9
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.5.2 b/metadata/md5-cache/dev-java/jnr-posix-2.5.2
deleted file mode 100644
index 98fa78ba8b9c..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-2.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.5
-SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.5.2 -> jnr-posix-2.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cb262e222e2aa38dc5a21975249647d0
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.0 b/metadata/md5-cache/dev-java/jnr-posix-3.0.0
deleted file mode 100644
index e8e009209cae..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=https://github.com/jnr/jnr-posix/tarball/3.0.0 -> jnr-posix-3.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=724e5a40bca4c1cb0c089a08df510bb0
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.1
deleted file mode 100644
index 3cc4553bfac6..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=https://github.com/jnr/jnr-posix/tarball/3.0.1 -> jnr-posix-3.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f3f51f4b76306750a25ef043fe4fb67f
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1
index 49d6d6dca044..99e58ac30072 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-posix
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/tarball/3.0.1 -> jnr-posix-3.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d2b51adfcb91a12ea730ac2e66b98402
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c329da0685fcf6f1a56877a1eed0e72c
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
deleted file mode 100644
index 2b27c7fee1ea..000000000000
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jdk-1.6 test? ( dev-java/ant-junit dev-java/junit:4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-posix
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1fb055d48636dada5a38abd1aaf80c35
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.3 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
deleted file mode 100644
index 5a720c45d3e7..000000000000
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-ffi:0.7 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Unix sockets for Java
-EAPI=5
-HOMEPAGE=https://github.com/jnr/jnr-unixsocket
-IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://github.com/jnr/jnr-unixsocket/archive/0.3.tar.gz -> jnr-unixsocket-0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=02b9ff9509c4121eb32ab984bd55f72d
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6
index 31a4c7af5872..896af4fab1f8 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Unix sockets for Java
 EAPI=5
 HOMEPAGE=https://github.com/jnr/jnr-unixsocket
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c83b80e763b3721b4c5e12904316ec7e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=471048338948acd698709d6fa8eed84f
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-0.1 b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
index 7acf0dfdb163..47e0656dd049 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-0.1
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/wmeissner/jnr-x86asm/tarball/0.1 -> jnr-x86asm-0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2d3090774484b48f6bbac3ed120a437
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.1 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.1
index 7b2c9ce3e244..8d13a2a26fbc 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.1
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://github.com/jnr/jnr-x86asm/tarball/1.0.1 -> jnr-x86asm-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b140d12e1b5f2bd004328e3ffdb083f
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2
index a60dd53557d7..c3aa348bbdc1 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/tarball/1.0.2 -> jnr-x86asm-1.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccf6f5b5c5ce77e5a727a50160c2d514
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1
index e1ce7c70ea35..48165fbdb314 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67f4446248e818987ff26f10a22a0684
diff --git a/metadata/md5-cache/dev-java/joda-time-1.6 b/metadata/md5-cache/dev-java/joda-time-1.6
index a3fc2c87c8e5..7cfe77cb2d5e 100644
--- a/metadata/md5-cache/dev-java/joda-time-1.6
+++ b/metadata/md5-cache/dev-java/joda-time-1.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-1.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6fac1855339f7c7036bdb83a26dde2e
diff --git a/metadata/md5-cache/dev-java/joda-time-2.2 b/metadata/md5-cache/dev-java/joda-time-2.2
index 184f610bfdfc..56b03fea7067 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-2.2-dist.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c01dad534865f611d3c48aadc6b0414c
diff --git a/metadata/md5-cache/dev-java/joda-time-2.3 b/metadata/md5-cache/dev-java/joda-time-2.3
index 02cbb36fd8f3..b219c3c368c4 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.3
+++ b/metadata/md5-cache/dev-java/joda-time-2.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-2.3-dist.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7a622a885191e0b307f075d40e8bc2a
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index c62f7782ad01..6f0c7ffa21bb 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.7
+++ b/metadata/md5-cache/dev-java/joda-time-2.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a5f8bc2a208b32acf7b168e7bb63274
diff --git a/metadata/md5-cache/dev-java/joni-1.1.4 b/metadata/md5-cache/dev-java/joni-1.1.4
index 111a521ef3c0..7ecc1ce3cfee 100644
--- a/metadata/md5-cache/dev-java/joni-1.1.4
+++ b/metadata/md5-cache/dev-java/joni-1.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/asm:3 dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://github.com/jruby/joni/tarball/1.1.4 -> joni-1.1.4.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec986429725d70a83b6f3b33799bb0f3
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
index d5ae6dc10aa7..efa9f9c1470d 100644
--- a/metadata/md5-cache/dev-java/joni-2.1.0
+++ b/metadata/md5-cache/dev-java/joni-2.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7536f1ec3aa724b74f1d4aa61c15a6b4
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.4 b/metadata/md5-cache/dev-java/jopt-simple-4.4
index f2ede101fb40..fb2cf04245be 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.4
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.4 -> jopt-simple-4.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7fabdc14d1ff42be8c179bea4b0c1e45
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.5 b/metadata/md5-cache/dev-java/jopt-simple-4.5
index 2c3371cbda3e..f8a209991648 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.5
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.5 -> jopt-simple-4.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9de39222ba029dc71dd38b1d690f0020
diff --git a/metadata/md5-cache/dev-java/jortho-1.0 b/metadata/md5-cache/dev-java/jortho-1.0
index 8b9327cc1cfe..7f49cee2a10c 100644
--- a/metadata/md5-cache/dev-java/jortho-1.0
+++ b/metadata/md5-cache/dev-java/jortho-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jortho/JOrtho%20Library/1.0/JOrtho_1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48d5079e6ff5416e2dd72971ed3f8e98
diff --git a/metadata/md5-cache/dev-java/jpf-1.5.1 b/metadata/md5-cache/dev-java/jpf-1.5.1
index 604fbff5e933..011e243e80f2 100644
--- a/metadata/md5-cache/dev-java/jpf-1.5.1
+++ b/metadata/md5-cache/dev-java/jpf-1.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-logging:0 dev-java/ant-core >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7
 SLOT=1.5
 SRC_URI=mirror://sourceforge/jpf/jpf-src-1.5.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3cfa251865275cb105cc56d3c44bac25
diff --git a/metadata/md5-cache/dev-java/jpfcodegen-0.4 b/metadata/md5-cache/dev-java/jpfcodegen-0.4
index d8b50ca789d4..7d2c66f74ce6 100644
--- a/metadata/md5-cache/dev-java/jpfcodegen-0.4
+++ b/metadata/md5-cache/dev-java/jpfcodegen-0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/velocity:0 dev-java/jpf:1.5 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7
 SLOT=0
 SRC_URI=mirror://gentoo/jpfcodegen-0.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24bceb8c78cd90bf9a6f6c6e904098dd
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
index cf69805853ee..18422059e657 100644
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0aeb9ce3afbe5667558e9e0f35b5967a
diff --git a/metadata/md5-cache/dev-java/jrexx-1.1.1-r1 b/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
index d8e8af7746c7..5440a344896d 100644
--- a/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d888f7eb7708736067b739ca91b68014
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
index 22ff5f6f23b5..47b5643bd429 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b3a47d9dcf8f323e1b57d97d74c76686
diff --git a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1 b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
index bf23aacaa040..795ee3e61df9 100644
--- a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 net-analyzer/rrdtool >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=adb778d9dc53b0bfc4fc3a4d2389fddd
diff --git a/metadata/md5-cache/dev-java/jruby-1.7.12 b/metadata/md5-cache/dev-java/jruby-1.7.12
index 527c4753e789..cbde32216e73 100644
--- a/metadata/md5-cache/dev-java/jruby-1.7.12
+++ b/metadata/md5-cache/dev-java/jruby-1.7.12
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/asm:4 dev-java/bsf:2.3 >=dev-java/bytelist-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.7.12/jruby-src-1.7.12.tar.gz http://dev.gentoo.org/~tomwij/files/dist/jruby-1.7.12-mvn-ant-ant.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27f4513f9d112cc6f50ea4bfcd13b186
diff --git a/metadata/md5-cache/dev-java/jsap-2.1 b/metadata/md5-cache/dev-java/jsap-2.1
index d92c262c8fd0..839aa5dcd5dc 100644
--- a/metadata/md5-cache/dev-java/jsap-2.1
+++ b/metadata/md5-cache/dev-java/jsap-2.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xstream >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b8ce69b391b60a579c436b4e53519a9
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.49 b/metadata/md5-cache/dev-java/jsch-0.1.49
index 19390665c344..6bcfcd245dd3 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.49
+++ b/metadata/md5-cache/dev-java/jsch-0.1.49
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.5 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.49.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=497086f2b3db8ddc30781b126258e03b
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index a19444b367cb..4ad99cc52c9d 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.52
+++ b/metadata/md5-cache/dev-java/jsch-0.1.52
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.6 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.52.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf4b1a73e78ec2acd90426c0826045b4
diff --git a/metadata/md5-cache/dev-java/jscience-1.0.4-r1 b/metadata/md5-cache/dev-java/jscience-1.0.4-r1
index 42e8ab7fcd57..c63495fa80d8 100644
--- a/metadata/md5-cache/dev-java/jscience-1.0.4-r1
+++ b/metadata/md5-cache/dev-java/jscience-1.0.4-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.4 ~dev-java/javolution-2.2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jscience.org/jscience-1.0.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7f22c9f22f9125819b0f26b02fb1e26
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 8dcbdc374530..7dd216490850 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1
+++ b/metadata/md5-cache/dev-java/json-simple-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://json-simple.googlecode.com/files/json_simple-1.1-all.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f02f6d33ca32beade7aabb0c1901306d
diff --git a/metadata/md5-cache/dev-java/jsoup-1.7.2 b/metadata/md5-cache/dev-java/jsoup-1.7.2
index b7b2de936f78..227f895e0b43 100644
--- a/metadata/md5-cache/dev-java/jsoup-1.7.2
+++ b/metadata/md5-cache/dev-java/jsoup-1.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jhy/jsoup/archive/jsoup-1.7.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2e5f78be16fc4135c182a5dc8505bb5
diff --git a/metadata/md5-cache/dev-java/jsoup-1.8.1 b/metadata/md5-cache/dev-java/jsoup-1.8.1
index cfa2a1542ca8..d33f4c336789 100644
--- a/metadata/md5-cache/dev-java/jsoup-1.8.1
+++ b/metadata/md5-cache/dev-java/jsoup-1.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jhy/jsoup/archive/jsoup-1.8.1.a.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1069e18ac10dde9f9af088207647bcfa
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
index b6c071b2866f..a8fe4e8a4b1f 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4712da3790d2a26821c5faf967bf73de
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r2 b/metadata/md5-cache/dev-java/jsr101-1.4-r2
index 7cd634b7b2b7..10e7c36d04de 100644
--- a/metadata/md5-cache/dev-java/jsr101-1.4-r2
+++ b/metadata/md5-cache/dev-java/jsr101-1.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:2.5 java-virtuals/saaj-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/ws/axis/1_4/axis-src-1_4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60fe3b6ca9829eb43a73f8d06d1f44e9
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index 6b37cb724206..44d5236356fd 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc0075d2b2ba16173ed8a65e0ad2820a
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0 b/metadata/md5-cache/dev-java/jsr181-1.0
index b2935621fe3c..4dc24ba0c4d4 100644
--- a/metadata/md5-cache/dev-java/jsr181-1.0
+++ b/metadata/md5-cache/dev-java/jsr181-1.0
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d6fb05d8a05022a8ab1156752a25d81
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0-r1 b/metadata/md5-cache/dev-java/jsr181-1.0-r1
index 24e205d245f8..8aa9cb5b7d15 100644
--- a/metadata/md5-cache/dev-java/jsr181-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr181-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae8eac2f60e988b5755e605ec1df7456
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r1 b/metadata/md5-cache/dev-java/jsr223-1.0-r1
index 0380e340873b..b11226f112eb 100644
--- a/metadata/md5-cache/dev-java/jsr223-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr223-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0b613bf3b85cf77d1d3815378015ee0
diff --git a/metadata/md5-cache/dev-java/jsr250-1.0 b/metadata/md5-cache/dev-java/jsr250-1.0
index b567dabb674b..e4bceac0f5ad 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.0
+++ b/metadata/md5-cache/dev-java/jsr250-1.0
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1fffeb96f0027b39e67b2284305450db
diff --git a/metadata/md5-cache/dev-java/jsr250-1.0-r1 b/metadata/md5-cache/dev-java/jsr250-1.0-r1
index 9a3ec726e50b..db83a37f77d3 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr250-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.java.net/maven/2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4d1807e9018243169ceae1f6109c25
diff --git a/metadata/md5-cache/dev-java/jsr305-1.0-r1 b/metadata/md5-cache/dev-java/jsr305-1.0-r1
index 6f21ba7c35c1..c142b38cbed0 100644
--- a/metadata/md5-cache/dev-java/jsr305-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr305-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jsr-305-source.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e2a1d99de440bb2e2fe727e57e5da7b
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.1 b/metadata/md5-cache/dev-java/jsr311-api-1.1
index 56616f22c467..a3a15d87bc94 100644
--- a/metadata/md5-cache/dev-java/jsr311-api-1.1
+++ b/metadata/md5-cache/dev-java/jsr311-api-1.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jsr311-api-1.1-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07e6d5ca813ff788179d82f51ff08e1f
diff --git a/metadata/md5-cache/dev-java/jsr67-1.3 b/metadata/md5-cache/dev-java/jsr67-1.3
index 81ead0c8e02d..89e4126c425b 100644
--- a/metadata/md5-cache/dev-java/jsr67-1.3
+++ b/metadata/md5-cache/dev-java/jsr67-1.3
@@ -8,5 +8,5 @@ LICENSE=sun-jsr67
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://saaj.dev.java.net/spec-1.3/saaj-api.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5f00f5c0f56ee342f2d7999c4004eff
diff --git a/metadata/md5-cache/dev-java/jsr93-1.0 b/metadata/md5-cache/dev-java/jsr93-1.0
index f047527a2a4a..a6d8fc562857 100644
--- a/metadata/md5-cache/dev-java/jsr93-1.0
+++ b/metadata/md5-cache/dev-java/jsr93-1.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/sun-jaf >=dev-java/java-config-2.2.0 source?
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jaxr-1_0-fr-spec.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03e2898b113e82ce5f39099b0cf7e4d0
diff --git a/metadata/md5-cache/dev-java/jss-4.2.5 b/metadata/md5-cache/dev-java/jss-4.2.5
index 008abff5b69a..654ef8b04536 100644
--- a/metadata/md5-cache/dev-java/jss-4.2.5
+++ b/metadata/md5-cache/dev-java/jss-4.2.5
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/nspr-4.3 >=dev-libs/nss-3.9.2 >=dev-java/ja
 RESTRICT=test
 SLOT=3.4
 SRC_URI=mirror://gentoo/jss-4.2.5.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=275a2dd7e2365f9a2ed58217d283ef1e
diff --git a/metadata/md5-cache/dev-java/jss-4.3 b/metadata/md5-cache/dev-java/jss-4.3
index e079ea98bafb..56ac1a1ef6d8 100644
--- a/metadata/md5-cache/dev-java/jss-4.3
+++ b/metadata/md5-cache/dev-java/jss-4.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/nspr-4.7 >=dev-libs/nss-3.12 >=dev-java/jav
 RESTRICT=test
 SLOT=3.4
 SRC_URI=mirror://gentoo/jss-4.3.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f4db2f5b01852543b52fdab7fa4dea1
diff --git a/metadata/md5-cache/dev-java/jss-4.3-r1 b/metadata/md5-cache/dev-java/jss-4.3-r1
index 7888e8f909f9..cfa8e158b1c0 100644
--- a/metadata/md5-cache/dev-java/jss-4.3-r1
+++ b/metadata/md5-cache/dev-java/jss-4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/nspr-4.7 >=dev-libs/nss-3.12 >=dev-java/jav
 RESTRICT=test
 SLOT=3.4
 SRC_URI=mirror://gentoo/jss-4.3.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c84b52669a2060ea7f98a98a36da169
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index 5e75510b7e1e..5aa4077ee6de 100644
--- a/metadata/md5-cache/dev-java/jstun-0.7.3
+++ b/metadata/md5-cache/dev-java/jstun-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 sour
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2f4ad5952a71f04ebcb6bf0719ad836
diff --git a/metadata/md5-cache/dev-java/jta-1.0.1-r1 b/metadata/md5-cache/dev-java/jta-1.0.1-r1
index 1d84f62a50c5..4cb0450568c0 100644
--- a/metadata/md5-cache/dev-java/jta-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.0.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_0_1B-classes.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d5745c2bc48feb49c4611a4bfd22339
diff --git a/metadata/md5-cache/dev-java/jta-1.1 b/metadata/md5-cache/dev-java/jta-1.1
index ff918e1b3841..450768368c38 100644
--- a/metadata/md5-cache/dev-java/jta-1.1
+++ b/metadata/md5-cache/dev-java/jta-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_1-classes.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c927b39c2560ede5343db349ab4d1f0
diff --git a/metadata/md5-cache/dev-java/jtds-1.2.5-r1 b/metadata/md5-cache/dev-java/jtds-1.2.5-r1
index 0716ea102598..d669560636b7 100644
--- a/metadata/md5-cache/dev-java/jtds-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jcifs:1.1 virtual/jre:1.6 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=1.2
 SRC_URI=mirror://sourceforge/jtds/jtds-1.2.5-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e3dac256b35207eec9f4162001c40d9
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.0 b/metadata/md5-cache/dev-java/jtds-1.3.0
index 2086fbb7095c..0497acee2731 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.0
+++ b/metadata/md5-cache/dev-java/jtds-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jcifs:1.1 virtual/jre:1.7 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/jtds/jtds-1.3.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cd8ec40200a070a7938ecdb29f9a62a
diff --git a/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1 b/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
index c5cedf59467d..d371e55599c0 100644
--- a/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
+++ b/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
@@ -8,5 +8,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtidy/jtidy-04aug2000r7-dev.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c81e5fad337c3259af21ceb9eabb3e0a
diff --git a/metadata/md5-cache/dev-java/jtreemap-1.1.0 b/metadata/md5-cache/dev-java/jtreemap-1.1.0
index 5ee040bf1830..88aaab5590f3 100644
--- a/metadata/md5-cache/dev-java/jtreemap-1.1.0
+++ b/metadata/md5-cache/dev-java/jtreemap-1.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtreemap/jtreemap-1.1.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1641131bab00a965d8160aeaba4e66b2
diff --git a/metadata/md5-cache/dev-java/juel-2.1.0 b/metadata/md5-cache/dev-java/juel-2.1.0
index ea246cbec6f8..62c486dadf59 100644
--- a/metadata/md5-cache/dev-java/juel-2.1.0
+++ b/metadata/md5-cache/dev-java/juel-2.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/juel/juel-2.1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=800fe0679266a1299fb3e5c29c4ed93b
diff --git a/metadata/md5-cache/dev-java/jump-0.5 b/metadata/md5-cache/dev-java/jump-0.5
index 858449290e7a..4cf732d6095c 100644
--- a/metadata/md5-cache/dev-java/jump-0.5
+++ b/metadata/md5-cache/dev-java/jump-0.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7a8eca097e56690c164ada54fa54ba0
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index 362eaea65929..86cc3320fa6d 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6
+++ b/metadata/md5-cache/dev-java/jung-1.7.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/colt:0 dev-java/commons-collections >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8dd95ff69ee7f1c2fb6f57f084242a42
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r1 b/metadata/md5-cache/dev-java/junit-3.8.2-r1
index 39f67e27e4e5..ad0eda73f2b4 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r1
@@ -8,5 +8,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c51e9b24d63ab3d271eed2047d37539
diff --git a/metadata/md5-cache/dev-java/junit-4.10 b/metadata/md5-cache/dev-java/junit-4.10
index 6e8d9f00170c..c7259d47ab7f 100644
--- a/metadata/md5-cache/dev-java/junit-4.10
+++ b/metadata/md5-cache/dev-java/junit-4.10
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://github/KentBeck/junit/junit4.10.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e859db01b09924cf20b987b3a6bdc9f
diff --git a/metadata/md5-cache/dev-java/junit-4.11 b/metadata/md5-cache/dev-java/junit-4.11
index 17c67c6c773e..7ea633e96a25 100644
--- a/metadata/md5-cache/dev-java/junit-4.11
+++ b/metadata/md5-cache/dev-java/junit-4.11
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://github/junit-team/junit/junit4.11.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=389e48b0109f5e059a5227a0127e5234
diff --git a/metadata/md5-cache/dev-java/junit-4.6 b/metadata/md5-cache/dev-java/junit-4.6
index 4112f92d4a81..967d7de29260 100644
--- a/metadata/md5-cache/dev-java/junit-4.6
+++ b/metadata/md5-cache/dev-java/junit-4.6
@@ -8,5 +8,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 =dev-java/hamcrest-core-1.1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://sourceforge/junit/junit4.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f8b6c53689a4ff68dc09e97bf054d52
diff --git a/metadata/md5-cache/dev-java/junit-4.8.2-r1 b/metadata/md5-cache/dev-java/junit-4.8.2-r1
index c6ec60cc1856..47413971862d 100644
--- a/metadata/md5-cache/dev-java/junit-4.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-4.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://github/KentBeck/junit/junit4.8.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7237c43ee157cabf5d32c1e4c611960
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4 b/metadata/md5-cache/dev-java/junit-addons-1.4
index 551068ae9746..545c2c700602 100644
--- a/metadata/md5-cache/dev-java/junit-addons-1.4
+++ b/metadata/md5-cache/dev-java/junit-addons-1.4
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* dev-java/ant-core ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c379e46149019cd6db7da4168f40792
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
index 1c35b029e8e1..23fc8fa87932 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0f049231965cad827c8fe3236c2b749
diff --git a/metadata/md5-cache/dev-java/junrar-0.6 b/metadata/md5-cache/dev-java/junrar-0.6
index 7844eb803902..773993991f1e 100644
--- a/metadata/md5-cache/dev-java/junrar-0.6
+++ b/metadata/md5-cache/dev-java/junrar-0.6
@@ -9,5 +9,5 @@ LICENSE=unRAR
 RDEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/edmund-wagner/junrar/archive/junrar-0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c4783c966ca15b20b276768fa17f47e
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index 8c2d5cd728b0..e3cc8429d425 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.6.0
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=134ed24fabc4953999cd8965cb58fccd
diff --git a/metadata/md5-cache/dev-java/jusb-0.4.4-r1 b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
index 80ddd5506348..c0745f6ea24e 100644
--- a/metadata/md5-cache/dev-java/jusb-0.4.4-r1
+++ b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jusb/jusb-0.4.4-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03301d7661e39c4860498a89c4734232
diff --git a/metadata/md5-cache/dev-java/jutils-1.0.0 b/metadata/md5-cache/dev-java/jutils-1.0.0
index ccc75f8b3206..1c87b879f041 100644
--- a/metadata/md5-cache/dev-java/jutils-1.0.0
+++ b/metadata/md5-cache/dev-java/jutils-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/jutils/jutils/1.0.0/jutils-1.0.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3eb9d6f679bd60ea818f28fa4394d5f3
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index 6cc0f244eb20..be3f630b98e1 100644
--- a/metadata/md5-cache/dev-java/jvmstat-3.0
+++ b/metadata/md5-cache/dev-java/jvmstat-3.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=jvmstat-3_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd71787340f3762a2c15edc0bdb7592d
diff --git a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1 b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
index 7e21f31115a2..12be5a90a750 100644
--- a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
+++ b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jvyaml.dev.java.net/files/documents/5215/41455/jvyaml-src-0.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccce0933f764777cd9a45c4a44a74f19
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index fcdf9ee3f3e4..c7b29e94269e 100644
--- a/metadata/md5-cache/dev-java/jvyamlb-0.2.5
+++ b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-time:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jvyamlb.googlecode.com/files/jvyamlb-src-0.2.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=169d5d7a515501ee0711886230e41392
diff --git a/metadata/md5-cache/dev-java/jython-2.1-r11 b/metadata/md5-cache/dev-java/jython-2.1-r11
index e6953667961e..bcf080663824 100644
--- a/metadata/md5-cache/dev-java/jython-2.1-r11
+++ b/metadata/md5-cache/dev-java/jython-2.1-r11
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 =dev-java/jakarta-oro-2.0* readline? ( >=dev-java/libreadline-java-0.8.0 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jython-2.1.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09ca86c2e57577902d1318dbf6e3bce9
diff --git a/metadata/md5-cache/dev-java/jython-2.2.1-r1 b/metadata/md5-cache/dev-java/jython-2.2.1-r1
index d0e1e8a3371a..53173af5b1e2 100644
--- a/metadata/md5-cache/dev-java/jython-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/jython-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/jakarta-oro-2.0* readline? ( >=dev-java/libr
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz mirror://sourceforge/jython/jython_installer-2.2.1.jar
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9bfa2dd58bf862ec3f3065f78cff7ade
diff --git a/metadata/md5-cache/dev-java/jython-2.2.1-r2 b/metadata/md5-cache/dev-java/jython-2.2.1-r2
index 619d96e5d011..c9229f2e2211 100644
--- a/metadata/md5-cache/dev-java/jython-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/jython-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jakarta-oro:2.0 readline? ( >=dev-java/libreadline-java-0.8.0:0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz mirror://sourceforge/jython/jython_installer-2.2.1.jar
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bc5f875d932adf42e3a5236f416df2e
diff --git a/metadata/md5-cache/dev-java/jython-2.5.3-r3 b/metadata/md5-cache/dev-java/jython-2.5.3-r3
index f2db0a7e5c04..d429cb9c3fd4 100644
--- a/metadata/md5-cache/dev-java/jython-2.5.3-r3
+++ b/metadata/md5-cache/dev-java/jython-2.5.3-r3
@@ -10,5 +10,5 @@ RDEPEND=!<=dev-java/freemarker-2.3.10 dev-java/antlr:3 dev-java/asm:3 dev-java/g
 RESTRICT=test
 SLOT=2.5
 SRC_URI=http://central.maven.org/maven2/org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=034eec401a1e22311466988b140a9888
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
index 9a5bb2fd6cf1..52650bab79ee 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0
+++ b/metadata/md5-cache/dev-java/jython-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( readline )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0ce5038e6eddf421bc3be6bb734c8fb
diff --git a/metadata/md5-cache/dev-java/jzlib-1.0.7-r1 b/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
index 67f5865f07e2..3fa506bd3577 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
+++ b/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a3bc574567731b5cdc3af351bb8483b
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.1 b/metadata/md5-cache/dev-java/jzlib-1.1.1
index 1aebe6726c5b..2a8472401988 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.1
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.1
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.1.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a2ebcb3ea405caad367bb7337a53fbd
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3 b/metadata/md5-cache/dev-java/jzlib-1.1.3
index a14b3913099e..93335c4344c1 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.1.3
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.zip -> jzlib-1.1.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=345e91e8016d2a2058bbb23aa5b68fa4
diff --git a/metadata/md5-cache/dev-java/kryo-1.05 b/metadata/md5-cache/dev-java/kryo-1.05
index fa372eeba97e..a4575248a23a 100644
--- a/metadata/md5-cache/dev-java/kryo-1.05
+++ b/metadata/md5-cache/dev-java/kryo-1.05
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://kryo.googlecode.com/files/kryo-1.05.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e7f03132fb8ad6078c9562722f2d513
diff --git a/metadata/md5-cache/dev-java/kryo-2.21 b/metadata/md5-cache/dev-java/kryo-2.21
index 387727823ccb..0983cc11b8f6 100644
--- a/metadata/md5-cache/dev-java/kryo-2.21
+++ b/metadata/md5-cache/dev-java/kryo-2.21
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://kryo.googlecode.com/files/kryo-2.21.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ecf0b754674eb0f48dc9190f915aca39
diff --git a/metadata/md5-cache/dev-java/kryo-2.22 b/metadata/md5-cache/dev-java/kryo-2.22
index f1b0990fc944..ae30faedc433 100644
--- a/metadata/md5-cache/dev-java/kryo-2.22
+++ b/metadata/md5-cache/dev-java/kryo-2.22
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://kryo.googlecode.com/files/kryo-2.22.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4f09811092e99eca0d3c1a5de56015a
diff --git a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1 b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
index fc0608353d3d..c5510e56a31f 100644
--- a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=http://www.incors.org/archive/kunststoff-2_0_2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=445a6dd2cfdf1c55c9cd90ba5e8ee04c
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
index 4aa35bb42aec..1ea653be8896 100644
--- a/metadata/md5-cache/dev-java/kxml-2.3.0
+++ b/metadata/md5-cache/dev-java/kxml-2.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/xpp3:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea401b3414a35e37e6c9b1b78de0ba7b
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
index d7df6f07c6ee..63f094ebc1f4 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e9855b341bcb3eb97b4f79ab7e89742
diff --git a/metadata/md5-cache/dev-java/laf-plugin-0.2 b/metadata/md5-cache/dev-java/laf-plugin-0.2
index 77f633be20a6..4c1ba1d450bf 100644
--- a/metadata/md5-cache/dev-java/laf-plugin-0.2
+++ b/metadata/md5-cache/dev-java/laf-plugin-0.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/laf-plugin-0.2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8149e514881cee2057f86bd4c8eb5b58
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
index 666d2abb1054..ac05cbf790ff 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6df9576390c8312fb67eaa7cb8dab8a6
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r1 b/metadata/md5-cache/dev-java/libg-2.1.0-r1
index 15ddf9a7f102..c8d1bf8c93f9 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a0e049f7ee410c3cacc8fa57d1fd408
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
index 6651c14f2496..b4b4aeb3929c 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=257207896a88489992fa40bc4259a464
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index 74712d5f5f8f..85e596826e29 100644
--- a/metadata/md5-cache/dev-java/libmso-0.1
+++ b/metadata/md5-cache/dev-java/libmso-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mso.googlecode.com/files/libmso-0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f68800126adb9aa34b27cf905d2297b3
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
index 0b5382f76241..695b1ab25161 100644
--- a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
+++ b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 sys-libs/ncurses >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f53918e3b4b5160b54cc0425fe9c7a3d
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.16 b/metadata/md5-cache/dev-java/log4j-1.2.16
index eed9466d4d66..53d676c7b4c4 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.16
+++ b/metadata/md5-cache/dev-java/log4j-1.2.16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 javamail? ( java-virtuals/javamail java-virtuals/jaf ) jmx? ( dev-java/sun-jmx:0 ) jms? ( java-virtuals/jms ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.16/apache-log4j-1.2.16.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3278c458483236b6b6666ac3f5c5d926
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17 b/metadata/md5-cache/dev-java/log4j-1.2.17
index 2b50b7f797a2..170eaca6fdc3 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 javamail? ( java-virtuals/javamail java-virtuals/jaf ) jmx? ( dev-java/sun-jmx ) jms? ( java-virtuals/jms ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f035017dab501f5d46de9775d41c4bf8
diff --git a/metadata/md5-cache/dev-java/logback-1.0.13 b/metadata/md5-cache/dev-java/logback-1.0.13
index 1268e9155de2..4e855e60d679 100644
--- a/metadata/md5-cache/dev-java/logback-1.0.13
+++ b/metadata/md5-cache/dev-java/logback-1.0.13
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=dev-java/janino:0 dev-java/jansi:0 java-virtuals/javamail:0 java-virtuals/servlet-api:2.5 dev-java/slf4j-api:0 tomcat? ( www-servers/tomcat:7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5370d7830188d1434e2356b98d5a3784
diff --git a/metadata/md5-cache/dev-java/lucene-1.4.3-r3 b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
index e543639989db..cf4b4b954faf 100644
--- a/metadata/md5-cache/dev-java/lucene-1.4.3-r3
+++ b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b06226e832853e041c3c31c19e546263
diff --git a/metadata/md5-cache/dev-java/lucene-1.9.1 b/metadata/md5-cache/dev-java/lucene-1.9.1
index dcdf8b219c95..d90cddc811d3 100644
--- a/metadata/md5-cache/dev-java/lucene-1.9.1
+++ b/metadata/md5-cache/dev-java/lucene-1.9.1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.9
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.9.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=724deecec2e098fd001af68e02411eda
diff --git a/metadata/md5-cache/dev-java/lucene-2.1.0-r1 b/metadata/md5-cache/dev-java/lucene-2.1.0-r1
index 5d21588ef10b..16f2b655f774 100644
--- a/metadata/md5-cache/dev-java/lucene-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ac0e90182b78a51473bb95b98f64d7e
diff --git a/metadata/md5-cache/dev-java/lucene-2.1.0-r2 b/metadata/md5-cache/dev-java/lucene-2.1.0-r2
index 3b0b4f2b4b8f..134b59273c79 100644
--- a/metadata/md5-cache/dev-java/lucene-2.1.0-r2
+++ b/metadata/md5-cache/dev-java/lucene-2.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=52ec7437843dfcbad5ee22522e65cddc
diff --git a/metadata/md5-cache/dev-java/lucene-2.2.0 b/metadata/md5-cache/dev-java/lucene-2.2.0
index 5d63226f5f08..85533722f9c6 100644
--- a/metadata/md5-cache/dev-java/lucene-2.2.0
+++ b/metadata/md5-cache/dev-java/lucene-2.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f15a921a3ee2da95ba24e5425e1dca9b
diff --git a/metadata/md5-cache/dev-java/lucene-2.2.0-r1 b/metadata/md5-cache/dev-java/lucene-2.2.0-r1
index a84c666a821e..9887a7a1cc97 100644
--- a/metadata/md5-cache/dev-java/lucene-2.2.0-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3bca64a0614e8d41c0845668c0e4f305
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.0 b/metadata/md5-cache/dev-java/lucene-2.3.0
index 0a97693624f3..87b4529439cb 100644
--- a/metadata/md5-cache/dev-java/lucene-2.3.0
+++ b/metadata/md5-cache/dev-java/lucene-2.3.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.3.0-src.tar.gz mirror://apache/lucene/java/lucene-2.3.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c20e0562e07e7ffed39c7e60c786cb7d
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.1 b/metadata/md5-cache/dev-java/lucene-2.3.1
index 97fd0236d783..6408787bf5b4 100644
--- a/metadata/md5-cache/dev-java/lucene-2.3.1
+++ b/metadata/md5-cache/dev-java/lucene-2.3.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.3.1-src.tar.gz mirror://apache/lucene/java/lucene-2.3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b4763a2ef8327a8e91c2abe1e998254
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.2 b/metadata/md5-cache/dev-java/lucene-2.3.2
index 49755036f97e..c217bf2e2728 100644
--- a/metadata/md5-cache/dev-java/lucene-2.3.2
+++ b/metadata/md5-cache/dev-java/lucene-2.3.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.3.2-src.tar.gz mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f72275d60f0a6d89fe936a9ebcd821be
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.2-r1 b/metadata/md5-cache/dev-java/lucene-2.3.2-r1
index 4c2c6088d93e..f2e8e15eca18 100644
--- a/metadata/md5-cache/dev-java/lucene-2.3.2-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.3.2-src.tar.gz mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0570056d7c26496941a00d259a4807bd
diff --git a/metadata/md5-cache/dev-java/lucene-2.3.2-r2 b/metadata/md5-cache/dev-java/lucene-2.3.2-r2
index 2cca520b7f4c..c66002868d59 100644
--- a/metadata/md5-cache/dev-java/lucene-2.3.2-r2
+++ b/metadata/md5-cache/dev-java/lucene-2.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/archive/lucene-2.3.2-src.tar.gz mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dcfbf2cd26ea8c3b8a7b1edf644f253f
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.0 b/metadata/md5-cache/dev-java/lucene-2.4.0
index bac7b32b8aa7..8939c7b12e0e 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.0
+++ b/metadata/md5-cache/dev-java/lucene-2.4.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=mirror://apache/lucene/java/lucene-2.4.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6f35161cea24e4d789e445a09f07787
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1 b/metadata/md5-cache/dev-java/lucene-2.4.1
index 197370570745..9622c1b92533 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=mirror://apache/lucene/java/lucene-2.4.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74b703ad10d1526f7d715676bcf103f3
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r1 b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
index 38c95f50f6ab..3ea0237ee349 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=mirror://apache/lucene/java/lucene-2.4.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae5a3284a37e438c7c7615a35734ffab
diff --git a/metadata/md5-cache/dev-java/lucene-2.9.1-r1 b/metadata/md5-cache/dev-java/lucene-2.9.1-r1
index f14ea5297d15..fe8a0be1a3c6 100644
--- a/metadata/md5-cache/dev-java/lucene-2.9.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.9
 SRC_URI=mirror://apache/lucene/java/lucene-2.9.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6118f6457cc98bcfbb8e05db5059bdd
diff --git a/metadata/md5-cache/dev-java/lucene-2.9.4 b/metadata/md5-cache/dev-java/lucene-2.9.4
index dd902fff0e74..e339eb624481 100644
--- a/metadata/md5-cache/dev-java/lucene-2.9.4
+++ b/metadata/md5-cache/dev-java/lucene-2.9.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.9
 SRC_URI=mirror://apache/lucene/java/lucene-2.9.4-src.tar.gz mirror://apache/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5558feeb50855a8c77c15a033b2dcd6e
diff --git a/metadata/md5-cache/dev-java/lucene-3.0.0 b/metadata/md5-cache/dev-java/lucene-3.0.0
index ef4d74072364..4d8bdb98edd4 100644
--- a/metadata/md5-cache/dev-java/lucene-3.0.0
+++ b/metadata/md5-cache/dev-java/lucene-3.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/lucene/java/lucene-3.0.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5dd3c28975e5bf27fd4b79bfd6765d9a
diff --git a/metadata/md5-cache/dev-java/lucene-3.0.3 b/metadata/md5-cache/dev-java/lucene-3.0.3
index e40156920a57..5ddaa78c8c58 100644
--- a/metadata/md5-cache/dev-java/lucene-3.0.3
+++ b/metadata/md5-cache/dev-java/lucene-3.0.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/lucene/java/lucene-3.0.3-src.tar.gz mirror://apache/lucene/java/3.0.3/lucene-3.0.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb01673b92c5eb673ada5de80b8e8f21
diff --git a/metadata/md5-cache/dev-java/lucene-3.4.0 b/metadata/md5-cache/dev-java/lucene-3.4.0
index 4db89287f237..021751a78c1e 100644
--- a/metadata/md5-cache/dev-java/lucene-3.4.0
+++ b/metadata/md5-cache/dev-java/lucene-3.4.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.4
 SRC_URI=mirror://apache/lucene/java/3.4.0/lucene-3.4.0-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63e82903138781f929bc09b704c5137a
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
index f6805f5a5ffc..d2820e0ff4d3 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ef4afc7bed555b9bdaf7fb322f67859
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2 b/metadata/md5-cache/dev-java/lucene-3.6.2
index 83006deabf83..786c60a38ef8 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 contrib? ( dev-java/commons-beanutils:1.7 >=dev-java/commons-codec-1.6:0 dev-java/commons-collections:0 dev-java/commons-compress:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7506961e22c9d496e814694984c8e08
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1 b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
index 5514ea01cb25..2ffa600c47b7 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.9
 SRC_URI=mirror://apache/lucene/java/lucene-1.9.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a78673e49983ef5cb77c4835a57f214d
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2 b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
index c99f133d4419..57724fadc573 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c059f35908a9079f7a91dd965fc59b9
diff --git a/metadata/md5-cache/dev-java/lzma-4.63 b/metadata/md5-cache/dev-java/lzma-4.63
index fccc92a22cb6..e7964408f9ff 100644
--- a/metadata/md5-cache/dev-java/lzma-4.63
+++ b/metadata/md5-cache/dev-java/lzma-4.63
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma463.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6695b44a056070019f2b51569f6fd740
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95 b/metadata/md5-cache/dev-java/lzmajio-0.95
index a3f56feedbe3..eed53da170b1 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/lzma-4.61 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://comsci.liu.edu/~league/dist/lzmajio/lzmajio-0.95.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b20fd4867f1fee8dc7835dae1ad32518
diff --git a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12 b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
index 4880def9b03b..1ebb1325ec29 100644
--- a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
+++ b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://matrix-toolkits-java.googlecode.com/files/mtj-0.9.12.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1917fd3200d6febdcaa3c07b8698531
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11 b/metadata/md5-cache/dev-java/maven-bin-2.0.11
index 700cf083e61a..975b6cda35d8 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 app-eselect/eselect-maven >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e988e35d560d65c118ad64f235c2dcde
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
index f2fd9c515ba6..bbbb980b6639 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 || ( app-eselect/eselect-java app-eselect/eselect-maven ) >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd728a22f8af0d42e54fdd9bed6312fe
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1 b/metadata/md5-cache/dev-java/maven-bin-2.2.1
index 9ccddf1444a4..030cbe5e7624 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-maven >=dev-java/java-config-2.2.0
 SLOT=2.2
 SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3e25e61ff27b6f7e4af0bf47eda2f2d
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
index 6220b4f0f57b..cb3418be229d 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-eselect/eselect-java app-eselect/eselect-maven ) >=dev-java/java-config-2.2.0
 SLOT=2.2
 SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41606457849b0bc3fa21d8cbe88806d0
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
index 682329f8e2f6..bd957cc97dc2 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-eselect/eselect-java app-eselect/eselect-maven ) >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://apache/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6d31a0ae1894c8c56620c0c7a25cd8df
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.0 b/metadata/md5-cache/dev-java/maven-bin-3.1.0
index 713d9979e5b3..d9209e23cd51 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.0
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-eselect/eselect-java app-eselect/eselect-maven ) dev-java/avalon-framework:4.1 dev-java/avalon-logkit:2.0 dev-java/commons-io:1 dev-java/juel:0 dev-java/log4j:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.0/binaries/apache-maven-3.1.0-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1e6c42bff8c0cb48a30b5b4e14a8237
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.0-r1 b/metadata/md5-cache/dev-java/maven-bin-3.1.0-r1
index fc10dd97fa08..9823dc0ce909 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.0-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-eselect/eselect-java app-eselect/eselect-maven ) || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/avalon-framework:4.1 dev-java/commons-io:1 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.0/binaries/apache-maven-3.1.0-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d394037518ed8f129273251cf2abc22
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1
index 96bfe50ef749..ed50c0d5ad1a 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 || ( app-eselect/eselect-java app-eselect/eselect-maven ) || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ae074fb67101fb4429e4c562cbf0a2e
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.3 b/metadata/md5-cache/dev-java/maven-bin-3.2.3
index 28fc6a4707b2..1034f0ba7333 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.3
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.6 || ( app-eselect/eselect-java app-eselect/eselect-maven ) || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/guava:14 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.2
 SRC_URI=mirror://apache/maven/maven-3/3.2.3/binaries/apache-maven-3.2.3-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89bf90044a305e587f2b6204b5a1dcfd
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5 b/metadata/md5-cache/dev-java/maven-bin-3.2.5
index 3745952d357c..7aa6a2739c4f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 || ( app-eselect/eselect-java app-eselect/eselect-maven ) || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.2
 SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b520f6609c19f0718f7d1f44f4e776a
diff --git a/metadata/md5-cache/dev-java/mckoi-1.0.3-r2 b/metadata/md5-cache/dev-java/mckoi-1.0.3-r2
index 1838597a030d..7872aec47c21 100644
--- a/metadata/md5-cache/dev-java/mckoi-1.0.3-r2
+++ b/metadata/md5-cache/dev-java/mckoi-1.0.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 =dev-java/gnu-regexp-1.1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=1
 SRC_URI=http://www.mckoi.com/database/ver/mckoi1.0.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f0bf178cd854985152ab40a3ef02b81
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
index ed5c673850a7..6e0a62c6b539 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6db5cedbb987c80f5ea70720f5551bad
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2 b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2
index b197d670edaa..196535ec6b26 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.drewnoakes.com/code/exif/metadata-extractor-2.2.2-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0570db50963483ee2cce4f9eaaecaa60
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4 b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4
index f2c099783b38..a13a2a5594b3 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.drewnoakes.com/code/exif/metadata-extractor-2.2.2-src.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46881c36ad3e0a97bb6e14a1271831f4
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.5 b/metadata/md5-cache/dev-java/metainf-services-1.5
index 5b8adbf330f0..ad93d8cfe742 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.5
+++ b/metadata/md5-cache/dev-java/metainf-services-1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af440a9589fbabb60844ebd5382b2c04
diff --git a/metadata/md5-cache/dev-java/mg4j-0.9.1-r2 b/metadata/md5-cache/dev-java/mg4j-0.9.1-r2
index eb046f33fdb1..b7d1df0c7198 100644
--- a/metadata/md5-cache/dev-java/mg4j-0.9.1-r2
+++ b/metadata/md5-cache/dev-java/mg4j-0.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/colt:0 dev-java/fastutil:4.3 dev-java/jal:0 dev-java/java-getopt:1 dev-java/libreadline-java:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.9
 SRC_URI=http://mg4j.dsi.unimi.it/mg4j-0.9.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82d322a522bc79e88948e70c563ccf8e
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4 b/metadata/md5-cache/dev-java/microba-0.4.4
index 40b9aae67fb5..15ceb0480b07 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4
+++ b/metadata/md5-cache/dev-java/microba-0.4.4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/jgraph-5.9.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/microba/microba-0.4.4-full.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=973273ae9c06db9ae98e95e4c7af531f
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index 65dd59df99fa..5d54a18cde55 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0
+++ b/metadata/md5-cache/dev-java/miglayout-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5db9a24a5c95e4866902fd211442af37
diff --git a/metadata/md5-cache/dev-java/milton-api-2.5.1.5 b/metadata/md5-cache/dev-java/milton-api-2.5.1.5
index 4d6cee2b26ed..7844a237da98 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.5.1.5
+++ b/metadata/md5-cache/dev-java/milton-api-2.5.1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://milton.io/maven/io/milton/milton-api/2.5.1.5/milton-api-2.5.1.5-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82d74967cbd87aae9dde12c415297257
diff --git a/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5 b/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5
index c5c28f46da16..2c71b379be42 100644
--- a/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5
+++ b/metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/milton-api:2.5 dev-java/slf4j-api:0 java-virtuals/javamail:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.5.1.5/milton-mail-api-2.5.1.5-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eebeb53d79395c3c7f630f996f63f006
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index 7c7bbe0c3e09..3d57efcb4f0d 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.8
+++ b/metadata/md5-cache/dev-java/mimepull-1.8
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/mimepull-1.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed09c9c35fb52f806682306a915f595d
diff --git a/metadata/md5-cache/dev-java/mina-core-1.1.7 b/metadata/md5-cache/dev-java/mina-core-1.1.7
index d4c8caa29179..9322a659767f 100644
--- a/metadata/md5-cache/dev-java/mina-core-1.1.7
+++ b/metadata/md5-cache/dev-java/mina-core-1.1.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mina-core-1.1.7-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8876ef1c7628201b304701e32b80cde6
diff --git a/metadata/md5-cache/dev-java/minlog-1.2 b/metadata/md5-cache/dev-java/minlog-1.2
index 180e49ecf7f8..2d044b556f75 100644
--- a/metadata/md5-cache/dev-java/minlog-1.2
+++ b/metadata/md5-cache/dev-java/minlog-1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://minlog.googlecode.com/files/minlog-1.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0367a6ad4d7bb09a6df53d22e2f11111
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r1 b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
index 248288b85be1..759aca630882 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r1
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98d0546e81a50917683795bf00213d19
diff --git a/metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1 b/metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1
index bfc02fa0b7be..556e9bb98c87 100644
--- a/metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1
+++ b/metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/qdox =dev-java/junit-3.8* >=dev-java/ant-core-1.4 dev-java/mockobjects >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=mirror://gentoo/mockmaker-1.12.0_p20050104.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a36e4be1bdce094534761bba1e829056
diff --git a/metadata/md5-cache/dev-java/mockobjects-0.09-r4 b/metadata/md5-cache/dev-java/mockobjects-0.09-r4
index 443f427f9e18..a11012499cf8 100644
--- a/metadata/md5-cache/dev-java/mockobjects-0.09-r4
+++ b/metadata/md5-cache/dev-java/mockobjects-0.09-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND==dev-java/junit-3.8* >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-0.09-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea75655e6f124de4b2d12f080a85ff49
diff --git a/metadata/md5-cache/dev-java/mojarra-1.2.15-r2 b/metadata/md5-cache/dev-java/mojarra-1.2.15-r2
index 9ea8acd6f97d..573b0b747e76 100644
--- a/metadata/md5-cache/dev-java/mojarra-1.2.15-r2
+++ b/metadata/md5-cache/dev-java/mojarra-1.2.15-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-servlet-api:2.5 dev-java/groovy:0 dev-java/jakarta-jstl:0 dev-java/portletapi:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://javaserverfaces.dev.java.net/files/documents/1866/151669/mojarra-1.2_15-b01-FCS-source.zip mirror://gentoo/mojarra-1.2_15-b01-FCS-patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b69b83efd7b77e3702ee9d4d4f2774f2
diff --git a/metadata/md5-cache/dev-java/mojarra-2.2.9 b/metadata/md5-cache/dev-java/mojarra-2.2.9
index 79f9d86d4b8c..03d9d73ee6aa 100644
--- a/metadata/md5-cache/dev-java/mojarra-2.2.9
+++ b/metadata/md5-cache/dev-java/mojarra-2.2.9
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0
 SLOT=2.2
 SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.9/javax.faces-2.2.9-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f584ee812a8497b345ca0b08abde6dd
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r2 b/metadata/md5-cache/dev-java/msv-20050627-r2
index d673f3240163..5d606822b3e8 100644
--- a/metadata/md5-cache/dev-java/msv-20050627-r2
+++ b/metadata/md5-cache/dev-java/msv-20050627-r2
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/msv.20050627.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=84fe23ce6fb62a2980cce2bb97e2fb8d
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r3 b/metadata/md5-cache/dev-java/msv-20050627-r3
index 2eccca5a60b4..2a97a3e07b39 100644
--- a/metadata/md5-cache/dev-java/msv-20050627-r3
+++ b/metadata/md5-cache/dev-java/msv-20050627-r3
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xml-commons-resolver:0 dev-java/xerces:2 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/msv.20050627.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89c8fde0ef00accb767a09750d2fc6a1
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index d2107c31b1a0..fcf79fc50209 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-2.0
 RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8288e7770cee081a83e40a385743710b
diff --git a/metadata/md5-cache/dev-java/mx4j-3.0.1-r4 b/metadata/md5-cache/dev-java/mx4j-3.0.1-r4
index 57f61fd9e497..7959451c9d64 100644
--- a/metadata/md5-cache/dev-java/mx4j-3.0.1-r4
+++ b/metadata/md5-cache/dev-java/mx4j-3.0.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=examples? ( dev-java/bcel dev-java/log4j dev-java/commons-logging www-servers/axis:1 java-virtuals/servlet-api:2.3 dev-java/burlap:3.0 dev-java/hessian:3.0.8 =dev-java/jython-2.2* dev-java/gnu-jaf:1 java-virtuals/javamail ) dev-java/mx4j-core:3.0 dev-java/mx4j-tools:3.0 !<dev-java/mx4j-tools-3.0.1-r1 examples? ( >=virtual/jre-1.4 ) >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.1-src.tar.gz doc? ( mirror://sourceforge/mx4j/mx4j-3.0.1.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb479ab3363ce8fb75d9ed952fb56cc6
diff --git a/metadata/md5-cache/dev-java/mx4j-3.0.2 b/metadata/md5-cache/dev-java/mx4j-3.0.2
index 98b8904dfe2a..c775c2bc86a5 100644
--- a/metadata/md5-cache/dev-java/mx4j-3.0.2
+++ b/metadata/md5-cache/dev-java/mx4j-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=examples? ( dev-java/bcel dev-java/log4j dev-java/commons-logging www-servers/axis:1 java-virtuals/servlet-api:2.3 dev-java/hessian:4.0 dev-java/jython:2.5 dev-java/gnu-jaf:1 java-virtuals/javamail ) dev-java/mx4j-core:3.0 dev-java/mx4j-tools:3.0 !<dev-java/mx4j-tools-3.0.1-r1 examples? ( >=virtual/jre-1.5 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz doc? ( mirror://sourceforge/mx4j/mx4j-3.0.2.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3510d6ce0427e22fcf3127a42e083a31
diff --git a/metadata/md5-cache/dev-java/mx4j-3.0.2-r1 b/metadata/md5-cache/dev-java/mx4j-3.0.2-r1
index 02d616b2f809..d4e3b58eb171 100644
--- a/metadata/md5-cache/dev-java/mx4j-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/mx4j-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=examples? ( dev-java/bcel:0 dev-java/log4j:0 dev-java/commons-logging:0 www-servers/axis:1 java-virtuals/servlet-api:3.0 dev-java/hessian:4.0 dev-java/jython:2.7 dev-java/gnu-jaf:1 java-virtuals/javamail:0 ) dev-java/mx4j-core:3.0 dev-java/mx4j-tools:3.0 !<dev-java/mx4j-tools-3.0.1-r1 examples? ( >=virtual/jre-1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz doc? ( mirror://sourceforge/mx4j/mx4j-3.0.2.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f61b947dd3440ffdbc15d73b9d731f83
diff --git a/metadata/md5-cache/dev-java/mx4j-core-3.0.1 b/metadata/md5-cache/dev-java/mx4j-core-3.0.1
index d612fd7baf57..7553cb1cc877 100644
--- a/metadata/md5-cache/dev-java/mx4j-core-3.0.1
+++ b/metadata/md5-cache/dev-java/mx4j-core-3.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/bcel dev-java/commons-logging dev-java/log4j >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j-core/mx4j-3.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0061c14bd10b885309d1fcc1e326c5b4
diff --git a/metadata/md5-cache/dev-java/mx4j-core-3.0.2 b/metadata/md5-cache/dev-java/mx4j-core-3.0.2
index 7b0f9502ac80..f65b7b51ff48 100644
--- a/metadata/md5-cache/dev-java/mx4j-core-3.0.2
+++ b/metadata/md5-cache/dev-java/mx4j-core-3.0.2
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/bcel dev-java/commons-logging dev-java/log4j >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=392b3b38ded8ad17b13d0d8f975c6baf
diff --git a/metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1 b/metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1
index b9a4a4c755a2..d4f1fa11c55e 100644
--- a/metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b3cd7c32b032dae42bafcbf75cf0df5
diff --git a/metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2 b/metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2
index 3ac52568e447..14828f0cc8ce 100644
--- a/metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2
+++ b/metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/bcel dev-java/commons-logging dev-java/log4j www-servers/axis:1 dev-java/burlap:3.0 dev-java/hessian:3.0.8 dev-java/jython:0 java-virtuals/servlet-api:2.3 dev-java/gnu-jaf:1 java-virtuals/javamail >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0236e60155f4675328f88dd0b75874f9
diff --git a/metadata/md5-cache/dev-java/mx4j-tools-3.0.2 b/metadata/md5-cache/dev-java/mx4j-tools-3.0.2
index dc1f2a2ba079..436430b9dd9c 100644
--- a/metadata/md5-cache/dev-java/mx4j-tools-3.0.2
+++ b/metadata/md5-cache/dev-java/mx4j-tools-3.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/bcel dev-java/commons-logging dev-java/log4j =www-servers/axis-1* dev-java/hessian:4.0 dev-java/jython:2.5 java-virtuals/servlet-api:2.3 java-virtuals/jaf java-virtuals/javamail >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f285a2c38170d9ac6cc4a935c603aee3
diff --git a/metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1 b/metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1
index 275c6ab56818..91cc80372c42 100644
--- a/metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/ant-core:0 dev-java/commons-logging:0 dev-java/log4j:0 www-servers/axis:1 dev-java/hessian:4.0 dev-java/jython:2.7 java-virtuals/servlet-api:3.0 java-virtuals/jaf:0 java-virtuals/javamail:0 >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://sourceforge/mx4j/mx4j-3.0.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2272f42a8c905d7af1d06a2d40534f2c
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23 b/metadata/md5-cache/dev-java/nachocalendar-0.23
index dfae61127b47..f7906fb88df0 100644
--- a/metadata/md5-cache/dev-java/nachocalendar-0.23
+++ b/metadata/md5-cache/dev-java/nachocalendar-0.23
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nachocalendar/nachocalendar-src-0.23.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=974b656ac868a7e3c35f257504f49262
diff --git a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1 b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
index dae3539584be..d52b4c1b41cf 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 !app-editors/ng >=dev-java/java-config-2.2.0 source? (
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ee2ccff85669d157f83b5ee272a8ee7
diff --git a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2 b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
index 438443c3b9fe..bd8d0011dd0e 100644
--- a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
+++ b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=>=virtual/jre-1.4 dev-java/sax >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://nanoxml.cyberelf.be/downloads/NanoXML-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d886a55a1bcacddbf17e80aec1002cc0
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18 b/metadata/md5-cache/dev-java/nekohtml-1.9.18
index 5accafb021fa..84c5f1e34684 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=569b0744f82fb12de8abe7d6a2ae78c4
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index 162a347fcb8e..424ca3f5d0ac 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ddbe688f1bf64270ac7272c43d23b27
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.6 b/metadata/md5-cache/dev-java/nekohtml-1.9.6
index aaf284d86ee0..0608e6de8bdd 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.6
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c985a2dbe2e54e468913a80e0b73bfe8
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
index 4f4501b1483f..5753324897af 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a730aeeabb2952e5f5f95c537a0c5f5c
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
index fb7d2e7fe5da..3b23b53c54e2 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-dlight-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74a9d84d115c6b03448183d7cd7c795c
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
index 7ebf8da544a2..9a6041a4dc02 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=93e5bd3318254ce56ce8995ac41c0b75
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
index 05f3bc3eb685..3ed1127e9556 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-profiler-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/antlr:0[java] dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=925aa1a467c1c4ded73d58d6649f8d63
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
index cd6247a3e029..de9a36ba1436 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-nb-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d6d83f22a094bc9141e62688862393f
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
index 7895243ebde2..0f1ecef19e27 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39a1bc46435c0fe0aed4a5051aea7ce5
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
index 32f604f0c19d..de14fba7f269 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8feb7508bc85470b7058efec3bfc9b02
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
index bdf5516dac90..f02af5e837b6 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 dev-java/javahelp:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ee428e51184ac1dd3638c30a8cfcb01
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2 b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
index 8b38ac6d39ce..99d63c42f5fa 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-platform-8.0.2 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/icu4j:4.4 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bff6d16546920febff03f273a5202c18
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
index fa3d6451c83e..b1c63b2cf40b 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/c3p0:0 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jtidy:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b96f3e0a342830235d163200bee3b6fa
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3
index bbca7d7fb056..7bcff5001bda 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/c3p0:0 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jtidy:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0fc46dcc517f17cf1dca9760b129dac2
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
index 09719ad69d0d..1c3fb46963bc 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2dbe3148aad95812a328480232e57685
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
index 7346055c2d45..c601dd62c5c1 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1e11234c1232188271934e11ffa5772
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
index 57782cf68319..b2288f412bfe 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=84d75b9b62a1077c14ab923b7f63f9e2
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
index 442c3a2918d5..fd663c9c4804 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-apisupport-8.0.2 ~dev-java/netbeans-enterprise-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=35a8e2d7372030472f384c601cdfdcac
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
index dea8e7fb47ed..52ec40095bee 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15e36a101b37616891a3a8cca715c63d
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.0.2 b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
index b4c395626f02..0cf0307c1fe1 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/javacup:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b51ddfd7746e9429a4ba1ed90d33870
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
index 65a8942556f5..f724a2662952 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 dev-java/javahelp:0 >=dev-java/jna-3.4:0 >=dev-java/osgi-core-api-5:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80f176f12d70320648b520ad1a9678d8
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
index 99b3fc612e3a..3c7ff4ac4126 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=622d38dabea44ca7f14282d25c68ff3c
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
index 2d014f1aa63d..9b5cc6b0ebd3 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/81483881778F37D0495C07323E445361084CA1DB-ios-sim http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28d2a779e9bf8c116286747afec8083b
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
index b8ff5dcfd269..2e24d8421572 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-ide-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=80c5c3645b30e73877fc6282b1d60f06
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5790293abe3c7623e8b99ddf3c15f562
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.19 b/metadata/md5-cache/dev-java/netty-buffer-4.0.19
index 65838bcc18d1..f5e68e669f4b 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.19
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33d2972eea002faf86995e9343ed49e4
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.21 b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
index 3dbcb627e853..f883426149b5 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21f0e27f9496437c25ea7bdc0eaa1f85
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.19 b/metadata/md5-cache/dev-java/netty-codec-4.0.19
index 4d665d029051..fe0374baed15 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=024c8256752b35b9dc88d56fcc9889f5
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.21 b/metadata/md5-cache/dev-java/netty-codec-4.0.21
index a836b23c5f1e..49089c6bfb87 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d14f05783a0e459e6052f60e8e0819de
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.19 b/metadata/md5-cache/dev-java/netty-common-4.0.19
index 3a059a25cd7e..b0697aa09b5d 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82c4eea75cefa2340f793403a39a20b8
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.21 b/metadata/md5-cache/dev-java/netty-common-4.0.21
index 4f7382eebb69..8e7e1b8413a9 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dfa8e6deafe0bad248001b408e3f276e
diff --git a/metadata/md5-cache/dev-java/netty-handler-4.0.19 b/metadata/md5-cache/dev-java/netty-handler-4.0.19
index c3aa7a7b7cff..a3de0838a704 100644
--- a/metadata/md5-cache/dev-java/netty-handler-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-handler-4.0.19
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-codec:0 dev-java/netty-common:0 dev-java/netty-transport:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cccc84edcf2806023fe596bba457a174
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.19 b/metadata/md5-cache/dev-java/netty-transport-4.0.19
index eecbbf83fdff..af76ddef2b64 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db75fd6c0754e3d0cf678adc818699f7
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21 b/metadata/md5-cache/dev-java/netty-transport-4.0.21
index b1a772a1f1ea..23f7cf0b175a 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=96ab9dc47f800eb8099e0234579999e9
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1 b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
index 4b9a50b24430..8d3262330368 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76833606a8c4c9ca9f58cd286cee50c0
diff --git a/metadata/md5-cache/dev-java/neuroph-2.2 b/metadata/md5-cache/dev-java/neuroph-2.2
index 9c6b10a6288d..9f7f04501e33 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.2
+++ b/metadata/md5-cache/dev-java/neuroph-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.2_nb.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d485ec64345e937222b39ded1cf1521c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index 11128612db92..e1c3480eed2e 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3
+++ b/metadata/md5-cache/dev-java/neuroph-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f74ebf7a032abba90593d90e8553c87d
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3.1 b/metadata/md5-cache/dev-java/neuroph-2.3.1
index f7f223397288..b962ff3ae460 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3.1
+++ b/metadata/md5-cache/dev-java/neuroph-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3.1_nb.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4d6d4f58d9fb807148800786cf71e97
diff --git a/metadata/md5-cache/dev-java/neuroph-2.4 b/metadata/md5-cache/dev-java/neuroph-2.4
index 7393f97f6904..452d591db2e4 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.4
+++ b/metadata/md5-cache/dev-java/neuroph-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.4_nb.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc1b0ceeeedbc7759a8ea93bf0c584a2
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index fdf2b4075bc5..e5b6c0240571 100644
--- a/metadata/md5-cache/dev-java/objenesis-1.3
+++ b/metadata/md5-cache/dev-java/objenesis-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=02c940972a4ac2d9bba036dc2fea2dc3
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1 b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
index ff8c9ef5f43f..a759ff697978 100644
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+++ b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea4ef3dd66ea3b226e5e9696baca3ca2
diff --git a/metadata/md5-cache/dev-java/ognl-2.6.9-r2 b/metadata/md5-cache/dev-java/ognl-2.6.9-r2
index 81ca5557d0f6..b92bc7d12501 100644
--- a/metadata/md5-cache/dev-java/ognl-2.6.9-r2
+++ b/metadata/md5-cache/dev-java/ognl-2.6.9-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.ognl.org/2.6.9/ognl-2.6.9-dist.zip https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ccd903f7b9dd8ba4be86168cd44810d
diff --git a/metadata/md5-cache/dev-java/ognl-3.0.8 b/metadata/md5-cache/dev-java/ognl-3.0.8
index aca7efeaa471..63b1a16e6153 100644
--- a/metadata/md5-cache/dev-java/ognl-3.0.8
+++ b/metadata/md5-cache/dev-java/ognl-3.0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 dev-java/javassist:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f59c4f46ba4c3eb47e411e5e7619b11
diff --git a/metadata/md5-cache/dev-java/opencsv-2.3 b/metadata/md5-cache/dev-java/opencsv-2.3
index c82374b2c955..37d65e4b1e91 100644
--- a/metadata/md5-cache/dev-java/opencsv-2.3
+++ b/metadata/md5-cache/dev-java/opencsv-2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencsv/opencsv-2.3-src-with-libs.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=957c72a5aab2534decd25cdae33acc7e
diff --git a/metadata/md5-cache/dev-java/openspml-0.5 b/metadata/md5-cache/dev-java/openspml-0.5
index ac80dde4a025..1a66b802ead9 100644
--- a/metadata/md5-cache/dev-java/openspml-0.5
+++ b/metadata/md5-cache/dev-java/openspml-0.5
@@ -8,5 +8,5 @@ LICENSE=openspml
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.openspml.org/Files/openspml_v0.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8042564206fc5eb7e94fc01edfb1309d
diff --git a/metadata/md5-cache/dev-java/openspml-0.5-r1 b/metadata/md5-cache/dev-java/openspml-0.5-r1
index da7792214b4a..5944ce73b78a 100644
--- a/metadata/md5-cache/dev-java/openspml-0.5-r1
+++ b/metadata/md5-cache/dev-java/openspml-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=openspml
 RDEPEND=>=dev-java/soap-2.3.1-r4:0 java-virtuals/javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.openspml.org/Files/openspml_v0.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d44821781459d6fa301ce47163a522c
diff --git a/metadata/md5-cache/dev-java/openspml2-1.0_rc2 b/metadata/md5-cache/dev-java/openspml2-1.0_rc2
index c7f97087399b..31ccd63c0982 100644
--- a/metadata/md5-cache/dev-java/openspml2-1.0_rc2
+++ b/metadata/md5-cache/dev-java/openspml2-1.0_rc2
@@ -8,5 +8,5 @@ LICENSE=CDDL-Schily
 RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* dev-java/openspml >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.openspml.org/Files/openspml_v2-1.0rc2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a71a8df0a2dad9f63e6add4592cbfca9
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
index 392d8f1ba5bb..2983631aecb2 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3049413d24d315c8eef1029ceb4f967b
diff --git a/metadata/md5-cache/dev-java/oscache-2.0.2-r3 b/metadata/md5-cache/dev-java/oscache-2.0.2-r3
index 96db715d0020..63d75b3a1a76 100644
--- a/metadata/md5-cache/dev-java/oscache-2.0.2-r3
+++ b/metadata/md5-cache/dev-java/oscache-2.0.2-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/commons-collections dev-java/commons-logging java-virtuals/servlet-api:2.3 java-virtuals/jms dev-java/jgroups >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://oscache.dev.java.net/files/documents/629/2653/oscache-2.0.2-full.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cbfb859b72acc703dc97963e2091844
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
index 04341ae4db39..6f9873c493f6 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6249e52bc7aa50f63cc8d64c8b4a5fb0
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-4.3 b/metadata/md5-cache/dev-java/osgi-core-api-4.3
index eb3e7960a71d..9299726789e6 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-4.3
+++ b/metadata/md5-cache/dev-java/osgi-core-api-4.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r4v43/osgi.core-4.3.0.jar -> osgi-core-api-4.3-all.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b1407463e92da996b24362c89748adb
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
index 8fed4a1bdd21..721c769ed4db 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29b7f79a186e65623cb607cd027c8897
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
index 7da982816034..7ef6ee77cb63 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64bd34441dd3aa2317b7a24dea125478
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
index eaa0fa33d16e..491851e7c617 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8127ce4b6225b90423d4fcef0151c742
diff --git a/metadata/md5-cache/dev-java/osgi-obr-1.0.2 b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
index 084736dec0ae..5e455d9ef611 100644
--- a/metadata/md5-cache/dev-java/osgi-obr-1.0.2
+++ b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d7f8938f7ba0b875f659f5f99542baf
diff --git a/metadata/md5-cache/dev-java/pat-1.5.3 b/metadata/md5-cache/dev-java/pat-1.5.3
index a1dd1a52b44a..d00348383cd8 100644
--- a/metadata/md5-cache/dev-java/pat-1.5.3
+++ b/metadata/md5-cache/dev-java/pat-1.5.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.javaregex.com/binaries/patsrcfree153.jar doc? ( http://www.javaregex.com/binaries/patdocs15.jar )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a7ce0dbeb6bab0ebf60ee56102fb599
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1 b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
index 7412e58c9b92..516a262a561b 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/pdf-renderer/downloads/download/PDFRenderer-full-0.9.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7780371dd5f9983864c82ba5645cc585
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
index bbc5b1c55c0e..f500835f77b8 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=31eb46cdd1790005e0ff62739a699b90
diff --git a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3 b/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
index a37180ab81c3..6f6e106737b6 100644
--- a/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
+++ b/metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/fontbox:0 dev-java/bcprov:1.38 dev-java/bcmai
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pdfbox/PDFBox-0.7.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90723991c2bbc0f7fdacb169d2cd5bab
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.8 b/metadata/md5-cache/dev-java/pdfbox-1.8.8
index 3f2b5dbfae29..5d02435426d1 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.8
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/icu4j:4 dev-java/junit:4 dev-java/bcprov:1.45
 RESTRICT=test
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.8/pdfbox-1.8.8-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82a893196b1c678a3214f92727c6c845
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index 7567ad9344fd..ec1fbc077fa3 100644
--- a/metadata/md5-cache/dev-java/piccolo-1.04
+++ b/metadata/md5-cache/dev-java/piccolo-1.04
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/piccolo/piccolo-1.04-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f03ab599d5f05ee259d499bbce376669
diff --git a/metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2 b/metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2
index 540811f68027..185716c87549 100644
--- a/metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2
+++ b/metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/swt:3.5 java-virtuals/jdk-with-com-sun >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://piccolo2d.googlecode.com/files/Piccolo2D.Java-1.2.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c407b64523725adf7c03fe6ea4fb4ea
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
index 4269ff91c185..03c042c7383b 100644
--- a/metadata/md5-cache/dev-java/picocontainer-1.1-r1
+++ b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=1
 SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ee77988b4bba9a563657bbfd43189b9
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index 26185d672e5b..4a11184d2478 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -9,5 +9,5 @@ LICENSE=codehaus-classworlds
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25146c36133b509bea5d12bef5a1ad95
diff --git a/metadata/md5-cache/dev-java/poi-3.0.2-r1 b/metadata/md5-cache/dev-java/poi-3.0.2-r1
index 915c5892c6a5..ab8ad024dd95 100644
--- a/metadata/md5-cache/dev-java/poi-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/poi-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-beanutils-1.7:1.7 >=dev-java/commons-lang-2.1:2.1 >=dev-java/commons-logging-1.1 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/poi/release/src/poi-src-3.0.2-FINAL-20080204.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00f12e7be5014ba895abad2cb19d5acb
diff --git a/metadata/md5-cache/dev-java/poi-3.2 b/metadata/md5-cache/dev-java/poi-3.2
index c9dd8f84c545..ebc9f1da01ea 100644
--- a/metadata/md5-cache/dev-java/poi-3.2
+++ b/metadata/md5-cache/dev-java/poi-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-logging-1.1 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://apache/poi/release/src/poi-src-3.2-FINAL-20081019.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d81895130c8522916bd6f1ca52d27be2
diff --git a/metadata/md5-cache/dev-java/portletapi-1.0 b/metadata/md5-cache/dev-java/portletapi-1.0
index a8486c297421..ca549728b885 100644
--- a/metadata/md5-cache/dev-java/portletapi-1.0
+++ b/metadata/md5-cache/dev-java/portletapi-1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/portals/jetspeed-2/sources/jetspeed-2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f6f9696fae4be34ec7c7725af2a396f3
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index 888ae001885b..d934a864ae05 100644
--- a/metadata/md5-cache/dev-java/prefuse-20071021_beta
+++ b/metadata/md5-cache/dev-java/prefuse-20071021_beta
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef1e02afcfaca946bfbf5087005a88ea
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index 43c5c7e45641..14c76eef4bd2 100644
--- a/metadata/md5-cache/dev-java/proguard-4.5
+++ b/metadata/md5-cache/dev-java/proguard-4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d999167a3894c1b4226ae8d9c98eb5f
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index 5f631e6ae477..57cc39d336d1 100644
--- a/metadata/md5-cache/dev-java/proguard-4.7
+++ b/metadata/md5-cache/dev-java/proguard-4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0649c83a39560f07e4947ef0c06f40d0
diff --git a/metadata/md5-cache/dev-java/proguard-4.8 b/metadata/md5-cache/dev-java/proguard-4.8
index 8c62911bc720..1a82d5d1236d 100644
--- a/metadata/md5-cache/dev-java/proguard-4.8
+++ b/metadata/md5-cache/dev-java/proguard-4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=218915d8d8ea94f1157fca926229125a
diff --git a/metadata/md5-cache/dev-java/proguard-5.2.1 b/metadata/md5-cache/dev-java/proguard-5.2.1
index f53d251727aa..87f2edc61b6b 100644
--- a/metadata/md5-cache/dev-java/proguard-5.2.1
+++ b/metadata/md5-cache/dev-java/proguard-5.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard5.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a62c96fb1f9d60290d3518cd9cc5437
diff --git a/metadata/md5-cache/dev-java/proxool-0.8.3-r2 b/metadata/md5-cache/dev-java/proxool-0.8.3-r2
index a593a0569d72..cf86a8ac3675 100644
--- a/metadata/md5-cache/dev-java/proxool-0.8.3-r2
+++ b/metadata/md5-cache/dev-java/proxool-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/avalon-framework:4.2 dev-java/avalon-logkit:2.0 dev-java/log4j:
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/proxool/proxool-0.8.3-source.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65e499a51e85cfcbd5d44a08cb774b37
diff --git a/metadata/md5-cache/dev-java/qdox-1.12-r1 b/metadata/md5-cache/dev-java/qdox-1.12-r1
index 02350c03fa96..2717455006b1 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7742c0926616fa88dfaeecf5946bc42c
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index 7d218ddc812b..b50aa79af546 100644
--- a/metadata/md5-cache/dev-java/qdox-1.6.3
+++ b/metadata/md5-cache/dev-java/qdox-1.6.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1fe7d79bedcc367168d73ce96c61eff1
diff --git a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1 b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
index b53587c01906..ee35d21f74b2 100644
--- a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=35d8cb3156c3c972015335d353c3e2b2
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.09 b/metadata/md5-cache/dev-java/reflectasm-1.09
index b1aea95dd701..fe5b28305110 100644
--- a/metadata/md5-cache/dev-java/reflectasm-1.09
+++ b/metadata/md5-cache/dev-java/reflectasm-1.09
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/1.09.tar.gz -> reflectasm-1.09.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb940513883e583e40fa50980d112983
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.9 b/metadata/md5-cache/dev-java/reflections-0.9.9
index 5631daf6f0f1..5a3cdc5acc81 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.9
+++ b/metadata/md5-cache/dev-java/reflections-0.9.9
@@ -9,5 +9,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.2.2 dev-java/guava:18 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.9/reflections-0.9.9-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f315188e276eb17968d26870323b10b
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
index d810c85c42be..4f06f4c32920 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bb9027aa3dcbcd9dbe4c0e3117caf30
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r1 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r1
index 8baac9c54cd6..40cdc75fe89f 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r1
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/relaxng-datatype:0 dev-java/msv:0 dev-java/ant-core:0 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f7b1ba3240a99347454c62d193f4fad
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r2 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
index bfeca39fe062..98f715225972 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/relaxng-datatype:0 dev-java/msv:0 dev-java/ant-core:0 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66d36dbe424c0099e35ab71f8de41e7f
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
index f3d09d0119b7..f7212a71236e 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=186f282a1f8bbc633611f36ce0b67194
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.10 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.10
index 95aba7581c55..b6620faba923 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.10
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.10-src.zip mirror://gentoo/resin-gentoo-patches-3.1.10.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a86ed58bacd7d35c7a6727f684460f70
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.11 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.11
index 1faeffa7075f..de1416c3a192 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.11
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.11-src.zip mirror://gentoo/resin-gentoo-patches-3.1.11.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a327bff1ee08c4fecf2631d73b4f6fd8
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
index 45c10fad1d15..b287a45ae305 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.12-src.zip mirror://gentoo/resin-gentoo-patches-3.1.12.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b5f3fb806d9c08cb4c84ca07e896b9d
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.13 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.13
index 198840fe337a..2b806c5c5e7c 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.13
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.13-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c091a3bef905ef1a847526b7e95d381
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.14 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.14
index c449d84eb29d..430ec58d5669 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.14
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.14-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68e1fb3230b3bc09bf346d5510fc8db4
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.15 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.15
index 4f8c2afd86fc..72613dcb12d2 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.15
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.15-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=311a92e69829dc33ee59d34f3769bea7
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.22 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.22
index cf42c47dbcb7..0fee2f98a49b 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.22
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.22-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c2b7f31308ae6cbd520bd6a281b5141
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.25 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.25
index f7b585b00b71..cd683a966122 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.25
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.25-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b3251e14cd9c22eb887017831b2f602
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
index eb5092fa5138..a85f13a27026 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11a43c2719851210cee0852e85243f26
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
index 8b833d752776..c3b77f9ca75e 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.27-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4bf350a269feb59243db5297a388d545
diff --git a/metadata/md5-cache/dev-java/rhino-1.6.5 b/metadata/md5-cache/dev-java/rhino-1.6.5
index dd1dd0d69cd7..cadca5b8fcfe 100644
--- a/metadata/md5-cache/dev-java/rhino-1.6.5
+++ b/metadata/md5-cache/dev-java/rhino-1.6.5
@@ -8,5 +8,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 ) BSD-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/xml-xmlbeans-1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R5.zip mirror://gentoo/rhino-swing-ex-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=901939b9c2cba57faa9d54400fa53945
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.2-r2 b/metadata/md5-cache/dev-java/rhino-1.7.2-r2
index 85c827a4684b..0dfdac33900f 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.2-r2
+++ b/metadata/md5-cache/dev-java/rhino-1.7.2-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 ) BSD-2
 RDEPEND=>=virtual/jre-1.5 =dev-java/xml-xmlbeans-1* >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip mirror://gentoo/rhino-swing-ex-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b300f6975d66bd3eb38d40a6dcc7557
diff --git a/metadata/md5-cache/dev-java/rngom-20051226 b/metadata/md5-cache/dev-java/rngom-20051226
index b6dcc41532b1..cd7265868f98 100644
--- a/metadata/md5-cache/dev-java/rngom-20051226
+++ b/metadata/md5-cache/dev-java/rngom-20051226
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/relaxng-datatype dev-java/xsdlib >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://rngom.dev.java.net/files/documents/1647/26424/rngom-20051226.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb3d008f74740be768da22310ca27e07
diff --git a/metadata/md5-cache/dev-java/rome-0.9 b/metadata/md5-cache/dev-java/rome-0.9
index 258a1e552b83..034527ea4f00 100644
--- a/metadata/md5-cache/dev-java/rome-0.9
+++ b/metadata/md5-cache/dev-java/rome-0.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/jdom-1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/rome-0.9-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6c89e8a011bb4d6e94f4ce93dd89f1c
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11 b/metadata/md5-cache/dev-java/rundoc-0.11
index 739358509ab9..cc7b637135da 100644
--- a/metadata/md5-cache/dev-java/rundoc-0.11
+++ b/metadata/md5-cache/dev-java/rundoc-0.11
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.5.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/rundoc/rundoc-0.11-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d87cb5157fbd81786b4fc8e5d77a8744
diff --git a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3 b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
index 2853d9f3ec93..34f20e1578f8 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
+++ b/metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7df0482b4e1a6576b7a617795086434
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
index c02b64cf8114..cf46f0bf68f8 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a43f38cd3903e8c50a0387b0aaab13a8
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19-r1 b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
index 3285ab749055..62975d5da122 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/jaf:0 java-virtuals/saaj-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f07d5e805ef5a699d75d246b8c0bd56
diff --git a/metadata/md5-cache/dev-java/sablecc-3.2 b/metadata/md5-cache/dev-java/sablecc-3.2
index fcd2d01bd423..378e563231ad 100644
--- a/metadata/md5-cache/dev-java/sablecc-3.2
+++ b/metadata/md5-cache/dev-java/sablecc-3.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-3.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9f9044f50917563882653f8bb518b86
diff --git a/metadata/md5-cache/dev-java/sablecc-3.7 b/metadata/md5-cache/dev-java/sablecc-3.7
index c5897f3fa896..94cadf8ec233 100644
--- a/metadata/md5-cache/dev-java/sablecc-3.7
+++ b/metadata/md5-cache/dev-java/sablecc-3.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-3.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b7971c360c5769b1920e3a67c7ec212
diff --git a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1 b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
index 4ad10d06120e..e665eeb915ca 100644
--- a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/sablecc >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-anttask-1.1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f3ffd81c66e11f6c78b868980b0584a
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r1 b/metadata/md5-cache/dev-java/sac-1.3-r1
index 5031087c48d6..ab1209acc53e 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r1
+++ b/metadata/md5-cache/dev-java/sac-1.3-r1
@@ -8,5 +8,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=04d9f71f34c080d78ce344e66000c328
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.2.0 b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
index 924c2a6119c9..85f81a284459 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.2.0-build.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=581d92e3958c1d018f17dc1bced106dc
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1 b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
index 51e46c997a20..bb17b02427a1 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.3.1-build.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa0369dd2cf36d7d6a77014955ec4f64
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
index 7d4af538b48a..d2c71175f9de 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.2.0-build.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b91983b2e772fe0ee8a1ad4fc17ad272
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
index d273884f0370..1124ceaa69f9 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2.3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.3.1-build.xml
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b98a85fd05b19019c9c60d8d4633cc05
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r2 b/metadata/md5-cache/dev-java/sax-2.2.1-r2
index 1dfc191e9bd7..00302ddf61fd 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=326b1a3282f0f2e7494f283d3c522f2f
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5 b/metadata/md5-cache/dev-java/saxon-6.5.5
index f09651940b78..f20c894da928 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06cdbf9ebb15a14bfad5c2cd5d4e2f4e
diff --git a/metadata/md5-cache/dev-java/saxon-8.4b-r3 b/metadata/md5-cache/dev-java/saxon-8.4b-r3
index 40f66f1ad7b1..3869aef7e4d8 100644
--- a/metadata/md5-cache/dev-java/saxon-8.4b-r3
+++ b/metadata/md5-cache/dev-java/saxon-8.4b-r3
@@ -8,5 +8,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/xom ~dev-java/jdom-1.0 =dev-java/xml-commons-external-1.3* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/saxon/saxonb8-4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ac7c7c11471f49d8f963940a0b9c0910
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6 b/metadata/md5-cache/dev-java/saxon-9.2.0.6
index 2bcf50b6bcaf..7d797dc3cfe6 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=140fc604c6da09dabbf66f289eaa8387
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index 6da262668c4d..41f8c526f9fa 100644
--- a/metadata/md5-cache/dev-java/saxpath-1.0-r2
+++ b/metadata/md5-cache/dev-java/saxpath-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/saxpath/saxpath-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=517019d41650e251aad910a3f6ba4b59
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
index 70e1171cd9ec..b06d427d1111 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffbff6fc69fa0d3c2ecdad845c60f900
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
index 1300d684a94f..871370bbc330 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64a92639e5da6600f6a0e23073f0377c
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.8 b/metadata/md5-cache/dev-java/sbt-0.13.8
index 5cc6eee9b554..6e89ef734e40 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.8
+++ b/metadata/md5-cache/dev-java/sbt-0.13.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-lang/scala:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( http://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-src.tar.bz2 http://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-ivy2-deps.tar.bz2 http://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-sbt-deps.tar.bz2 http://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-test-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.8/sbt-launch.jar -> sbt-launch-0.13.7.jar ) binary? ( http://dev.gentoo.org/~gienah/files/dist/sbt-0.13.8-gentoo-binary.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1210d429cda3c7c8dad37fb904d23fc0
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index b64b6a8cc2f8..6bf3ef0369cc 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.2-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r3
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3816d10f5962d946b01a9d5094687127
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r3 b/metadata/md5-cache/dev-java/servletapi-2.3-r3
index 6ae91f554676..b4a5f9e0087a 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.3-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r3
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=2.3
 SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=97ab4b81ad09f372068200767d456df9
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index 890ed3799120..ad2ba2657785 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r5
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r5
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=499b9859d413525dbd8402a03616d442
diff --git a/metadata/md5-cache/dev-java/shared-objects-1.4-r3 b/metadata/md5-cache/dev-java/shared-objects-1.4-r3
index 7c990c658593..4bc952179702 100644
--- a/metadata/md5-cache/dev-java/shared-objects-1.4-r3
+++ b/metadata/md5-cache/dev-java/shared-objects-1.4-r3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cc7c6b866abf39eeadc7a8113ce8c80
diff --git a/metadata/md5-cache/dev-java/simplyhtml-0.13.1 b/metadata/md5-cache/dev-java/simplyhtml-0.13.1
index 27b130f16c8e..0162540d78f4 100644
--- a/metadata/md5-cache/dev-java/simplyhtml-0.13.1
+++ b/metadata/md5-cache/dev-java/simplyhtml-0.13.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/javahelp dev-java/gnu-regexp >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/simplyhtml/SimplyHTML_src_0_13_1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9a55d7b8a1d7a56edd065898c4ebf40
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1 b/metadata/md5-cache/dev-java/sjsxp-1.0.1
index 20c3a020af7a..0dd8a9f2e195 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1
@@ -8,5 +8,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=340b8d0075e8b35da3fc76a8970a6f90
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1 b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
index c6bc7789018c..de890588c2e8 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.5 java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43ffacf92534f169bfbcadfaf8ad0431
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 69ff28854c8f..b01bb8e25fef 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=507b8022232d60db512fe271f497616c
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.5.11 b/metadata/md5-cache/dev-java/slf4j-api-1.5.11
index bd6baf582bb8..0f8cb6e9e2d3 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.5.11
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.5.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/slf4j-api-1.5.11-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=636f5705aa83107717ba219287fb28fd
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.6.6 b/metadata/md5-cache/dev-java/slf4j-api-1.6.6
index 551fb9c659f2..a0de911b986c 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.6.6
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.6.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.6.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b084ffe71d54f0767678d3d419b9a97
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1 b/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
index 850ab7517531..fab2fb17a575 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14cb1734ceea78d008641834f0abdf98
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.6 b/metadata/md5-cache/dev-java/slf4j-api-1.7.6
index d1b4d85ec5c3..4503ecf21a27 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.6
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=767cad1f88112b9ffbea2eff73a29426
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.7 b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
index 188bbc5408ae..5e4e5fe77a55 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33bff56476484510debd437058ca4750
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
index de3acd9eaae3..25d656785116 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf60ef9beeefc1419b3b408d9e8fd159
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
index f107348a9a63..32108b908e8a 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/log4j:0 ~dev-java/slf4j-api-1.7.5:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbcc92dc34fdeeba4670830f90c97320
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
index 6180f41f76a2..4162016224db 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f20a56b92e8a67fb392f2d0fb44c959
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
index 15dacbca077e..66bdbcd88009 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee3140af7e8e237dc979c7c08e487cb3
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.5.11 b/metadata/md5-cache/dev-java/slf4j-nop-1.5.11
index 35556f67f2ff..4e782523656d 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.5.11
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.5.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 ~dev-java/slf4j-api-1.5.11:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/slf4j-nop-1.5.11-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc1e0741e28c2bf34d39ff026aa3f827
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.6.6 b/metadata/md5-cache/dev-java/slf4j-nop-1.6.6
index 42053253e876..b53713ab1be0 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.6.6
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.6.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 ~dev-java/slf4j-api-1.6.6:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.6.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=02d085b63ecb31c215496c91803c6a1c
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.5 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.5
index 6d5806ef9958..0e72851ca69a 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c78c3d259406ef22aea5cc38ddca194
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.5 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
index 20c05defbc42..798675fea5ef 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=527f2d2e2239c0eddc2a5c3c3a006118
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.6 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.6
index 13d1dd3cc252..639e781f512c 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.6
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=35c632ec759e76dc168eacafabd0ef84
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
index 723cf912f6c2..9f875570487b 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca7726e4d923f18e407ef47017607d42
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index 6354d9952551..f86a1d6c9787 100644
--- a/metadata/md5-cache/dev-java/smack-2.2.1
+++ b/metadata/md5-cache/dev-java/smack-2.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=http://www.jivesoftware.org/builds/smack/smack-dev-2.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c391e8a655d6cbea3fefba14cf88b2dd
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.11 b/metadata/md5-cache/dev-java/snakeyaml-1.11
index 8763fa7e7210..8366446cc7d6 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.11
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.11.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=293d99dfd4f810704c226c2d24020ad8
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.9 b/metadata/md5-cache/dev-java/snakeyaml-1.9
index 36f395937414..cfc926b981f2 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.9
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9856431fcf9ba7ea39b247e888e51f7b
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.9-r1 b/metadata/md5-cache/dev-java/snakeyaml-1.9-r1
index bb331f35d27f..a495e198a141 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.9-r1
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.9-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.9
 SRC_URI=http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b67b7b10d73ae68af4f8389dc2442f62
diff --git a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3 b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
index 1f428768aea5..661b2a914e7c 100644
--- a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+++ b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cabb557de8a71fd7d356a518d7694b13
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 2d354ac0a230..93354b8f2e70 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=38b2d43f4c87d2133c6463efb73e9b9e
diff --git a/metadata/md5-cache/dev-java/snip-0.11 b/metadata/md5-cache/dev-java/snip-0.11
index 2ceee69d0f08..330938262436 100644
--- a/metadata/md5-cache/dev-java/snip-0.11
+++ b/metadata/md5-cache/dev-java/snip-0.11
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.5.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/snip/snip-0.11-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80de2f670dba59dcc7c77aa2c1fd0c99
diff --git a/metadata/md5-cache/dev-java/soap-2.3.1-r3 b/metadata/md5-cache/dev-java/soap-2.3.1-r3
index 9636ffefb992..58632db4c9c4 100644
--- a/metadata/md5-cache/dev-java/soap-2.3.1-r3
+++ b/metadata/md5-cache/dev-java/soap-2.3.1-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jaf:0 java-virtuals/javamail:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://archive.apache.org/dist/ws/soap/version-2.3.1/soap-src-2.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbd08453ef3fdeaa2c733b4e2083df68
diff --git a/metadata/md5-cache/dev-java/soap-2.3.1-r4 b/metadata/md5-cache/dev-java/soap-2.3.1-r4
index 6da9769c1d74..c84e0bc8b2a7 100644
--- a/metadata/md5-cache/dev-java/soap-2.3.1-r4
+++ b/metadata/md5-cache/dev-java/soap-2.3.1-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jaf:0 java-virtuals/javamail:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://archive.apache.org/dist/ws/soap/version-2.3.1/soap-src-2.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ebf35fce50433bcca3e7c21a80b9ed
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index 46bd3a68b8af..c7cc319be163 100644
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.2
+++ b/metadata/md5-cache/dev-java/spice-jndikit-1.2
@@ -8,5 +8,5 @@ LICENSE=Spice-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dist.codehaus.org/spice/distributions/spice-jndikit-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acfbaf69016fa3a680f29b42e973dfb0
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index 9237e3db2f33..00fb8e331cff 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ b/metadata/md5-cache/dev-java/spin-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fadaf807de9b9cb40cba3ce5d6f4022c
diff --git a/metadata/md5-cache/dev-java/spring-aop-3.2.4 b/metadata/md5-cache/dev-java/spring-aop-3.2.4
index 767e0450e734..fcf9402cb266 100644
--- a/metadata/md5-cache/dev-java/spring-aop-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-aop-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev-java/aopalliance:1 dev-java/aspectj:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/jamon:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30d008cc270ba8f3c34a0d861a486721
diff --git a/metadata/md5-cache/dev-java/spring-beans-3.2.4 b/metadata/md5-cache/dev-java/spring-beans-3.2.4
index 4a92c4408e3c..e43a3cb6dd59 100644
--- a/metadata/md5-cache/dev-java/spring-beans-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-beans-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/javax-inject:0 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=814deb2b6344cff2f3bc4ccab377dd70
diff --git a/metadata/md5-cache/dev-java/spring-core-3.2.4 b/metadata/md5-cache/dev-java/spring-core-3.2.4
index 24579ea771f3..f17ec8c9e222 100644
--- a/metadata/md5-cache/dev-java/spring-core-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-core-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/log4j:0 dev-java/aspectj:0 dev-java/asm:4 dev-java/cglib:3 dev-java/jopt-simple:4.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8fa69d2d77eadd2a588ae5121de9219
diff --git a/metadata/md5-cache/dev-java/spring-expression-3.2.4 b/metadata/md5-cache/dev-java/spring-expression-3.2.4
index 21dda3c54167..e6c749d13be8 100644
--- a/metadata/md5-cache/dev-java/spring-expression-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-expression-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=810c882b31647f3fbcfffb0097bc4394
diff --git a/metadata/md5-cache/dev-java/spring-instrument-3.2.4 b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
index ba2a20423304..36597f7316a6 100644
--- a/metadata/md5-cache/dev-java/spring-instrument-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd03691a87553139e07758123e0b5fd0
diff --git a/metadata/md5-cache/dev-java/spymemcached-2.9.1 b/metadata/md5-cache/dev-java/spymemcached-2.9.1
index 992b9178956f..f56cff636f7f 100644
--- a/metadata/md5-cache/dev-java/spymemcached-2.9.1
+++ b/metadata/md5-cache/dev-java/spymemcached-2.9.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 spring? ( dev-java/spring-beans:3.2 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ca2bc3df01f4af40cff1a577a055aaf
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
index 11d39dcb5794..df703067e214 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3194cc2ce07f71ef2b940de666a36c5
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index af3f8251cf3e..086ed08e19a6 100644
--- a/metadata/md5-cache/dev-java/stax-1.2.0
+++ b/metadata/md5-cache/dev-java/stax-1.2.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41f2f8a2df57a80e2f416dbb258f3ea9
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0 b/metadata/md5-cache/dev-java/stax-ex-1.0
index 094892a2ea83..d8a11d64138a 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/sun-jaf dev-java/jsr173 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://stax-ex.dev.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c8d513e5d01de03ec24d3a85de55c95
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r1 b/metadata/md5-cache/dev-java/stax-ex-1.0-r1
index 19c7cbb84274..3b3b369ce460 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r1
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/jaf java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://stax-ex.dev.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c68e486d85338f97df211ea406d5be0
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r3 b/metadata/md5-cache/dev-java/stax-ex-1.0-r3
index e0b89b20a404..f878205ee1e3 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r3
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/jaf:0 java-virtuals/stax-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49e4f11335a85cbee420f98e08485ef4
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.7.6 b/metadata/md5-cache/dev-java/stax-ex-1.7.6
index 3725276a2e9e..067996488232 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.7.6
+++ b/metadata/md5-cache/dev-java/stax-ex-1.7.6
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://maven.java.net/content/groups/public/org/jvnet/staxex/stax-ex/1.7.6/stax-ex-1.7.6-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=068ce5d6ea3d82446696ba4dc56f96b8
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0 b/metadata/md5-cache/dev-java/stax2-api-4.0.0
index 51a178693814..fe0a45ca84fa 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0
+++ b/metadata/md5-cache/dev-java/stax2-api-4.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b8935a67f0d4de88e918d3ab74ca4c79
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2 b/metadata/md5-cache/dev-java/stringtemplate-3.2
index ffbc115f4eb2..93fb182bb49b 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.stringtemplate.org/download/stringtemplate-3.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80d0c20c1ce303fda715eebad30a00b3
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1
index 2afdae4877a4..95df8e0a5be5 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.stringtemplate.org/download/stringtemplate-3.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fefb538cbd317e224652e4945c3c7ef8
diff --git a/metadata/md5-cache/dev-java/struts-1.2.9-r3 b/metadata/md5-cache/dev-java/struts-1.2.9-r3
index d7215ddee140..d8619873dd14 100644
--- a/metadata/md5-cache/dev-java/struts-1.2.9-r3
+++ b/metadata/md5-cache/dev-java/struts-1.2.9-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-digester-1.5:0 >=dev-java/commons-fileupload-1.0:0 >=dev-java/commons-logging-1.0.4:0 >=dev-java/commons-validator-1.1.4:0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://apache/struts/source/struts-1.2.9-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=984fb456cf71d3ea64481078816ee2fb
diff --git a/metadata/md5-cache/dev-java/struts-2.3.15.2 b/metadata/md5-cache/dev-java/struts-2.3.15.2
index 1b79eb2eac77..c83ded2a9ee1 100644
--- a/metadata/md5-cache/dev-java/struts-2.3.15.2
+++ b/metadata/md5-cache/dev-java/struts-2.3.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/felix-shell:0 dev-java/osgi-core-api:0 dev-ja
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/struts/source/struts-2.3.15.2-src.zip http://dev.gentoo.org/~tomwij/files/dist/struts-build.xml-2.3.15.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43f09ae5e30945de10c59fba71e82ad8
diff --git a/metadata/md5-cache/dev-java/struts-core-2.3.15.2 b/metadata/md5-cache/dev-java/struts-core-2.3.15.2
index 1b8559dbd230..40647f5862c1 100644
--- a/metadata/md5-cache/dev-java/struts-core-2.3.15.2
+++ b/metadata/md5-cache/dev-java/struts-core-2.3.15.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-fileupload:0 dev-java/commons-lang:3.1 dev-java/freemarker:2.3 dev-java/ognl:3.0 dev-java/struts-xwork:2 dev-java/velocity:0 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/struts/source/struts-2.3.15.2-src.zip http://dev.gentoo.org/~tomwij/files/dist/struts-build.xml-2.3.15.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87431bca49adaef92030d74da22bef60
diff --git a/metadata/md5-cache/dev-java/struts-plugins-2.3.15.2 b/metadata/md5-cache/dev-java/struts-plugins-2.3.15.2
index 0d8a3521a22b..d661b9693f0e 100644
--- a/metadata/md5-cache/dev-java/struts-plugins-2.3.15.2
+++ b/metadata/md5-cache/dev-java/struts-plugins-2.3.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-beanutils:1.7 dev-java/commons-lang:3
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/struts/source/struts-2.3.15.2-src.zip http://dev.gentoo.org/~tomwij/files/dist/struts-build.xml-2.3.15.2.tar.xz http://dev.gentoo.org/~tomwij/files/dist/struts-2.3.15.2-build.xml-classpath.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63e3c3fe4ae5c105fde4c351b35a6def
diff --git a/metadata/md5-cache/dev-java/struts-xwork-2.3.15.2 b/metadata/md5-cache/dev-java/struts-xwork-2.3.15.2
index 246d014c65b7..cb4cb08e2443 100644
--- a/metadata/md5-cache/dev-java/struts-xwork-2.3.15.2
+++ b/metadata/md5-cache/dev-java/struts-xwork-2.3.15.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/asm:3 dev-java/commons-io:1 dev-java/commons-
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/struts/source/struts-2.3.15.2-src.zip http://dev.gentoo.org/~tomwij/files/dist/struts-build.xml-2.3.15.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f60a486e6e04166dde8d6ff7b90fd93
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index 50341d9aa8e1..0c77b2d2170a 100644
--- a/metadata/md5-cache/dev-java/sun-dtdparser-1.0
+++ b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/dtd-parser-1.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab1fa9f0b1bc678bc23d3c41b153eb86
diff --git a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1 b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1
index 76f545a5e16b..11a1713b6a66 100644
--- a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1
+++ b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2364d91da8941fe0301da881a796956e
diff --git a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2 b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
index 8c1f2a4a9901..5f68f279a190 100644
--- a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=1.1
 SRC_URI=j2ee_deployment-1_1-fr-class.zip doc? ( j2ee_deployment-1_1-fr-doc.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a1cdc0ef4eecde546a986f3e66649a2
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 5c5c6fc5232a..365b6403a6b9 100644
--- a/metadata/md5-cache/dev-java/sun-jacc-api-20070102
+++ b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jacc-api-20070102.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3810d8cb3fb301f9023154d800c4e134
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
index 1fc318983408..68be7c781cc6 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30e2ed003caccaa215a993b7d1f8f67b
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
index 7653126fe014..3031f9a78c86 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0734ee8ca97a01124dc553258971818
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
index 3f146251e4b8..ba918d884d26 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=0
 SRC_URI=!amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae316d23c699ceb6e466aa88d36c4a84
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
index 4d7e321ea7fe..46383b2ce8c0 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( java3d-1_3_2-linux-amd64.zip ) x86? ( java3d-1_3_2-linux-i586.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0fb2dcbd562f1d37d32b6e129b74151
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
index 926e7a71035a..dbc93c3152db 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
@@ -8,5 +8,5 @@ LICENSE=sun-jrl sun-jdl
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=amd64? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-amd64.zip ) x86? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-i586.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=232fd5b8f8c9964f18d2a42991e6839b
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.3 b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
index 8d611f2a45c2..1dde9541c4b5 100644
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.3
+++ b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jaf >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://kenai.com/projects/javamail/downloads/download//javamail-1.4.3-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d002169f8bc25b17cfabc5c71fb4fab7
diff --git a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3 b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
index 091e8c9cf05b..0a63bd89c9e8 100644
--- a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
+++ b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jimi1_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbde54f3ad3a9588df4ea084ce4f5d97
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r2 b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
index e9559bb25566..e2c519175d93 100644
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b0a9cde3b61dfcef85bd1a9a9ee197a
diff --git a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3 b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
index b8acc10a0fc8..4f6abc6d969c 100644
--- a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
+++ b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmx-1_2_1-ri.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b79960c0e9bdc5bd93e94bfb7c71e6d3
diff --git a/metadata/md5-cache/dev-java/sux4j-2.0 b/metadata/md5-cache/dev-java/sux4j-2.0
index 5fb640e828b7..a355833b9a15 100644
--- a/metadata/md5-cache/dev-java/sux4j-2.0
+++ b/metadata/md5-cache/dev-java/sux4j-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/fastutil:5.0 dev-java/commons-io:1 dev-java/colt:0 dev-java/dsiutils:0 dev-java/log4j:0 dev-java/commons-collections:0 dev-java/commons-configuration:0 dev-java/jsap:0 dev-java/commons-lang:2.1 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sux.dsi.unimi.it/sux4j-2.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49df04a18a8f83bb6709fbb76c805912
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r1 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r1
index ad5f31878ef5..2f5c546e7e14 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0-r1
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea6f7c4db3606e245185b902d82661d5
diff --git a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1 b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
index 44c9a62af5d7..b33a7164e354 100644
--- a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
+++ b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-collections-3 >=dev-java/commons-lo
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://gentoo/swarmcache-1.0_pre20050106.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d48289c01be642480c9374628b6b11e8
diff --git a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1 b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
index 4b9693894d1b..7db4672407fb 100644
--- a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
+++ b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/toolbar >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://swidgets.tigris.org/files/documents/1472/18566/swidgets-0.1.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=261618e9fc2b774532c1c551e15ce617
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4 b/metadata/md5-cache/dev-java/swing-layout-1.0.4
index fdffd525fb79..3f07cd7cb68f 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://swing-layout.dev.java.net/files/documents/2752/144673/swing-layout-1.0.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14b2ad380365d27dbf8295f709dcbdad
diff --git a/metadata/md5-cache/dev-java/swing-worker-1.1 b/metadata/md5-cache/dev-java/swing-worker-1.1
index ba61848fdfa4..c1d2706830ff 100644
--- a/metadata/md5-cache/dev-java/swing-worker-1.1
+++ b/metadata/md5-cache/dev-java/swing-worker-1.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://swingworker.dev.java.net/files/documents/2810/51774/swing-worker-src-1.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33915b61891d98462124257df3290cdc
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4 b/metadata/md5-cache/dev-java/swingx-1.6.4
index 524fc28c43a9..759959ad635d 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://java.net/projects/swingx/downloads/download/releases/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ea4bc68b174f05a98ea33d613f1a4fd
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
index 70be7989d996..778df5bf6ee2 100644
--- a/metadata/md5-cache/dev-java/swt-3.5.2
+++ b/metadata/md5-cache/dev-java/swt-3.5.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-ppc.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90d327ab7450561e92b57d33e4ac29e9
diff --git a/metadata/md5-cache/dev-java/swt-3.6.1 b/metadata/md5-cache/dev-java/swt-3.6.1
index a58c028b6812..b853d51c5d91 100644
--- a/metadata/md5-cache/dev-java/swt-3.6.1
+++ b/metadata/md5-cache/dev-java/swt-3.6.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.6
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-ppc.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.6.1-201009090800/swt-3.6.1-gtk-linux-x86_64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19295eeb883be95b6ac00e17c161f370
diff --git a/metadata/md5-cache/dev-java/swt-3.7.1 b/metadata/md5-cache/dev-java/swt-3.7.1
index 276bc4a5cf68..4acb688fe929 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.1
+++ b/metadata/md5-cache/dev-java/swt-3.7.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a1e571300014bbd237eac253bee5b473
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2 b/metadata/md5-cache/dev-java/swt-3.7.2
index b51d2a55152a..284cbed31973 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce1e11f628304a936bac75c215cc3ad4
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r1 b/metadata/md5-cache/dev-java/swt-3.7.2-r1
index 1dc521ca0937..d6a1bbd04090 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r1
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79593d736a655248d46cc3590cbb057b
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2 b/metadata/md5-cache/dev-java/swt-3.8.2
index 274d376533a9..7f67b5153e6a 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2
+++ b/metadata/md5-cache/dev-java/swt-3.8.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.8
 SRC_URI=x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a26236ca43bb6c54c258492604880dfd
diff --git a/metadata/md5-cache/dev-java/swt-4.2 b/metadata/md5-cache/dev-java/swt-4.2
index 99ad1baad95f..5c110b790b47 100644
--- a/metadata/md5-cache/dev-java/swt-4.2
+++ b/metadata/md5-cache/dev-java/swt-4.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b45a1e1275259efb06764d7bb3bea924
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r1 b/metadata/md5-cache/dev-java/swt-4.2-r1
index 33a21544c650..584065d43df8 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r1
+++ b/metadata/md5-cache/dev-java/swt-4.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7c5d3381e0fb6e4070a707e30200736
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r2 b/metadata/md5-cache/dev-java/swt-4.2-r2
index fe905cdc3090..3273c6dc612b 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r2
+++ b/metadata/md5-cache/dev-java/swt-4.2-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4e204b54e9297bf68f5a1b6512de58f
diff --git a/metadata/md5-cache/dev-java/tablelayout-20090826 b/metadata/md5-cache/dev-java/tablelayout-20090826
index dd43dc254aa6..0f21231ada4f 100644
--- a/metadata/md5-cache/dev-java/tablelayout-20090826
+++ b/metadata/md5-cache/dev-java/tablelayout-20090826
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/tablelayout/downloads/download/Everything-2009-08-26.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30b2a82bf7f8ca621ea0c8b75436df39
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
index 5ffd22c17b93..c74e055989b2 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.2.1
+++ b/metadata/md5-cache/dev-java/tagsoup-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b53b5fa53d7e14a133120aebf703e78
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r1 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r1
index 8f2d83abfa05..0a20344d72c9 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r1
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:2.6 dev-java/servletapi:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e200b8898d9f02f5d6488eecd1236025
diff --git a/metadata/md5-cache/dev-java/tclib-1.1 b/metadata/md5-cache/dev-java/tclib-1.1
index 2c293060e0be..9a5dc467b3d6 100644
--- a/metadata/md5-cache/dev-java/tclib-1.1
+++ b/metadata/md5-cache/dev-java/tclib-1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/tclib-1.1-source.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4ee81c5b44d776e618f085c83e9f9a4
diff --git a/metadata/md5-cache/dev-java/telnetd-2.0 b/metadata/md5-cache/dev-java/telnetd-2.0
index ae220f8c6d90..a507822de098 100644
--- a/metadata/md5-cache/dev-java/telnetd-2.0
+++ b/metadata/md5-cache/dev-java/telnetd-2.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/telnetd/telnetd-2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b311b4ff8263bdc5c6e7f1e542464e4
diff --git a/metadata/md5-cache/dev-java/testng-6.8-r2 b/metadata/md5-cache/dev-java/testng-6.8-r2
index f4988d65a12a..fc01386132c4 100644
--- a/metadata/md5-cache/dev-java/testng-6.8-r2
+++ b/metadata/md5-cache/dev-java/testng-6.8-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core:0 dev-java/bsh:0 dev-java/guice:2 dev-java/jcommander:0 dev-java/junit:4 dev-java/snakeyaml:1.9 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://testng.org/testng-6.8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=704d4f45226831bd1c6e9cd31e661fc0
diff --git a/metadata/md5-cache/dev-java/texhyphj-1.1 b/metadata/md5-cache/dev-java/texhyphj-1.1
index 9f780b707ccd..5a79baef675c 100644
--- a/metadata/md5-cache/dev-java/texhyphj-1.1
+++ b/metadata/md5-cache/dev-java/texhyphj-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.davidashen.net/TeXHyphenator-J/texhyphj-1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=163fa2561317ad596d3a047370355717
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index 40a232c18884..e590eb780585 100644
--- a/metadata/md5-cache/dev-java/tijmp-0.8
+++ b/metadata/md5-cache/dev-java/tijmp-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc5e23cd3bb0572767d25baa08964357
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
index e6ea48eeae91..b7ba8ecab77b 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-jstl-impl:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2.5
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da7e23d4804dc35de72bd1c5b5e64d28
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
index 1e8940402626..bff48dc030f5 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-impl:1.2.5 dev-java/tomcat-jstl-spec:1.2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2.5
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f3d09841b82427eb147b5c3aa75740d
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5
index c5a0a256a6d3..2edfaee60a40 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/tomcat-jstl-spec:1.2.5 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2.5
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69359aee69b32303643e42c0f4d9e7f1
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
index 1fea691611cc..741f7a8528d7 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2.5
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5063dc355246d21a694ce820c49b221
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.32 b/metadata/md5-cache/dev-java/tomcat-native-1.1.32
index 53857d72bfc9..8e46443f6ab3 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.32
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.32
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* dev-libs/openssl >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.1.32/source/tomcat-native-1.1.32-src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a8b4e6a16f7001177206e1fdfeac9a6
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.1.33 b/metadata/md5-cache/dev-java/tomcat-native-1.1.33
index 3883edf87094..22ac6c13460a 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.1.33
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.1.33
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==dev-libs/apr-1* dev-libs/openssl:= >=virtual/jre-1.5:* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.1.33/source/tomcat-native-1.1.33-src.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8a494d8ad2701ac81fe0f9639d8c0bf
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index a4f109f4425c..d0fb1c7bffd9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78dd7f141ae46d77d4e3858d3b737c1c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
index 4eb6c6d6859c..a1db3d5d08b7 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79d86b4e7c73e8cdfe589b2037de2da8
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
index 33187008a0a3..2708c3e259b5 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=17fed72a9b0770673d3dead9a6d0c9d3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index c190eb176744..3142deb3d068 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d013cd0385d3cc513948a84132088921
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
index 1cf159e3bfd2..5fdf27785064 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98a9ecbc8cb35b9763a89e5725eaf717
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
index fd2025ca0e89..f2cef0e6e7a4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c65aa63f39174a0c462c3f91b90b9d3e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
index 11b9cecd716b..478fe1bbb260 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.22/src/apache-tomcat-8.0.22-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a92e26a3276e539fd8c6324bf6d247e2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
index ad8e44016dc4..517eb63cba94 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.23/src/apache-tomcat-8.0.23-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d56779e794929709b575421c8757f69
diff --git a/metadata/md5-cache/dev-java/toolbar-1.1.0-r1 b/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
index 898a2a4c56a2..62c606c3035c 100644
--- a/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://toolbar.tigris.org/files/documents/869/25285/toolbar-1.1.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e9d348739753173da15ded25d3e72ed
diff --git a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22 b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
index ac4c7df7657b..0f23c8c60641 100644
--- a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
+++ b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/touchgraph/TGGL_122_jre11.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eeba4329a8746426daf197f448f70d6f
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index 1b0d1dd81808..f45af5bab2cd 100644
--- a/metadata/md5-cache/dev-java/trident-1.3
+++ b/metadata/md5-cache/dev-java/trident-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/swt:3.7 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7355b745697fdf8489db13729d1b64ab
diff --git a/metadata/md5-cache/dev-java/trove-2.1.0 b/metadata/md5-cache/dev-java/trove-2.1.0
index e4fb4277aa7e..ac5ae13d67e1 100644
--- a/metadata/md5-cache/dev-java/trove-2.1.0
+++ b/metadata/md5-cache/dev-java/trove-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/trove4j/trove-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0876f65e494739ef25211d4cad4d811e
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2 b/metadata/md5-cache/dev-java/trove-3.0.2
index 5082e69bee5c..8dbf584604e1 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2
+++ b/metadata/md5-cache/dev-java/trove-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=59c1ef7b7adfd2acae12a8ae519303dd
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2 b/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
index b1fa2c9d08d7..793ce40da0d2 100644
--- a/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
+++ b/metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://txw.dev.java.net/files/documents/3310/54821/txw2-20070407.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=370373132a3505cbc691ceec9f21b620
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
index dbc01f45f07f..28e001f71c82 100644
--- a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+++ b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c0937cd78fd1bfd3ce52b0a990c4a36
diff --git a/metadata/md5-cache/dev-java/validation-api-1.0.0 b/metadata/md5-cache/dev-java/validation-api-1.0.0
index 4b5be026a4c9..616a616a48d3 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.0.0
+++ b/metadata/md5-cache/dev-java/validation-api-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4709b67008d4fd35f737ce5fe7f13c40
diff --git a/metadata/md5-cache/dev-java/velocity-1.6.3 b/metadata/md5-cache/dev-java/velocity-1.6.3
index 50c2e0d9eae6..5bd067c97b9c 100644
--- a/metadata/md5-cache/dev-java/velocity-1.6.3
+++ b/metadata/md5-cache/dev-java/velocity-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-lang:2.1 dev-java/commons-collections
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.6.3/velocity-1.6.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbeed9a78320a807cfee8709ca9f86c4
diff --git a/metadata/md5-cache/dev-java/velocity-1.7 b/metadata/md5-cache/dev-java/velocity-1.7
index 061bd0a01425..19d72d0b2153 100644
--- a/metadata/md5-cache/dev-java/velocity-1.7
+++ b/metadata/md5-cache/dev-java/velocity-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/common
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4a45fe3a6a9b9b925e8f072b70c4e2e
diff --git a/metadata/md5-cache/dev-java/webgraph-1.4.1-r1 b/metadata/md5-cache/dev-java/webgraph-1.4.1-r1
index a523ba931949..ab6d34c5d4df 100644
--- a/metadata/md5-cache/dev-java/webgraph-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/webgraph-1.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/java-getopt-1.0* =dev-java/fastutil-4.4* =dev-java/colt-1* >=dev-java/jal-20031117 =dev-java/mg4j-0.9* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=http://webgraph.dsi.unimi.it/webgraph-1.4.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6efd0a42da665868f4faa5e0ce888ea
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
index 118f93f24555..4e508ecf02f1 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/jdom:1.0 >=dev-java/antlr-2.7.7:0[java] >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=35a3c4b603cc938bf9515fbd934d4164
diff --git a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1 b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
index 4f6ab2445de4..86aa08201899 100644
--- a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
+++ b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9961e123aef07e0b5942f769db9989d5
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index 897d150085cf..48727cda34e3 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
@@ -8,5 +8,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d849a83eb594ff359659fbfd8f9f0534
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.8 b/metadata/md5-cache/dev-java/wstx-3.2.8
index 9956235af856..fa848f3016a5 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.8
+++ b/metadata/md5-cache/dev-java/wstx-3.2.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/emma:0 dev-java/sax:0 java-virtuals/jaxp-virtual dev-java/stax:0 dev-java/msv:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=http://woodstox.codehaus.org/3.2.8/wstx-src-3.2.8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fccbd0a3207123a7cf469a5374f27702
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9 b/metadata/md5-cache/dev-java/wstx-3.2.9
index a81205142df9..88a74231c9db 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/emma:0 dev-java/sax:0 java-virtuals/jaxp-virtual dev-java/stax:0 dev-java/msv:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=http://woodstox.codehaus.org/3.2.9/wstx-src-3.2.9.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79aefeb8b0f150b662d78ed8d40a13d6
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.1 b/metadata/md5-cache/dev-java/xalan-2.7.1
index a9f930e4fce5..b56fd8bab7f7 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.1
+++ b/metadata/md5-cache/dev-java/xalan-2.7.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/javacup:0 dev-java/bcel:0 dev-java/xerces:2 dev-java/xml-commons-external:1.3 ~dev-java/xalan-serializer-2.7.1 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/xalan-j/source/xalan-j_2_7_1-src.tar.gz doc? ( mirror://apache/xml/xalan-j/binaries/xalan-j_2_7_1-bin.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b260f4bfaaf0e9265ea4a558d4ce6a5
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.1 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
index ed4cb589adfa..00106bc4e25e 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/xml-commons-external-1.3* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/xalan-j/source/xalan-j_2_7_1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=433c190019fe20369bfb33fb33a032c3
diff --git a/metadata/md5-cache/dev-java/xdoclet-1.2.3 b/metadata/md5-cache/dev-java/xdoclet-1.2.3
index b6b357f2a0ea..bdb08fd14292 100644
--- a/metadata/md5-cache/dev-java/xdoclet-1.2.3
+++ b/metadata/md5-cache/dev-java/xdoclet-1.2.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core >=dev-java/bsf-2.3 dev-java/commons-collections dev-java/commons-logging dev-java/log4j dev-java/mockobjects dev-java/velocity dev-java/xjavadoc =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xdoclet/xdoclet-src-1.2.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12644d10d507ba4f4ca9f7ec2314f2ec
diff --git a/metadata/md5-cache/dev-java/xerces-1.3.1-r2 b/metadata/md5-cache/dev-java/xerces-1.3.1-r2
index 647b207d09a0..7cdf2253d9ec 100644
--- a/metadata/md5-cache/dev-java/xerces-1.3.1-r2
+++ b/metadata/md5-cache/dev-java/xerces-1.3.1-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/xalan-2.5.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=http://archive.apache.org/dist/xml/xerces-j/old_xerces1/Xerces-J-src.1.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b8c5c640b9c254b357482644e749cd1
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index 373e60ab1459..2ab0b414ac6c 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd9321d0f887d305ea09dde0ee61caf9
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
index 9a17b291a44e..8c6df7277986 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7244c6bb091af586ce50d5c875e9d4a5
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index 4a5f3be2edb4..adf93201076a 100644
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ b/metadata/md5-cache/dev-java/xjavac-20110814
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cede6d8717b23164e36f3ccc7ee9b091
diff --git a/metadata/md5-cache/dev-java/xjavadoc-1.1-r2 b/metadata/md5-cache/dev-java/xjavadoc-1.1-r2
index 3f8549e64d3a..e4f6c8652c26 100644
--- a/metadata/md5-cache/dev-java/xjavadoc-1.1-r2
+++ b/metadata/md5-cache/dev-java/xjavadoc-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xdoclet/xjavadoc-1.1-src.tar.gz mirror://gentoo/xjavadoc-1.1-supplement.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=812697b562d20478a62f04b0285cf5e0
diff --git a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1 b/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
index 0eff2a2f4388..43c2c22e5f67 100644
--- a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1 public-domain W3C-document W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-1.0.b2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25678a0578664292a4e564db5a9e66f0
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
index 05824152050f..bfe7a83828ee 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c857ec7b7f6a33a4fe5fd60060a8804e
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index 38c624e60f0b..e36996a6286a 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea35937ea0c635d5a8eb79e19a6f9a78
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
index cb209633a611..b6d70ace94f5 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c18a68a7a550cd2b366d2447c55f103
diff --git a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1 b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
index 84827e1c8c20..c49d94dbc5e7 100644
--- a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
+++ b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-im-exporter/xml-im-exporter1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48ae22f3365d39cbccccb4a26b97b370
diff --git a/metadata/md5-cache/dev-java/xml-security-1.5.7 b/metadata/md5-cache/dev-java/xml-security-1.5.7
index 4333e03edc8d..304d8e0cc64c 100644
--- a/metadata/md5-cache/dev-java/xml-security-1.5.7
+++ b/metadata/md5-cache/dev-java/xml-security-1.5.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00494e839b42b2dc0e335d76b4516bf3
diff --git a/metadata/md5-cache/dev-java/xml-writer-0.2 b/metadata/md5-cache/dev-java/xml-writer-0.2
index 071840d181e9..84df886eed2b 100644
--- a/metadata/md5-cache/dev-java/xml-writer-0.2
+++ b/metadata/md5-cache/dev-java/xml-writer-0.2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.megginson.com/downloads/xml-writer-0.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=522a67488aa4304e19c9fd92b434ac3d
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217 b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
index 38eb7ae553f5..45cbff67e3bb 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/jaxen-1.1* >=dev-java/ant-core-1.6.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/xml-xmlbeans-20041217.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b39d28f4a06173df7e1d2ecf773942a1
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1 b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
index 0b5830ed412f..e9fb77dbb2aa 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jaxen:1.1 dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/xml-xmlbeans-20041217.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d09e11135a64bd3c955f062273b52ee3
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0 b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
index 600fa6c0c362..8bf350336a5f 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/annogen:0 dev-java/ant-core:0 dev-java/jsr173:0 dev-java/piccolo:0 dev-java/saxon:9 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://archive.apache.org/dist/xmlbeans/source/xmlbeans-2.6.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cd670ac361ee4cf61bf0cb29f066ee1
diff --git a/metadata/md5-cache/dev-java/xmlc-2.3.1-r1 b/metadata/md5-cache/dev-java/xmlc-2.3.1-r1
index effd5f4482c5..540e36f22415 100644
--- a/metadata/md5-cache/dev-java/xmlc-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/xmlc-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/asm:3 dev-java/gnu-regexp:1 dev-java/log4j:0 dev-java/nekohtml:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.forge.objectweb.org/xmlc/xmlc-src-2.3.1.zip http://download.us.forge.objectweb.org/xmlc/xmlc-src-2.3.1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e74acff0366ff2638672533e500117f
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index 607d400e82b2..1bd7bb017078 100644
--- a/metadata/md5-cache/dev-java/xmldb-20011111-r1
+++ b/metadata/md5-cache/dev-java/xmldb-20011111-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/xalan-2.7 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=668b8af8281ccf0c03c1128b7d68d349
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
index 79e38f47718f..b3837278727d 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1 >=dev-java/java-config-2.2.0 s
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6fe0ac0c4129e72c2ac45881b61fe55a
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
index 02ed1bab8369..0043e3c2935f 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=501607ad51c3617074394acd04eb4025
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
index f3bf347f981d..5e55bb2c75e0 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
@@ -4,10 +4,10 @@ DESCRIPTION=A library of several reusable components used by Apache Batik and Ap
 EAPI=5
 HOMEPAGE=http://xmlgraphics.apache.org/commons/index.html
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.5
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.5-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=bb5a37fd9a0162c1c58b397bb6e5b21c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=6156f8e9ba7245f4c894277b08bf35eb
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index 90e7325f83d9..b4d9a22c6271 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-3.1.3
+++ b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0 dev-java/ws-commons-util:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 http://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca83cc602a376291f76117730d70ea0e
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index b0e748798b51..ab703778d940 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05a421d4f6117f1656f87e8067ad71b2
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.3 b/metadata/md5-cache/dev-java/xmlunit-1.3
index a37cb8e1901c..d6f92fc379c9 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.3
+++ b/metadata/md5-cache/dev-java/xmlunit-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 sour
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.3-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88786d45224a44c1b4821d6de4341559
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.4 b/metadata/md5-cache/dev-java/xmlunit-1.4
index 9272b3acd635..ff5a6eeafe69 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.4
+++ b/metadata/md5-cache/dev-java/xmlunit-1.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=26bc893058bf126af7f404d0fd70209b
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index 28fa76b1e868..d1f9e99e0068 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ b/metadata/md5-cache/dev-java/xom-1.2.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 ex
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c956e79e6123082ad7fb8fabf925ff75
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r1 b/metadata/md5-cache/dev-java/xp-0.5-r1
index 5638197e7c09..b30b8bc5b693 100644
--- a/metadata/md5-cache/dev-java/xp-0.5-r1
+++ b/metadata/md5-cache/dev-java/xp-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ded9a16cf545b8040bf3b283b566cac2
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r2 b/metadata/md5-cache/dev-java/xp-0.5-r2
index d28d1ab0be2d..0704fd114bce 100644
--- a/metadata/md5-cache/dev-java/xp-0.5-r2
+++ b/metadata/md5-cache/dev-java/xp-0.5-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90df686fed7bd14cf8654efdf4451797
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r1 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
index 06551faf7725..c621bb515d57 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 IBM
 RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=959b2d9e3514c240148c766fb9e6b791
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
index fd32142c82dd..3c9189afd790 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e868c60394e90889d269c3ec55eed7d6
diff --git a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2 b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
index 6563c9b91e2d..3576b3fcdb3a 100644
--- a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
+++ b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/xpp3:0 dev-java/jaxme:0 dev-java/jibx:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/xsd2jibx-beta2a.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21c2ec3db2841ba3c7fbb0d349c0721f
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index 12ebbbefec89..7b3c7649a6de 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ddb12796956ee9a7df72b83d2c7d2a7
diff --git a/metadata/md5-cache/dev-java/xsom-20060901 b/metadata/md5-cache/dev-java/xsom-20060901
index d6af646b960c..a836b6351dbf 100644
--- a/metadata/md5-cache/dev-java/xsom-20060901
+++ b/metadata/md5-cache/dev-java/xsom-20060901
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/relaxng-datatype dev-java/relaxngcc >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/xsom-src-20060901.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=53226150c56f530ecbf8319f749b19cb
diff --git a/metadata/md5-cache/dev-java/xstream-1.3.1-r3 b/metadata/md5-cache/dev-java/xstream-1.3.1-r3
index a42fc791f967..321a6fcb247b 100644
--- a/metadata/md5-cache/dev-java/xstream-1.3.1-r3
+++ b/metadata/md5-cache/dev-java/xstream-1.3.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/dom4j:1 dev-java/jdom:1.0 de
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/1.3.1/xstream-distribution-1.3.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e7597b06d69a2843e3fd03a3cd0dda2
diff --git a/metadata/md5-cache/dev-java/xz-java-1.4 b/metadata/md5-cache/dev-java/xz-java-1.4
index eaa6c0a658c0..44fe33850fa1 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.4
+++ b/metadata/md5-cache/dev-java/xz-java-1.4
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9079dfe91369a654198717c4544ed3d6
diff --git a/metadata/md5-cache/dev-java/xz-java-1.5 b/metadata/md5-cache/dev-java/xz-java-1.5
index 486a751928e5..6cdf1bb645c6 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.5
+++ b/metadata/md5-cache/dev-java/xz-java-1.5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=59531d26ae70b2470e4776d0cb8d91e1
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
index ec6ec73f784d..577948c060ee 100644
--- a/metadata/md5-cache/dev-java/yanfs-1.0
+++ b/metadata/md5-cache/dev-java/yanfs-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3f0ceb0bd1ee53fb1921efa9ad735d7
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 4d181cdcfde8..465d5277493b 100644
--- a/metadata/md5-cache/dev-java/zemberek-2.1.1
+++ b/metadata/md5-cache/dev-java/zemberek-2.1.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6d68fc7117704af044a9d0b8b4546ec
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.08 b/metadata/md5-cache/dev-java/zeus-jscl-1.08
index ed752d3ef905..fca47db8f31b 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.08
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.08
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_08.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d23391fc4679a00bf870ceb4ced2de37
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64 b/metadata/md5-cache/dev-java/zeus-jscl-1.64
index 0f2db6564165..c72ae4b71aef 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.64
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.64
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2f4b3c391d42b03fe2b741cb519e3aa
diff --git a/metadata/md5-cache/dev-lang/clojure-1.5.1 b/metadata/md5-cache/dev-lang/clojure-1.5.1
index b3986b70922f..5b095525a01a 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.5.1
+++ b/metadata/md5-cache/dev-lang/clojure-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.5
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.5.1 -> clojure-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3224fb7a5bd82144a786e2fe4704b2f1
diff --git a/metadata/md5-cache/dev-lang/clojure-1.6.0 b/metadata/md5-cache/dev-lang/clojure-1.6.0
index c24cb3f6f8b6..030ac5fc710b 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.6.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.6.0 -> clojure-1.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49d81f08a9b1289605490680dfc44069
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
index 4611a1ac31e8..dfec2f0da9a3 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://closure-compiler.googlecode.com/files/compiler-20120305.tar.gz -> closure-compiler-bin-20120305.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05f22cce6458a27f224651807b253fd0
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
index efe6bf663cee..0a32a528b6db 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://closure-compiler.googlecode.com/files/compiler-20121212.tar.gz -> closure-compiler-bin-20121212.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5d830ae6045a12c3e04cd94a38ba923
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
index 455c968605b0..7ad08efc113f 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://closure-compiler.googlecode.com/files/compiler-20130227.tar.gz -> closure-compiler-bin-20130227.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47e8bfb50264fe8bc626a30fda6f5163
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
index 7b73cf9a2c80..fdcdd3998b99 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://closure-compiler.googlecode.com/files/compiler-20130411.tar.gz -> closure-compiler-bin-20130411.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95c347b33650a17996423ae877d59d00
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
index de11eaa6040e..9799a635caae 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dl.google.com/closure-compiler/compiler-20150126.tar.gz -> closure-compiler-bin-20150126.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85c6e987619c0a2f2eb68a64ff251ad4
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index a8e0b95953a4..e9973a9a7686 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 =dev-java/junit-3.8* || ( dev-lang/xsb dev-lang/swi-prolog dev-lang/yap ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=946e5e79a6bf2289852f7c1d27be3c69
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.2-r2 b/metadata/md5-cache/dev-lang/scala-2.10.2-r2
index 86367207d029..334c39dbe49b 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.2-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.10.2-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/bndlib:0 dev-java/hawtjni-runtime:0 dev-java/junit:4 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.2
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.2.tar.gz -> scala-2.10.2.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.10.2-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~tomwij/files/dist/scala-2.10.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ae275632fb9bb337318de7dc4389f43
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.3-r1 b/metadata/md5-cache/dev-lang/scala-2.10.3-r1
index f71dcf55fc04..2452902c220d 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.3-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.10.3-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.3
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.3.tar.gz -> scala-2.10.3.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.10.3-maven-deps.tar.gz http://dev.gentoo.org/~gienah/snapshots/scala-2.10.3-maven-deps-2.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.10.3-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b70017327a64b7991a067b942f7ad146
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.4-r1 b/metadata/md5-cache/dev-lang/scala-2.10.4-r1
index 9f17e3eed1b5..4dbb03eb382e 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.4-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.10.4-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.4.tar.gz -> scala-2.10.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.10.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.10.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.10.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.10.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.10.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> scala-2.10.4-fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.10.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> scala-2.10.4-jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> scala-2.10.4-msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> scala-2.10.4-scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> scala-2.10.4-scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> scala-2.10.4-scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> scala-2.10.4-scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> scala-2.10.4-scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> scala-2.10.4-scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.10.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.10.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.10.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.10.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.10.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.10.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.10.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> scala-2.10.4-scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.10.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.10.4-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.10.4-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.10.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c8f276bf9b1c40eb9d1f1491cb493d1
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.1-r1 b/metadata/md5-cache/dev-lang/scala-2.11.1-r1
index 0c21f2aaf6cf..211a3f564aad 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.1-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.1-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.1
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.1.tar.gz -> scala-2.11.1.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.1-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.1-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.1-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.1-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.1-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.1-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.1-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.1-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.1-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.1-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.1-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.1-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.1-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.1-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.1-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.1-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.1-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.11.1-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.11.1-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8308a839924f06f0aea147d482dc3a1f
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.2-r1 b/metadata/md5-cache/dev-lang/scala-2.11.2-r1
index 8faaccda99e9..17727fe15570 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.2-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.2-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.2
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.2.tar.gz -> scala-2.11.2.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.2-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.2-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.2-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.2-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.2-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.2-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.2-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.2-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.2-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.2-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.2-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.2-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.2-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.2-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.2-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.2-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.2-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.11.2-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.11.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=92eac2c1dae0b7f6d52732976d033314
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r1 b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
index f6e7f595af03..7b8fccc3bf3a 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64d3b221c8b69a2d6ab08d5ac567a6e9
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.6 b/metadata/md5-cache/dev-lang/scala-2.11.6
index 34f74c53ca3d..0754ab360a4c 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.6
+++ b/metadata/md5-cache/dev-lang/scala-2.11.6
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.6
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.6.tar.gz -> scala-2.11.6.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.6-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.6-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.6-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.6-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.6-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.6-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.6-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.6-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.6-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.6-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.6-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.6-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.6-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.6-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.6-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.6-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.6-push.jar http://dev.gentoo.org/~gienah/snapshots/scala-2.11.6-maven-deps.tar.gz ) binary? ( http://dev.gentoo.org/~gienah/files/dist/scala-2.11.6-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30df00e6e254c7abae09628d8ec982f8
diff --git a/metadata/md5-cache/dev-lang/scala-2.9.2-r1 b/metadata/md5-cache/dev-lang/scala-2.9.2-r1
index 18c840220d83..c8d9b7354d17 100644
--- a/metadata/md5-cache/dev-lang/scala-2.9.2-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.9.2-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode )
 RDEPEND=>=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.9/2.9.2
 SRC_URI=!binary? ( http://www.scala-lang.org/downloads/distrib/files/scala-sources-2.9.2.tgz -> scala-2.9.2.tar.gz ) binary? ( http://dev.gentoo.org/~ali_bush/distfiles/scala-2.9.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=45e4026a4ecb81ab5233a9251fc20384
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.6 b/metadata/md5-cache/dev-lang/scala-bin-2.11.6
index 2dbed7b39861..45b10ebf5242 100644
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.6
+++ b/metadata/md5-cache/dev-lang/scala-bin-2.11.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.6/scala-2.11.6.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ccb933593b3611e06af331fb4d7ee21
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.36 b/metadata/md5-cache/dev-lang/swi-prolog-7.2.0
similarity index 82%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.1.36
rename to metadata/md5-cache/dev-lang/swi-prolog-7.2.0
index 129fabd22933..233d3e41754f 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.36
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0 )
+DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0 )
 DESCRIPTION=free, small, and standard compliant Prolog compiler
 EAPI=4
 HOMEPAGE=http://www.swi-prolog.org/
 IUSE=archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X elibc_FreeBSD java
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
+RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.36.tar.gz mirror://gentoo/swi-prolog-7.1.36-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.2.0.tar.gz mirror://gentoo/swi-prolog-7.2.0-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5a36d7d0b1b93931e76e42c475721d5c
+_md5_=93294b0b9ef2f121972e5023d634e58f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.37 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.2
similarity index 89%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.1.37
rename to metadata/md5-cache/dev-lang/swi-prolog-7.3.2
index 1cecaf24c2e8..aa3772d4d556 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.37
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.3.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.37.tar.gz mirror://gentoo/swi-prolog-7.1.37-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.2.tar.gz mirror://gentoo/swi-prolog-7.3.2-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=da8f4a9f0ea9a119d8d3a547a4bc20f4
+_md5_=b5ac5a90285a439f835cab38aff29471
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5 b/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
index 2b3083e342ff..75e0c88c3e7d 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/tuprolog/2p-2.4.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=deb325d9d9d17e2fe81a2fc0a744345f
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.5.0 b/metadata/md5-cache/dev-lang/tuprolog-2.5.0
index a4514cf3b366..08265931caf2 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.5.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.5.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb875539487dc5c8d0b4d0d7d935da0a
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.6.0 b/metadata/md5-cache/dev-lang/tuprolog-2.6.0
index 96fa87a00124..c64a6c75c658 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.6.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fedea8fe6ab651f479edb44bca5a5ba7
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.7.0 b/metadata/md5-cache/dev-lang/tuprolog-2.7.0
index 77eefa31607a..d4a6ed01f3f4 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.7.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.7.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bbab2abf8411fb1199e3b0209bfe66b
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.7.2 b/metadata/md5-cache/dev-lang/tuprolog-2.7.2
index f129cf16057f..f53f5cc0ec59 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.7.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.7.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c779b52af4ea27d6cade718b853e8341
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.0 b/metadata/md5-cache/dev-lang/tuprolog-2.9.0
index 162cbbeacada..1fe9b51d1f40 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa8c48c17bdfe70725cec8f0837b0c74
diff --git a/metadata/md5-cache/dev-libs/busybee-0.1.0 b/metadata/md5-cache/dev-libs/busybee-0.1.0
deleted file mode 100644
index e95f24b6a709..000000000000
--- a/metadata/md5-cache/dev-libs/busybee-0.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/libpo6 dev-libs/libe
-DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/libpo6 dev-libs/libe
-SLOT=0
-SRC_URI=http://hyperdex.org/src/busybee-0.1.0.tar.gz
-_md5_=93a522fa687080ee360eea4b46abde35
diff --git a/metadata/md5-cache/dev-libs/busybee-0.4.0 b/metadata/md5-cache/dev-libs/busybee-0.4.0
deleted file mode 100644
index 0b5d4cfb76a4..000000000000
--- a/metadata/md5-cache/dev-libs/busybee-0.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4.0 >=dev-libs/libe-0.4.0
-DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4.0 >=dev-libs/libe-0.4.0
-SLOT=0
-SRC_URI=http://hyperdex.org/src/busybee-0.4.0.tar.gz
-_md5_=d6e425dd2899fdeb5574e0e2d2644b1c
diff --git a/metadata/md5-cache/dev-libs/busybee-0.4.1 b/metadata/md5-cache/dev-libs/busybee-0.4.1
deleted file mode 100644
index 04d0497bc965..000000000000
--- a/metadata/md5-cache/dev-libs/busybee-0.4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4.1 >=dev-libs/libe-0.4.1
-DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4.1 >=dev-libs/libe-0.4.1
-SLOT=0
-SRC_URI=http://hyperdex.org/src/busybee-0.4.1.tar.gz
-_md5_=e5a891a76cf64e5062b25d59770fb3f1
diff --git a/metadata/md5-cache/dev-libs/busybee-0.5.0 b/metadata/md5-cache/dev-libs/busybee-0.5.0
deleted file mode 100644
index 392c38fe2460..000000000000
--- a/metadata/md5-cache/dev-libs/busybee-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.5.0 >=dev-libs/libe-0.5.0
-DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.5.0 >=dev-libs/libe-0.5.0
-SLOT=0
-SRC_URI=http://hyperdex.org/src/busybee-0.5.0.tar.gz
-_md5_=2d670440f0ea663ef50e6192199c4ace
diff --git a/metadata/md5-cache/dev-libs/busybee-0.5.1 b/metadata/md5-cache/dev-libs/busybee-0.5.1
deleted file mode 100644
index b8958650639c..000000000000
--- a/metadata/md5-cache/dev-libs/busybee-0.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.5.1 >=dev-libs/libe-0.5.1
-DESCRIPTION=A messaging abstraction on top of TCP sockets used in HyperDex
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.5.1 >=dev-libs/libe-0.5.1
-SLOT=0
-SRC_URI=http://hyperdex.org/src/busybee-0.5.1.tar.gz
-_md5_=61abca97de23de54dbe4351319c390c7
diff --git a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.0 b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.0
deleted file mode 100644
index e6145e71c7a5..000000000000
--- a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/leveldb[snappy] !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hyperdex fork/extension of leveldb
-EAPI=5
-HOMEPAGE=http://hyperdex.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/leveldb[snappy]
-SLOT=0
-SRC_URI=http://hyperdex.org/src/hyperleveldb-1.2.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=57b5068f35eef1b67fe272cb83e79f35
diff --git a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.1 b/metadata/md5-cache/dev-libs/hyperleveldb-1.2.1
deleted file mode 100644
index a2b83674d91c..000000000000
--- a/metadata/md5-cache/dev-libs/hyperleveldb-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/leveldb[snappy] !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hyperdex fork/extension of leveldb
-EAPI=5
-HOMEPAGE=http://hyperdex.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/leveldb[snappy]
-SLOT=0
-SRC_URI=http://hyperdex.org/src/hyperleveldb-1.2.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e80e19fd7ecb39db903126a14ff959e2
diff --git a/metadata/md5-cache/dev-libs/libe-0.10.0 b/metadata/md5-cache/dev-libs/libe-0.10.1
similarity index 80%
rename from metadata/md5-cache/dev-libs/libe-0.10.0
rename to metadata/md5-cache/dev-libs/libe-0.10.1
index 76a96d7d1310..5271faae4b64 100644
--- a/metadata/md5-cache/dev-libs/libe-0.10.0
+++ b/metadata/md5-cache/dev-libs/libe-0.10.1
@@ -8,6 +8,6 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libpo6-0.7.0
 RESTRICT=test
 SLOT=0
-SRC_URI=http://hyperdex.org/src/libe-0.10.0.tar.gz
+SRC_URI=http://hyperdex.org/src/libe-0.10.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f00f6aad08491a88a0925461fa014368
+_md5_=d186f19dd8c9c936305113584b4faef9
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
index 7358a42dd7b6..e71f63ce39bb 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit for SSL v2/v3 and TLS v1
 EAPI=5
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos cpu_flags_x86_sse2 test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=openssl
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-libs/openssl-0.9.8*:0
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zg.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=baaceb7590f5b6404fc18ebba21eb7f5
+_md5_=26e8a26602108a32445bf38d603eda5b
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1o b/metadata/md5-cache/dev-libs/openssl-1.0.1o
index 9466cc7783a8..1f33472b7e44 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1o
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1o
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1o.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1e85526684be7cb1638cf00a2dada1e5
+_md5_=bec3e3da02a56394366039630940ba78
diff --git a/metadata/md5-cache/dev-libs/replicant-0.3.1 b/metadata/md5-cache/dev-libs/replicant-0.3.1
deleted file mode 100644
index 8e41b5531117..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.3.1.tar.gz
-_md5_=280d64e1374a23ad6f8681a427af64b1
diff --git a/metadata/md5-cache/dev-libs/replicant-0.4.0 b/metadata/md5-cache/dev-libs/replicant-0.4.0
deleted file mode 100644
index eded5d559115..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.4.0.tar.gz
-_md5_=2f84c9026a84456e1a3506f313898565
diff --git a/metadata/md5-cache/dev-libs/replicant-0.5.0 b/metadata/md5-cache/dev-libs/replicant-0.5.0
deleted file mode 100644
index 6b181fcd11cd..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.5.0.tar.gz
-_md5_=d1b6923e759777bd1ada15945455ea88
diff --git a/metadata/md5-cache/dev-libs/replicant-0.6.0 b/metadata/md5-cache/dev-libs/replicant-0.6.0
deleted file mode 100644
index 06d27e91dd05..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.6.0.tar.gz
-_md5_=d727facffa14059dbd31edd3e75affc9
diff --git a/metadata/md5-cache/dev-libs/replicant-0.6.2 b/metadata/md5-cache/dev-libs/replicant-0.6.2
deleted file mode 100644
index d40dfd190a0d..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.6.2.tar.gz
-_md5_=1b9f7dd49e298824fad6d19ba1b59dd6
diff --git a/metadata/md5-cache/dev-libs/replicant-0.6.3 b/metadata/md5-cache/dev-libs/replicant-0.6.3
deleted file mode 100644
index d555e26cd18f..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.6.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.6.3.tar.gz
-_md5_=9201ec795c3307debd32ac1f0fb69fcb
diff --git a/metadata/md5-cache/dev-libs/replicant-0.7.0 b/metadata/md5-cache/dev-libs/replicant-0.7.0
deleted file mode 100644
index 23fa5cb6034e..000000000000
--- a/metadata/md5-cache/dev-libs/replicant-0.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-DESCRIPTION=Hyperdex replicant support library
-EAPI=4
-HOMEPAGE=http://hyperdex.org
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
-SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.7.0.tar.gz
-_md5_=3d77058660103510b06cb5e39b3b0f85
diff --git a/metadata/md5-cache/dev-libs/replicant-0.6.1 b/metadata/md5-cache/dev-libs/replicant-0.7.1
similarity index 80%
rename from metadata/md5-cache/dev-libs/replicant-0.6.1
rename to metadata/md5-cache/dev-libs/replicant-0.7.1
index 58008681da66..b177f2c0d30f 100644
--- a/metadata/md5-cache/dev-libs/replicant-0.6.1
+++ b/metadata/md5-cache/dev-libs/replicant-0.7.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=>=dev-libs/libpo6-0.4 >=dev-libs/libe-0.4 >=dev-libs/busybee-0.4 dev-libs/hyperleveldb dev-cpp/glog dev-cpp/sparsehash
 SLOT=0
-SRC_URI=http://hyperdex.org/src/replicant-0.6.1.tar.gz
-_md5_=46302427027d7eedf5e6c28ae8100783
+SRC_URI=http://hyperdex.org/src/replicant-0.7.1.tar.gz
+_md5_=2dddc3c270d1b74a00514dee7fdcc5fa
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1 b/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
index dc96a4538bc0..cf088688711f 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
+++ b/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 jad? ( dev-java/jad-bin ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://armedbear.org/abcl-0.0.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=badf4ebe5deec09d2de81f6efdce2a0d
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0 b/metadata/md5-cache/dev-lisp/abcl-0.20.0
index 16e8054603d7..d1c5fb3f70fb 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.20.0
+++ b/metadata/md5-cache/dev-lisp/abcl-0.20.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 jad? ( dev-java/jad-bin ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://common-lisp.net/project/armedbear/releases/abcl-src-0.20.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f836f903731e9b2d73c6ecec1547cdfc
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4
index 11511fc25171..3c12d164b437 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4
@@ -9,5 +9,5 @@ PDEPEND=dev-php/pear
 RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[cli,xml,zlib]
 SLOT=0
 SRC_URI=http://pear.php.net/get/PEAR-1.9.4.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b489c0f39a616d42680f8e5747c07422
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=833233943efdbc81f287aa4269fb82a9
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5
index 31b3fafb9247..526c0314a51f 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5
@@ -9,5 +9,5 @@ PDEPEND=dev-php/pear
 RDEPEND=dev-lang/php:*[cli,pcre(+),xml,zlib]
 SLOT=0
 SRC_URI=http://pear.php.net/get/PEAR-1.9.5.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=3f0c017f9d713dd54dc67344aa509227
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e57214803481fd4aa77336c125e85a30
diff --git a/metadata/md5-cache/dev-php/ZendFramework-1.12.9 b/metadata/md5-cache/dev-php/ZendFramework-1.12.9
index acf071f8d28d..a1cb362d220c 100644
--- a/metadata/md5-cache/dev-php/ZendFramework-1.12.9
+++ b/metadata/md5-cache/dev-php/ZendFramework-1.12.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=cli? ( dev-lang/php:*[simplexml,tokenizer] ) dev-lang/php:*
 SLOT=0
 SRC_URI=!minimal? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9.tar.gz ) minimal? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-minimal.tar.gz ) doc? ( http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-apidoc.tar.gz http://framework.zend.com/releases/ZendFramework-1.12.9/ZendFramework-1.12.9-manual-en.tar.gz )
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	php-lib-r1	b9132955c09d44c0e2d0a7d3ae20dba4	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	php-lib-r1	b9132955c09d44c0e2d0a7d3ae20dba4	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8ad6453d99049214616e3ab16eacbc77
diff --git a/metadata/md5-cache/dev-php/adodb-5.17-r1 b/metadata/md5-cache/dev-php/adodb-5.17-r1
deleted file mode 100644
index 24bee316e886..000000000000
--- a/metadata/md5-cache/dev-php/adodb-5.17-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=app-arch/unzip =dev-lang/php-5* dev-lang/php
-DESCRIPTION=Active Data Objects Data Base library for PHP
-EAPI=4
-HOMEPAGE=http://adodb.sourceforge.net/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND==dev-lang/php-5* dev-lang/php
-SLOT=0
-SRC_URI=mirror://sourceforge/adodb/adodb517.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	php-lib-r1	b9132955c09d44c0e2d0a7d3ae20dba4	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b690d4ff52af45dd033f7067cd36b2b
diff --git a/metadata/md5-cache/dev-php/suhosin-0.9.38 b/metadata/md5-cache/dev-php/suhosin-0.9.38
index a6d90aa6b11d..8cd64d92dbfa 100644
--- a/metadata/md5-cache/dev-php/suhosin-0.9.38
+++ b/metadata/md5-cache/dev-php/suhosin-0.9.38
@@ -4,11 +4,11 @@ DESCRIPTION=Suhosin is an advanced protection system for PHP installations
 EAPI=5
 HOMEPAGE=http://www.suhosin.org/
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=PHP-3.01
 RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) php_targets_php5-5? ( dev-lang/php:5.5[unicode] ) php_targets_php5-4? ( dev-lang/php:5.4[unicode] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://download.suhosin.org/suhosin-0.9.38.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	php-ext-source-r2	b4d5827d04ab9f22f094e1ecab1df639	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a062861636571fb7e78fbdfebaf44df0
+_md5_=e3ef48a973e68b4e4d3e95e5bfc672b2
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.11.3 b/metadata/md5-cache/dev-python/PyQt4-4.11.3
deleted file mode 100644
index 6f1fc3c14db5..000000000000
--- a/metadata/md5-cache/dev-python/PyQt4-4.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16.6:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( kde? ( >=media-libs/phonon-4.7[qt4] ) !kde? ( || ( >=dev-qt/qtphonon-4.8.5:4 >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 ) dbus? ( virtual/pkgconfig )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4
-IUSE=X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.16.6:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtcore-4.8.5:4 X? ( >=dev-qt/qtgui-4.8.5:4 ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-qt/qtdbus-4.8.5:4 ) declarative? ( >=dev-qt/qtdeclarative-4.8.5:4 ) designer? ( >=dev-qt/designer-4.8.5:4 ) help? ( >=dev-qt/qthelp-4.8.5:4 ) multimedia? ( >=dev-qt/qtmultimedia-4.8.5:4 ) opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) phonon? ( kde? ( >=media-libs/phonon-4.7[qt4] ) !kde? ( || ( >=dev-qt/qtphonon-4.8.5:4 >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-4.8.5:4 ) scripttools? ( >=dev-qt/qtgui-4.8.5:4 ) sql? ( >=dev-qt/qtsql-4.8.5:4 ) svg? ( >=dev-qt/qtsvg-4.8.5:4 ) testlib? ( >=dev-qt/qttest-4.8.5:4 ) webkit? ( >=dev-qt/qtwebkit-4.8.5:4 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-4.8.5:4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) sql? ( X ) testlib? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/PyQt-x11-gpl-4.11.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	55ebcc6f3269308d226969c26704e343	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=947a0260ef33fbeb99fd94153987c34a
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.5 b/metadata/md5-cache/dev-python/alabaster-0.7.5
new file mode 100644
index 000000000000..33011917a612
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=A configurable sidebar-enabled Sphinx theme
+EAPI=5
+HOMEPAGE=https://github.com/bitprophet/alabaster
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.5.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=b6018434ea20ff8c988e382de7f51dec
diff --git a/metadata/md5-cache/dev-python/bokeh-0.4 b/metadata/md5-cache/dev-python/bokeh-0.4
deleted file mode 100644
index 52274c3fec3e..000000000000
--- a/metadata/md5-cache/dev-python/bokeh-0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/colorama-0.2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Statistical and interactive HTML plots for Python
-EAPI=5
-HOMEPAGE=http://bokeh.pydata.org/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bokeh/bokeh-0.4.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=625207005cf2a8ec16d8e651b28b2e9f
diff --git a/metadata/md5-cache/dev-python/bokeh-0.4.1 b/metadata/md5-cache/dev-python/bokeh-0.4.1
deleted file mode 100644
index 2718eea56113..000000000000
--- a/metadata/md5-cache/dev-python/bokeh-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/colorama-0.2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Statistical and interactive HTML plots for Python
-EAPI=5
-HOMEPAGE=http://bokeh.pydata.org/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/bokeh/archive/0.4.1.tar.gz -> bokeh-0.4.1.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b7f2647e3a49981a4fb21661b721f8b2
diff --git a/metadata/md5-cache/dev-python/bokeh-0.4.2 b/metadata/md5-cache/dev-python/bokeh-0.4.2
deleted file mode 100644
index 987312a71eca..000000000000
--- a/metadata/md5-cache/dev-python/bokeh-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/colorama-0.2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Statistical and interactive HTML plots for Python
-EAPI=5
-HOMEPAGE=http://bokeh.pydata.org/
-IUSE=doc test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-0.13.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-websocket-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/bokeh/archive/0.4.2.tar.gz -> bokeh-0.4.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1d83d600032f256cf1f012f7f96e9fbe
diff --git a/metadata/md5-cache/dev-python/bokeh-0.4.4 b/metadata/md5-cache/dev-python/bokeh-0.4.4
deleted file mode 100644
index e02eae6681b2..000000000000
--- a/metadata/md5-cache/dev-python/bokeh-0.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/gevent-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/gevent-websocket-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) chaco? ( python_targets_python2_7? ( >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/colorama-0.2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Statistical and interactive HTML plots for Python
-EAPI=5
-HOMEPAGE=http://bokeh.pydata.org/
-IUSE=examples test chaco python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/itsdangerous-0.23[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/gevent-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/gevent-websocket-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) chaco? ( python_targets_python2_7? ( >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/bokeh/archive/0.4.4.tar.gz -> bokeh-0.4.4.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fc33eaf54eccaceb22dd67f090c7bc01
diff --git a/metadata/md5-cache/dev-python/bokeh-0.5.0 b/metadata/md5-cache/dev-python/bokeh-0.5.0
deleted file mode 100644
index 2dfd22ef7256..000000000000
--- a/metadata/md5-cache/dev-python/bokeh-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/gevent-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/gevent-websocket-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) chaco? ( python_targets_python2_7? ( >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/colorama-0.2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Statistical and interactive HTML plots for Python
-EAPI=5
-HOMEPAGE=http://bokeh.pydata.org/
-IUSE=examples test chaco python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markdown-2.3.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/markupsafe-0.18[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.11[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pystache-0.5.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013b[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/redis-py-2.7.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-1.2.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/werkzeug-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/gevent-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/gevent-websocket-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) chaco? ( python_targets_python2_7? ( >=dev-python/traits-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/chaco-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/bokeh/archive/0.5.0.tar.gz -> bokeh-0.5.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fbf1cf719165fdc36445606865ea01b0
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.7.5 b/metadata/md5-cache/dev-python/eyeD3-0.7.5
index 37d1509d8e15..b41c49292726 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.7.5
+++ b/metadata/md5-cache/dev-python/eyeD3-0.7.5
@@ -4,11 +4,11 @@ DESCRIPTION=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=5
 HOMEPAGE=http://eyed3.nicfit.net/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!<dev-python/eyeD3-0.6.18-r1:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0.7
 SRC_URI=http://eyed3.nicfit.net/releases/eyeD3-0.7.5.tgz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b0530c2816270e0699cb95f88961f5c3
+_md5_=30bb4bd0b5bcca5884b42e622ee74d48
diff --git a/metadata/md5-cache/dev-python/flask-admin-1.2.0 b/metadata/md5-cache/dev-python/flask-admin-1.2.0
new file mode 100644
index 000000000000..147fe3df9542
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-admin-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-wtf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-peewee[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-mongoengine[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask-sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Simple and extensible admin interface framework for Flask
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/Flask-Admin
+IUSE=examples test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wtforms[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.2.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=d196163c7e59269a5201d96fc803bf11
diff --git a/metadata/md5-cache/dev-python/gevent-websocket-0.9.2 b/metadata/md5-cache/dev-python/gevent-websocket-0.9.5
similarity index 54%
rename from metadata/md5-cache/dev-python/gevent-websocket-0.9.2
rename to metadata/md5-cache/dev-python/gevent-websocket-0.9.5
index 463cdd092b8e..d3a1d2ee712d 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.9.2
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Websocket handler for the gevent pywsgi server
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/gevent-websocket/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.9.2.tar.gz
+SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.9.5.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8bceeaee50e91a5199aab68866072f73
+_md5_=41cdb53ed1745c6a32f3b39429952c60
diff --git a/metadata/md5-cache/dev-python/hgtools-2.0.2 b/metadata/md5-cache/dev-python/hgtools-2.0.2
deleted file mode 100644
index ff5ba8347895..000000000000
--- a/metadata/md5-cache/dev-python/hgtools-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgtools/hgtools-2.0.2.zip
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=936906a731f65b42dc62be90756063fd
diff --git a/metadata/md5-cache/dev-python/hgtools-2.0.2-r1 b/metadata/md5-cache/dev-python/hgtools-2.0.2-r1
deleted file mode 100644
index 7c6ab4781f73..000000000000
--- a/metadata/md5-cache/dev-python/hgtools-2.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgtools/hgtools-2.0.2.zip
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=37f9c88d0bb6a19d98f7dae7c662a863
diff --git a/metadata/md5-cache/dev-python/hgtools-3.0.2 b/metadata/md5-cache/dev-python/hgtools-3.0.2
deleted file mode 100644
index 38265e4a8672..000000000000
--- a/metadata/md5-cache/dev-python/hgtools-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgtools/hgtools-3.0.2.zip
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=2f0ede20b1196645f031db04df243ce0
diff --git a/metadata/md5-cache/dev-python/hgtools-4.0 b/metadata/md5-cache/dev-python/hgtools-4.0
deleted file mode 100644
index c0a414ea7720..000000000000
--- a/metadata/md5-cache/dev-python/hgtools-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
-EAPI=5
-HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgtools/hgtools-4.0.zip
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4c07382add8f78e847195e949f57e366
diff --git a/metadata/md5-cache/dev-python/hgtools-6.3 b/metadata/md5-cache/dev-python/hgtools-6.3
new file mode 100644
index 000000000000..ee7063971d02
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hgtools-6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
+EAPI=5
+HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/mercurial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgtools/hgtools-6.3.zip
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=423783c0c28187dc96df14bb507057bc
diff --git a/metadata/md5-cache/dev-python/into-0.2.2 b/metadata/md5-cache/dev-python/into-0.2.2
new file mode 100644
index 000000000000..38c8990c68ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/into-0.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Data migration utilities
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/into
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pandas-0.15[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/i/into/into-0.2.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=b4abb444005ec78df8949b40c261afd2
diff --git a/metadata/md5-cache/dev-python/mistune-0.6 b/metadata/md5-cache/dev-python/mistune-0.6
new file mode 100644
index 000000000000..ad38f0477306
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mistune-0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cython[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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=The fastest markdown parser in pure Python
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/m/mistune/mistune-0.6.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=184b2f74625289d24b5a381bb3848310
diff --git a/metadata/md5-cache/dev-python/nltk-3.0.3 b/metadata/md5-cache/dev-python/nltk-3.0.3
new file mode 100644
index 000000000000..544a94f0329d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nltk-3.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Natural Language Toolkit
+EAPI=5
+HOMEPAGE=http://nltk.org/
+IUSE=numpy tk python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/n/nltk/nltk-3.0.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6b604b04641b8595f341493b393991eb
diff --git a/metadata/md5-cache/dev-python/paste-2.0.2 b/metadata/md5-cache/dev-python/paste-2.0.2
index c23c4d3adf19..b88b0cd88749 100644
--- a/metadata/md5-cache/dev-python/paste-2.0.2
+++ b/metadata/md5-cache/dev-python/paste-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for using a Web Server Gateway Interface stack
 EAPI=5
 HOMEPAGE=http://pythonpaste.org http://pypi.python.org/pypi/Paste
 IUSE=doc flup openid python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/tempita-0.5.2_pre20130828[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] flup? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openid? ( dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-2.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=38a5d9d0d3cb2230616ffc7efe110a7d
+_md5_=65e87c0cd6042aedd7846b9f10cbe201
diff --git a/metadata/md5-cache/dev-python/pastescript-1.7.5-r2 b/metadata/md5-cache/dev-python/pastescript-1.7.5-r2
deleted file mode 100644
index 93928ec12dbc..000000000000
--- a/metadata/md5-cache/dev-python/pastescript-1.7.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paste-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A pluggable command-line frontend, including commands to setup package file layouts
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/script/ http://pypi.python.org/pypi/PasteScript
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paste-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/P/PasteScript/PasteScript-1.7.5.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7f3dca8f1c46fc1931788b1aa8afb9d5
diff --git a/metadata/md5-cache/dev-python/pastescript-2.0.2 b/metadata/md5-cache/dev-python/pastescript-2.0.2
index ab4e21c435bf..d99db371c50d 100644
--- a/metadata/md5-cache/dev-python/pastescript-2.0.2
+++ b/metadata/md5-cache/dev-python/pastescript-2.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=A pluggable command-line frontend, including commands to setup packa
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/script/ http://pypi.python.org/pypi/PasteScript
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/paste-1.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteScript/PasteScript-2.0.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0c06d484ba93daecf291d666dadf3dab
+_md5_=bf98009dec7dcc8910fd00f465df8f2e
diff --git a/metadata/md5-cache/dev-python/pillow-2.8.1 b/metadata/md5-cache/dev-python/pillow-2.8.1
index c51dd38bcbe1..78a4d49bea25 100644
--- a/metadata/md5-cache/dev-python/pillow-2.8.1
+++ b/metadata/md5-cache/dev-python/pillow-2.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=5
 HOMEPAGE=https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow
 IUSE=doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=HPND
 RDEPEND=jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) !dev-python/imaging python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk?] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?] ) python_targets_pypy? ( virtual/pypy:0=[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=test? ( jpeg ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-2.8.1.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=dd50f70b49fbc115002813df512ffc28
+_md5_=3b93b319125d5e87c678a5db59ed64e3
diff --git a/metadata/md5-cache/dev-python/psutil-3.0.1 b/metadata/md5-cache/dev-python/psutil-3.0.1
new file mode 100644
index 000000000000..3f3ffd990070
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-3.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=5
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-3.0.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=af982ca9bdbe20e0ab6ae797a3a58da3
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r2 b/metadata/md5-cache/dev-python/pypam-0.5.0-r2
deleted file mode 100644
index 0c89ecff431d..000000000000
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/pam-0.64 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python Bindings for PAM (Pluggable Authentication Modules)
-EAPI=5
-HOMEPAGE=http://www.pangalactic.org/PyPAM
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/pam-0.64 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=690a077067423c13c3c7f51c19160a45
diff --git a/metadata/md5-cache/dev-python/pypam-0.5.0-r3 b/metadata/md5-cache/dev-python/pypam-0.5.0-r3
index 6df58fa98fdd..f92b210c4a54 100644
--- a/metadata/md5-cache/dev-python/pypam-0.5.0-r3
+++ b/metadata/md5-cache/dev-python/pypam-0.5.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Python Bindings for PAM (Pluggable Authentication Modules)
 EAPI=5
 HOMEPAGE=http://www.pangalactic.org/PyPAM
 IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/pam-0.64 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=36a132fbc656647ec78b7a614fa7c8c9
+_md5_=30adb750f5efc76ad7c97955a5dd61cf
diff --git a/metadata/md5-cache/dev-python/sip-4.16.7 b/metadata/md5-cache/dev-python/sip-4.16.7
deleted file mode 100644
index 8af41a695ed6..000000000000
--- a/metadata/md5-cache/dev-python/sip-4.16.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python extension module generator for C and C++ libraries
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP
-IUSE=debug doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( GPL-2 GPL-3 SIP )
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0/11
-SRC_URI=mirror://sourceforge/pyqt/sip-4.16.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=848e7b7d41da358dd8be77118a17c635
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.0.5 b/metadata/md5-cache/dev-python/sqlalchemy-1.0.5
new file mode 100644
index 000000000000..4d790923beca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=5
+HOMEPAGE=http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy
+IUSE=doc examples +sqlite test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite?] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?] ) python_targets_pypy? ( virtual/pypy:0=[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=test? ( sqlite ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.0.5.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=cf3267e4f72304602b1f4d2f7a902b66
diff --git a/metadata/md5-cache/dev-qt/assistant-5.4.1 b/metadata/md5-cache/dev-qt/assistant-5.4.1
deleted file mode 100644
index 12c34cdd2515..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qthelp-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=,sqlite] >=dev-qt/qtwidgets-5.4.1:5[debug=] webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=webkit test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qthelp-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=,sqlite] >=dev-qt/qtwidgets-5.4.1:5[debug=] webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e0f01a106b2dc0331245e766783c9ee0
diff --git a/metadata/md5-cache/dev-qt/assistant-5.4.2 b/metadata/md5-cache/dev-qt/assistant-5.4.2
new file mode 100644
index 000000000000..f4a9cc525eb0
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/assistant-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qthelp-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtsql-5.4.2:5[sqlite] >=dev-qt/qtwidgets-5.4.2:5 webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=webkit test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qthelp-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtsql-5.4.2:5[sqlite] >=dev-qt/qtwidgets-5.4.2:5 webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=1dcc367e574bbc2871e8fb1ff8cc655d
diff --git a/metadata/md5-cache/dev-qt/designer-5.4.1 b/metadata/md5-cache/dev-qt/designer-5.4.1
deleted file mode 100644
index e99365de530f..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] declarative? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=declarative webkit test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] declarative? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9df5f9796038d1b507b2ba81dfba47c3
diff --git a/metadata/md5-cache/dev-qt/designer-5.4.2 b/metadata/md5-cache/dev-qt/designer-5.4.2
new file mode 100644
index 000000000000..131c497661e7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/designer-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 declarative? ( >=dev-qt/qtdeclarative-5.4.2:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=declarative webkit test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 declarative? ( >=dev-qt/qtdeclarative-5.4.2:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=a6f7eb3fbd4fbabe518f90f214e8d97a
diff --git a/metadata/md5-cache/dev-qt/linguist-5.4.1 b/metadata/md5-cache/dev-qt/linguist-5.4.1
deleted file mode 100644
index c3bdfe60d4d7..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/designer-5.4.1:5[debug=] >=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/designer-5.4.1:5[debug=] >=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtprintsupport-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=04370e49815ddb98858f371dd4c822d6
diff --git a/metadata/md5-cache/dev-qt/linguist-5.4.2 b/metadata/md5-cache/dev-qt/linguist-5.4.2
new file mode 100644
index 000000000000..363318fc9a24
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/designer-5.4.2:5 >=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Graphical tool for translating Qt applications
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/designer-5.4.2:5 >=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtprintsupport-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=f1605a3137fe5832a885271d5787cabb
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.4.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.4.1
deleted file mode 100644
index 0bc1079cc71b..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=qml test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=566407a9dbcdc6d7ee00913df4d1eefb
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.4.2 b/metadata/md5-cache/dev-qt/linguist-tools-5.4.2
new file mode 100644
index 000000000000..28f4771b6d41
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Tools for working with Qt translation data files
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=qml test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=17d4112ccd8c4819fe1bf3473a69f582
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.4.1 b/metadata/md5-cache/dev-qt/pixeltool-5.4.1
deleted file mode 100644
index 2b975a698bdb..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Qt screen magnifier
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8b82bc755b2724f0209ab027b291111d
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.4.2 b/metadata/md5-cache/dev-qt/pixeltool-5.4.2
new file mode 100644
index 000000000000..a0e30a66aa58
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Qt screen magnifier
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=5d3179e16d6f297d34b6619f56d13442
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.4.1 b/metadata/md5-cache/dev-qt/qdbus-5.4.1
deleted file mode 100644
index d7b67dc9eb75..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdbus-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdbus-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=37a02793a5e233583b4f79515a016590
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.4.2 b/metadata/md5-cache/dev-qt/qdbus-5.4.2
new file mode 100644
index 000000000000..118089fcb3d9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbus-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdbus-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Interface to Qt applications communicating over D-Bus
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdbus-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7497249cf4fc778b832dd913bf2cfb3d
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.4.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.4.1
deleted file mode 100644
index a29ae94c142c..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdbus-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdbus-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] >=dev-qt/qtxml-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d88b0ad84307fa8bbc14390aeda83ea6
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.4.2 b/metadata/md5-cache/dev-qt/qdbusviewer-5.4.2
new file mode 100644
index 000000000000..0b080be4c805
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdbus-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdbus-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=dev-qt/qtxml-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=2df785a929bd1520dfa964c9589ea81b
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.4.1 b/metadata/md5-cache/dev-qt/qdoc-5.4.1
deleted file mode 100644
index 4f0faf203701..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtxml-5.4.1[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=Qt documentation generator
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtxml-5.4.1[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ef8bc90b29ae58a416dfa3e9875ec3df
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.4.2 b/metadata/md5-cache/dev-qt/qdoc-5.4.2
new file mode 100644
index 000000000000..457b5d861a5d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtxml-5.4.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=Qt documentation generator
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtxml-5.4.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=16de57d522244eb30b7334ad9d54e65b
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.4.1_p0 b/metadata/md5-cache/dev-qt/qt-docs-5.4.2_p0
similarity index 81%
rename from metadata/md5-cache/dev-qt/qt-docs-5.4.1_p0
rename to metadata/md5-cache/dev-qt/qt-docs-5.4.2_p0
index 12bafb31eb2a..744866ce44f9 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.4.1_p0
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.4.2_p0
@@ -6,6 +6,6 @@ HOMEPAGE=https://www.qt.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=FDL-1.3
 SLOT=5
-SRC_URI=http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_54_src_doc_examples/qt.54.doc/5.4.1-0qt5_docs.7z
+SRC_URI=http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_54_src_doc_examples/qt.54.doc/5.4.2-0qt5_docs.7z
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bff3e7ee9cde92a56a7d4e4f1ebd4620
+_md5_=75fe17576d5a670e4b6db5e67ab0669e
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.4.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.4.2
similarity index 54%
rename from metadata/md5-cache/dev-qt/qtconcurrent-5.4.1
rename to metadata/md5-cache/dev-qt/qtconcurrent-5.4.2
index f1486a0cb6b0..502be0c66304 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
+DEPEND=~dev-qt/qtcore-5.4.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
 DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.4.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=29f8b3e673c1c1fecb40fb3bd449b3b7
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=085ec360067e4098d6ee184df66b1102
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.4.1 b/metadata/md5-cache/dev-qt/qtcore-5.4.1
deleted file mode 100644
index 31115790d893..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.30[pcre16] sys-libs/zlib virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=Cross-platform application development framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.30[pcre16] sys-libs/zlib virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=eb469583de55e7c7be1a25ab2b81f113
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.4.2 b/metadata/md5-cache/dev-qt/qtcore-5.4.2
new file mode 100644
index 000000000000..9f2aec1bdde1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.35[pcre16] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.35[pcre16] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=adf705535af98418708d6bea5d2d671c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.4.1 b/metadata/md5-cache/dev-qt/qtdbus-5.4.2
similarity index 55%
rename from metadata/md5-cache/dev-qt/qtdbus-5.4.1
rename to metadata/md5-cache/dev-qt/qtdbus-5.4.2
index 1b790ca48d92..f423c38ce041 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] >=sys-apps/dbus-1.4.20 sys-libs/zlib test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
+DEPEND=~dev-qt/qtcore-5.4.2 >=sys-apps/dbus-1.4.20 >=sys-libs/zlib-1.2.5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
 DESCRIPTION=The D-Bus module for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] >=sys-apps/dbus-1.4.20 sys-libs/zlib dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.4.2 >=sys-apps/dbus-1.4.20 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=329b05937c22835e7049c83fb67f78e1
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=9cb6c3a724e08b6075ba8887f5fb67e1
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.4.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.4.1
deleted file mode 100644
index 5aa1ca5f16f0..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,gles2=,opengl] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qttest-5.4.1:5[debug=] localstorage? ( >=dev-qt/qtsql-5.4.1:5[debug=] ) widgets? ( >=dev-qt/qtwidgets-5.4.1:5[debug=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 localstorage +widgets xml test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,gles2=,opengl] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qttest-5.4.1:5[debug=] localstorage? ( >=dev-qt/qtsql-5.4.1:5[debug=] ) widgets? ( >=dev-qt/qtwidgets-5.4.1:5[debug=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ae0114c8898283e8b95187d96e07f43a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.4.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.4.2
new file mode 100644
index 000000000000..0df45b91c70b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5[gles2=] >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qttest-5.4.2:5 localstorage? ( >=dev-qt/qtsql-5.4.2:5 ) widgets? ( >=dev-qt/qtwidgets-5.4.2:5[gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 localstorage +widgets xml test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5[gles2=] >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qttest-5.4.2:5 localstorage? ( >=dev-qt/qtsql-5.4.2:5 ) widgets? ( >=dev-qt/qtwidgets-5.4.2:5[gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=3de05690cbfba7a443d0744bef5d29b4
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.4.1 b/metadata/md5-cache/dev-qt/qtdiag-5.4.1
deleted file mode 100644
index b14207d620ef..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,opengl=] >=dev-qt/qtnetwork-5.4.1:5[debug=,ssl=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=+opengl +ssl test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,opengl=] >=dev-qt/qtnetwork-5.4.1:5[debug=,ssl=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=80b6f0f380c4b06ba3a15997c0ea5077
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.4.2 b/metadata/md5-cache/dev-qt/qtdiag-5.4.2
new file mode 100644
index 000000000000..2b52f019a743
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5[ssl=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=+ssl test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5[ssl=] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=39ac1cf827981b204a68416e21afd9f8
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.1
deleted file mode 100644
index 6e64650a06ae..000000000000
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] test? ( >=dev-qt/qtgui-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9e839054b10c6f443601455bd17a53b8
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.2 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.2
new file mode 100644
index 000000000000..02bdfb8c3b9e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdeclarative-5.4.2:5 >=dev-qt/qtxmlpatterns-5.4.2:5 test? ( >=dev-qt/qtgui-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Set of QML types for adding visual effects to user interfaces
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdeclarative-5.4.2:5 >=dev-qt/qtxmlpatterns-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=017bd10455055c61c72f6378b0300156
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.4.1-r2 b/metadata/md5-cache/dev-qt/qtgui-5.4.1-r2
deleted file mode 100644
index 7c62d7f7ce14..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.4.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.4.1[debug=] media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) ibus? ( ~dev-qt/qtdbus-5.4.1[debug=] ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] virtual/libudev:= x11-libs/libdrm ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm accessibility? ( ~dev-qt/qtdbus-5.4.1[debug=] ) ) evdev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qtnetwork-5.4.1[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.4.1[debug=] media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) ibus? ( ~dev-qt/qtdbus-5.4.1[debug=] ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] virtual/libudev:= x11-libs/libdrm ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm accessibility? ( ~dev-qt/qtdbus-5.4.1[debug=] ) ) dev-qt/qtchooser
-REQUIRED_USE=egl? ( evdev opengl ) eglfs? ( egl ) gles2? ( opengl ) kms? ( egl gles2 )
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48261af29cb1371773246a6c195163e2
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.4.2 b/metadata/md5-cache/dev-qt/qtgui-5.4.2
new file mode 100644
index 000000000000..0ff9d0d84d36
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.4.2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.4.2 media-libs/fontconfig media-libs/freetype:2 >=sys-libs/zlib-1.2.5 virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) ibus? ( ~dev-qt/qtdbus-5.4.2 ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] virtual/libudev:= x11-libs/libdrm ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm accessibility? ( ~dev-qt/qtdbus-5.4.2 ) ) evdev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qtnetwork-5.4.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.4.2 media-libs/fontconfig media-libs/freetype:2 >=sys-libs/zlib-1.2.5 virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( x11-libs/gtk+:2 x11-libs/pango !!x11-libs/cairo[qt4] ) gles2? ( media-libs/mesa[gles2] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= ) ibus? ( ~dev-qt/qtdbus-5.4.2 ) jpeg? ( virtual/jpeg:0 ) kms? ( media-libs/mesa[gbm] virtual/libudev:= x11-libs/libdrm ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.5 >=x11-libs/libXi-1.6 x11-libs/libXrender >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm accessibility? ( ~dev-qt/qtdbus-5.4.2 ) ) dev-qt/qtchooser
+REQUIRED_USE=egl? ( evdev ) eglfs? ( egl ) kms? ( egl gles2 )
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=06516c92029d20bf9e0a6995154f1ac3
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.4.1 b/metadata/md5-cache/dev-qt/qthelp-5.4.1
deleted file mode 100644
index 45e610f5f452..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=,sqlite] >=dev-qt/qtwidgets-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=The Help module for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=,sqlite] >=dev-qt/qtwidgets-5.4.1:5[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=18fcbd90329a6f40e464084c318ef8d8
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.4.2 b/metadata/md5-cache/dev-qt/qthelp-5.4.2
new file mode 100644
index 000000000000..9ae555334065
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qthelp-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtsql-5.4.2:5[sqlite] >=dev-qt/qtwidgets-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=The Help module for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtsql-5.4.2:5[sqlite] >=dev-qt/qtwidgets-5.4.2:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c0690aac65c27f2d6c71f651d702dfd4
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.4.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.4.1
deleted file mode 100644
index 2d1c413d76a0..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=dfb8c4bf2afa22670be7d33a77199389
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.4.2 b/metadata/md5-cache/dev-qt/qtimageformats-5.4.2
new file mode 100644
index 000000000000..8ec7d7d6e33b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 media-libs/jasper media-libs/libmng:= media-libs/libwebp:= media-libs/tiff:0 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=482982835f768aab0bab6680c8007b41
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.4.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.4.1
deleted file mode 100644
index 56225a63ad6e..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] alsa? ( media-libs/alsa-lib ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] openal? ( media-libs/openal ) ) widgets? ( >=dev-qt/qtgui-5.4.1:5[debug=,opengl=] >=dev-qt/qtwidgets-5.4.1:5[debug=,opengl=] opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) ) x11-proto/videoproto test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=The Multimedia module for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa +gstreamer openal +opengl pulseaudio qml widgets test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] alsa? ( media-libs/alsa-lib ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] openal? ( media-libs/openal ) ) widgets? ( >=dev-qt/qtgui-5.4.1:5[debug=,opengl=] >=dev-qt/qtwidgets-5.4.1:5[debug=,opengl=] opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ece8b70bc15e9aad4e96a0af914e724e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.4.2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.4.2
new file mode 100644
index 000000000000..2f8aadfef2c4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 openal? ( media-libs/openal ) ) widgets? ( >=dev-qt/qtwidgets-5.4.2:5 opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) ) x11-proto/videoproto test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=The Multimedia module for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa +gstreamer openal +opengl pulseaudio qml widgets test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 openal? ( media-libs/openal ) ) widgets? ( >=dev-qt/qtwidgets-5.4.2:5 opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=f6ce4f8f1abb0f650de45a5282d7a413
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.4.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.4.1
deleted file mode 100644
index 0b844877d318..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] sys-libs/zlib connman? ( ~dev-qt/qtdbus-5.4.1[debug=] ) networkmanager? ( ~dev-qt/qtdbus-5.4.1[debug=] ) ssl? ( dev-libs/openssl:0[bindist=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman networkmanager +ssl test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] sys-libs/zlib connman? ( ~dev-qt/qtdbus-5.4.1[debug=] ) networkmanager? ( ~dev-qt/qtdbus-5.4.1[debug=] ) ssl? ( dev-libs/openssl:0[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=37df7293f2de70b0576bd2e5d27fd579
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.4.2 b/metadata/md5-cache/dev-qt/qtnetwork-5.4.2
new file mode 100644
index 000000000000..08cda2765c79
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.4.2 ) networkmanager? ( ~dev-qt/qtdbus-5.4.2 ) ssl? ( dev-libs/openssl:0[bindist=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=bindist connman networkmanager +ssl test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.4.2 ) networkmanager? ( ~dev-qt/qtdbus-5.4.2 ) ssl? ( dev-libs/openssl:0[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=e4b121b34b429d534bb5e9f85653e18d
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.4.1 b/metadata/md5-cache/dev-qt/qtopengl-5.4.1
deleted file mode 100644
index 7fa8e683c8b7..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,gles2=,opengl] ~dev-qt/qtwidgets-5.4.1[debug=,gles2=,opengl] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,gles2=,opengl] ~dev-qt/qtwidgets-5.4.1[debug=,gles2=,opengl] virtual/opengl dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9be9462b4bc78608b3bfd81a3ba82f7c
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.4.2 b/metadata/md5-cache/dev-qt/qtopengl-5.4.2
new file mode 100644
index 000000000000..0fa5d35e4805
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=] ~dev-qt/qtwidgets-5.4.2[gles2=] virtual/opengl test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=] ~dev-qt/qtwidgets-5.4.2[gles2=] virtual/opengl dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=e09b269475cf0fda8c2610c9276f9bcc
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.4.1 b/metadata/md5-cache/dev-qt/qtpaths-5.4.2
similarity index 52%
rename from metadata/md5-cache/dev-qt/qtpaths-5.4.1
rename to metadata/md5-cache/dev-qt/qtpaths-5.4.2
index e51e67f1ab8a..3c3b719cb9e0 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
+DEPEND=>=dev-qt/qtcore-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
 DESCRIPTION=Tool to query Qt path information
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] dev-qt/qtchooser
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=98907249ee6547e6977f9976be1110f2
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=aae01e59d7d4ef412084c42693f40f44
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.4.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.4.1
deleted file mode 100644
index a41f8251f5eb..000000000000
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue qml test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aaad18280212af3e433c789daae1b027
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.4.2 b/metadata/md5-cache/dev-qt/qtpositioning-5.4.2
new file mode 100644
index 000000000000..13444666c544
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Physical position determination library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=geoclue qml test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 geoclue? ( app-misc/geoclue:0 dev-libs/glib:2 ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=60101e871be735fc0893611c7dbfceff
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.4.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.4.1
deleted file mode 100644
index 77c90b091400..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,opengl=] ~dev-qt/qtwidgets-5.4.1[debug=,opengl=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.4.1[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=cups +opengl test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,opengl=] ~dev-qt/qtwidgets-5.4.1[debug=,opengl=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=df9964b777be9153b054fccee0e9b8bd
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.4.2 b/metadata/md5-cache/dev-qt/qtprintsupport-5.4.2
new file mode 100644
index 000000000000..a3e047f408e5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=] ~dev-qt/qtwidgets-5.4.2[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.4.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=] ~dev-qt/qtwidgets-5.4.2[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=1bf059e113e170961d56b4cefce9d2b0
diff --git a/metadata/md5-cache/dev-qt/qtquick1-5.4.1-r1 b/metadata/md5-cache/dev-qt/qtquick1-5.4.1-r1
deleted file mode 100644
index 847a23ccc888..000000000000
--- a/metadata/md5-cache/dev-qt/qtquick1-5.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtscript-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] designer? ( ~dev-qt/designer-5.4.1[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Legacy declarative framework for Qt4 compatibility for building dynamic user interfaces
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=designer +opengl webkit xml test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtscript-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] designer? ( ~dev-qt/designer-5.4.1[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) webkit? ( >=dev-qt/qtwebkit-5.4.1:5[debug=] ) xml? ( >=dev-qt/qtxmlpatterns-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4c51776e2e0f4dc26f8d7f7b6295f559
diff --git a/metadata/md5-cache/dev-qt/qtquick1-5.4.2 b/metadata/md5-cache/dev-qt/qtquick1-5.4.2
new file mode 100644
index 000000000000..e40e59631171
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquick1-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtscript-5.4.2:5 >=dev-qt/qtsql-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 designer? ( ~dev-qt/designer-5.4.2 >=dev-qt/qtdeclarative-5.4.2:5 ) opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) xml? ( >=dev-qt/qtxmlpatterns-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Legacy declarative UI module for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=designer +opengl webkit xml test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtscript-5.4.2:5 >=dev-qt/qtsql-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 designer? ( ~dev-qt/designer-5.4.2 >=dev-qt/qtdeclarative-5.4.2:5 ) opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) webkit? ( >=dev-qt/qtwebkit-5.4.2:5 ) xml? ( >=dev-qt/qtxmlpatterns-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=34994e54015fe044173d841fd0bbe6cf
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.1
deleted file mode 100644
index 69b116fa9981..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] widgets? ( >=dev-qt/qtwidgets-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=widgets test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtdeclarative-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] widgets? ( >=dev-qt/qtwidgets-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=aa5df6baa35590bde7f92d617720fec0
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.2 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.2
new file mode 100644
index 000000000000..4d724836929b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdeclarative-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 widgets? ( >=dev-qt/qtwidgets-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete interfaces
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=widgets test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtdeclarative-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 widgets? ( >=dev-qt/qtwidgets-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=cae2165bcd60dcd29ce0eb737c5cee35
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.4.1 b/metadata/md5-cache/dev-qt/qtscript-5.4.1
deleted file mode 100644
index 51506a9c6771..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] scripttools? ( >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Application scripting library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=scripttools test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] scripttools? ( >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9ded13d1b90586e33857b7f8d3c92d3a
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.4.2 b/metadata/md5-cache/dev-qt/qtscript-5.4.2
new file mode 100644
index 000000000000..cba4e2cea2f7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscript-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 scripttools? ( >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Application scripting library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=scripttools test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 scripttools? ( >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=fe78528eb4e9cbbebbe969b02ff86df8
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.4.1 b/metadata/md5-cache/dev-qt/qtsensors-5.4.1
deleted file mode 100644
index 959212198884..000000000000
--- a/metadata/md5-cache/dev-qt/qtsensors-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=qml test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=80870f8fb45171c90a4496097f698b9d
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.4.2 b/metadata/md5-cache/dev-qt/qtsensors-5.4.2
new file mode 100644
index 000000000000..99bbe82b66d2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Hardware sensor access library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=qml test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=3ed27efb93b5bfd6810ce8f16221de94
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.4.1 b/metadata/md5-cache/dev-qt/qtserialport-5.4.2
similarity index 51%
rename from metadata/md5-cache/dev-qt/qtserialport-5.4.1
rename to metadata/md5-cache/dev-qt/qtserialport-5.4.2
index b4d351d597c4..295d24164656 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] virtual/udev test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
+DEPEND=>=dev-qt/qtcore-5.4.2:5 virtual/udev test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
 DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] virtual/udev dev-qt/qtchooser
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 virtual/udev dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b72f6f2579ebdb9de3441c6a3102287c
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=6bc7818f447ad69d3199a7694ab98600
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.4.1 b/metadata/md5-cache/dev-qt/qtsql-5.4.1
deleted file mode 100644
index d56f00ffcc19..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] freetds? ( dev-db/freetds ) mysql? ( virtual/mysql:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=SQL abstraction library for the Qt5 tooolkit
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] freetds? ( dev-db/freetds ) mysql? ( virtual/mysql:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2b19687f1954857115f092e585a2a59d
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.4.2 b/metadata/md5-cache/dev-qt/qtsql-5.4.2
new file mode 100644
index 000000000000..61c9e6520481
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=SQL abstraction library for the Qt5 tooolkit
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 freetds? ( dev-db/freetds ) mysql? ( virtual/mysql:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=754903c05f320b16d6d348318c943772
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.4.1 b/metadata/md5-cache/dev-qt/qtsvg-5.4.1
deleted file mode 100644
index 2dcedb32f454..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] sys-libs/zlib test? ( >=dev-qt/qtxml-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4392dc69096da5323f2e6f34aafa08c6
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.4.2 b/metadata/md5-cache/dev-qt/qtsvg-5.4.2
new file mode 100644
index 000000000000..f021f855ab5a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=sys-libs/zlib-1.2.5 test? ( >=dev-qt/qtxml-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=dddaf8f1ebad43c64ff8b38b60640b57
diff --git a/metadata/md5-cache/dev-qt/qttest-5.4.1 b/metadata/md5-cache/dev-qt/qttest-5.4.2
similarity index 52%
rename from metadata/md5-cache/dev-qt/qttest-5.4.1
rename to metadata/md5-cache/dev-qt/qttest-5.4.2
index 09ae866531cc..2f729608807e 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.4.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] test? ( ~dev-qt/qtgui-5.4.1[debug=] ~dev-qt/qtxml-5.4.1[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEPEND=~dev-qt/qtcore-5.4.2 test? ( ~dev-qt/qtgui-5.4.2 ~dev-qt/qtxml-5.4.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
 DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.4.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1429b50435c4e82edf469b56b2ff1e5f
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=463a065894b4606d3115a60904d4b9ce
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.4.1 b/metadata/md5-cache/dev-qt/qttranslations-5.4.2
similarity index 62%
rename from metadata/md5-cache/dev-qt/qttranslations-5.4.1
rename to metadata/md5-cache/dev-qt/qttranslations-5.4.2
index 1ba86dfe2acc..4034b9b8dd66 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.4.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/linguist-tools-5.4.1:5 >=dev-qt/qtcore-5.4.1:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
+DEPEND=>=dev-qt/linguist-tools-5.4.2:5 >=dev-qt/qtcore-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
 DESCRIPTION=Translation files for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
@@ -9,6 +9,6 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=16359762c64a13f372bf48ed595320b6
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=fd71878c7ac194676def45145949f874
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.4.1 b/metadata/md5-cache/dev-qt/qtwayland-5.4.1
deleted file mode 100644
index 3f59bd8a22d0..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-libs/wayland-1.3.0 >=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,egl=,opengl] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=egl qml wayland-compositor xcomposite test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.3.0 >=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtgui-5.4.1:5[debug=,egl=,opengl] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=21d60309f9f50ad634e1b04adc20838e
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.4.2 b/metadata/md5-cache/dev-qt/qtwayland-5.4.2
new file mode 100644
index 000000000000..830f22a8ff34
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.3.0 >=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=egl qml wayland-compositor xcomposite test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.3.0 >=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtgui-5.4.2:5[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=0c57777d031440575dadeff42e0f7f76
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.4.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.4.1
deleted file mode 100644
index 55a006ccb591..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.4.1:5[debug=,icu] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] media-libs/fontconfig:1.0 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( >=dev-qt/qtmultimedia-5.4.1:5[debug=,widgets] ) opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) printsupport? ( >=dev-qt/qtprintsupport-5.4.1:5[debug=] ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/rubygems test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=WebKit rendering library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=gstreamer gstreamer010 multimedia opengl printsupport qml udev webp test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.4.1:5[debug=,icu] >=dev-qt/qtgui-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] >=dev-qt/qtsql-5.4.1:5[debug=] >=dev-qt/qtwidgets-5.4.1:5[debug=] media-libs/fontconfig:1.0 media-libs/libpng:0= sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( >=dev-qt/qtmultimedia-5.4.1:5[debug=,widgets] ) opengl? ( >=dev-qt/qtopengl-5.4.1:5[debug=] ) printsupport? ( >=dev-qt/qtprintsupport-5.4.1:5[debug=] ) qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
-REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
-RESTRICT=mirror test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d311e5e7b7f38d6f3ff8691bd3ba8d24
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.4.2 b/metadata/md5-cache/dev-qt/qtwebkit-5.4.2
new file mode 100644
index 000000000000..8eda3aed0121
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.4.2:5[icu] >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtsql-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( >=dev-qt/qtmultimedia-5.4.2:5[widgets] ) opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.4.2:5 ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/ruby dev-util/gperf sys-devel/bison sys-devel/flex virtual/rubygems test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=WebKit rendering library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=gstreamer gstreamer010 multimedia opengl printsupport qml udev webp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=dev-db/sqlite:3 dev-libs/icu:= >=dev-libs/leveldb-1.18-r1 dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.4.2:5[icu] >=dev-qt/qtgui-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 >=dev-qt/qtsql-5.4.2:5 >=dev-qt/qtwidgets-5.4.2:5 media-libs/fontconfig:1.0 media-libs/libpng:0= >=sys-libs/zlib-1.2.5 virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gstreamer010? ( dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) multimedia? ( >=dev-qt/qtmultimedia-5.4.2:5[widgets] ) opengl? ( >=dev-qt/qtopengl-5.4.2:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.4.2:5 ) qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) udev? ( virtual/udev ) webp? ( media-libs/libwebp:0= ) dev-qt/qtchooser
+REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
+RESTRICT=mirror test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=b8a5d01cabccb75a56748c3b5fc97ee7
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.4.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.4.1
deleted file mode 100644
index a073b506ac54..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=qml test debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] qml? ( >=dev-qt/qtdeclarative-5.4.1:5[debug=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8d5634b3c59e5c953517ea134b783f6e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.4.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.4.2
new file mode 100644
index 000000000000..d7a50193b633
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=qml test debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 qml? ( >=dev-qt/qtdeclarative-5.4.2:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=1e116cfa726bc63179b7299a96642dfe
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.4.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.4.1
deleted file mode 100644
index 85b27ad759d0..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
-DESCRIPTION=Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2 gtkstyle +opengl +png +xcb test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] dev-qt/qtchooser
-REQUIRED_USE=gles2? ( opengl )
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7e44227db1558663a91cbd1279762560
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.4.2 b/metadata/md5-cache/dev-qt/qtwidgets-5.4.2
new file mode 100644
index 000000000000..1834adf6391d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=,gtkstyle=,png=,xcb?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
+DESCRIPTION=Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 gtkstyle +png +xcb test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[gles2=,gtkstyle=,png=,xcb?] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=972d17b259025f2233df321494c246cb
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.4.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.4.1
deleted file mode 100644
index 5e29d6114dc5..000000000000
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,xcb] ~dev-qt/qtwidgets-5.4.1[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=5
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] ~dev-qt/qtgui-5.4.1[debug=,xcb] ~dev-qt/qtwidgets-5.4.1[debug=] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f97f34b44995a186d4fd919b81b35b6d
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.4.2 b/metadata/md5-cache/dev-qt/qtx11extras-5.4.2
new file mode 100644
index 000000000000..55ff5c4ce25c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[xcb] ~dev-qt/qtwidgets-5.4.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
+DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
+EAPI=5
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.4.2 ~dev-qt/qtgui-5.4.2[xcb] ~dev-qt/qtwidgets-5.4.2 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=b61f4335a66f2428d1647559d52c535a
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.4.1 b/metadata/md5-cache/dev-qt/qtxml-5.4.2
similarity index 51%
rename from metadata/md5-cache/dev-qt/qtxml-5.4.1
rename to metadata/md5-cache/dev-qt/qtxml-5.4.2
index e5e1ee9a3beb..e74b4e980f7d 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.4.1[debug=] test? ( ~dev-qt/qtnetwork-5.4.1[debug=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.1[debug=] )
+DEPEND=~dev-qt/qtcore-5.4.2 test? ( ~dev-qt/qtnetwork-5.4.2 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.4.2 )
 DESCRIPTION=SAX and DOM implementation library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.4.1[debug=] dev-qt/qtchooser
+RDEPEND=~dev-qt/qtcore-5.4.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3d1ea2d44a23a119d89358ee08274a29
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=8cd8fbe8af722f8ad146e90773aa9b09
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.2
similarity index 50%
rename from metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.1
rename to metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.2
index 3c0e4b9a97ca..f73f3e23b6d1 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.1:5[debug=] )
+DEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig test? ( >=dev-qt/qttest-5.4.2:5 )
 DESCRIPTION=XPath, XQuery, and XSLT support library for the Qt5 framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-qt/qtcore-5.4.1:5[debug=] >=dev-qt/qtnetwork-5.4.1:5[debug=] dev-qt/qtchooser
+RDEPEND=>=dev-qt/qtcore-5.4.2:5 >=dev-qt/qtnetwork-5.4.2:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5
-SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	354053764b9480987644f08e61c70af7	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=89529886ede4bf76eeba49ee8deb08c2
+SRC_URI=http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	qt5-build	1893b8df0d25f7a9940321320c798191	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=3ba53b01148f8c75ccbc57e446dd3092
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.7.13 b/metadata/md5-cache/dev-ruby/bundler-1.7.13
index cdfdd11ade66..c6c8608c6c09 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.7.13
+++ b/metadata/md5-cache/dev-ruby/bundler-1.7.13
@@ -4,7 +4,7 @@ DESCRIPTION=An easy way to vendor gem dependencies
 EAPI=5
 HOMEPAGE=http://github.com/carlhuda/bundler
 IUSE=test 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
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.7.13.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5ed86c5054bfebc60b892e6d77553112
+_md5_=09c980c870a0059db00407e81fe07371
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.6 b/metadata/md5-cache/dev-ruby/rack-1.4.6
index 8a4ee11be800..368407f30ce5 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.6
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/rack-1.4.6.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cbd8aba6d93099b3bcb4a005add33ef4
+_md5_=c9f13f4f0f108a8ca74230487e8eab1a
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.4 b/metadata/md5-cache/dev-ruby/rack-1.5.4
index ed660667728e..09bff1bc05bd 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) !<dev-ruby/rack-1.4.5-r1:1.4 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.4.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d62a0c0d01302663fc25c8a7fc3ebfd2
+_md5_=5740d78af98b78a0d25b2e62eaab4f43
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.3 b/metadata/md5-cache/dev-ruby/rjb-1.5.3
index 1ba63b781523..5490402611c0 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.2.0 ruby_targets_ruby19? ( dev-lang
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=86d25bc01d3f12b501998ef60fe31790
diff --git a/metadata/md5-cache/dev-ruby/weakling-0.0.4 b/metadata/md5-cache/dev-ruby/weakling-0.0.4
index 4cf281935b02..6db5238f5d62 100644
--- a/metadata/md5-cache/dev-ruby/weakling-0.0.4
+++ b/metadata/md5-cache/dev-ruby/weakling-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bytelist dev-java/jruby >=virtual/jre-1.5 >=dev-java/java-confi
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/weakling-0.0.4-java.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4c8f51b00bec38c22925f6a4f37034e
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2 b/metadata/md5-cache/dev-scheme/jscheme-7.2
index 897807a4676e..aca752738459 100644
--- a/metadata/md5-cache/dev-scheme/jscheme-7.2
+++ b/metadata/md5-cache/dev-scheme/jscheme-7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jscheme/jscheme-7.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bbe91981d3e8f2b2bd98320de3691621
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.10 b/metadata/md5-cache/dev-scheme/kawa-1.10
index 0f63fc1e8299..24a30fec91e2 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.10
+++ b/metadata/md5-cache/dev-scheme/kawa-1.10
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
 RDEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.10.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_2.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e864b3494e776b29e210d28f5004e670
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14 b/metadata/md5-cache/dev-scheme/kawa-1.14
index 4b84b87fc171..86dad8b46ebd 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.14
+++ b/metadata/md5-cache/dev-scheme/kawa-1.14
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
 RDEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=086eea3d3ad0c123476601a59bd7882f
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.9.1 b/metadata/md5-cache/dev-scheme/kawa-1.9.1
index 8e21176bc747..d83220b48a17 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.9.1
+++ b/metadata/md5-cache/dev-scheme/kawa-1.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c0029bab0d6c3bcbd1a81bc66d48f42
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1 b/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
index 7aba26a85043..bd3cb7466c2b 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
+++ b/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
 RDEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.9.90.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_2.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=93db3669b400d66f0badfef77bba5882
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l
index d1c021c6638c..ad27ab48bed8 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-java/pdfbox dev-java/fontbox virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.5 !<=dev-texlive/texlive-latexextra-2010 virtual/latex-base >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	latex-package	d023314500e725be8c78a868e4771dbb	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	latex-package	d023314500e725be8c78a868e4771dbb	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=785ced69919c6ec01b790d795593be62
diff --git a/metadata/md5-cache/dev-util/android-studio-1.2.2.0.141.1980579 b/metadata/md5-cache/dev-util/android-studio-1.2.2.0.141.1980579
new file mode 100644
index 000000000000..2108008e08e0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-1.2.2.0.141.1980579
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/zip
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=media-libs/mesa-10.2.8[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dl.google.com/dl/android/studio/ide-zips/1.2.2.0/android-studio-ide-141.1980579-linux.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=97b1fe232b67158a1244a70aa3e8fa40
diff --git a/metadata/md5-cache/dev-util/antlrworks-1.2.3 b/metadata/md5-cache/dev-util/antlrworks-1.2.3
index d4702755c60d..e1c8cda9832b 100644
--- a/metadata/md5-cache/dev-util/antlrworks-1.2.3
+++ b/metadata/md5-cache/dev-util/antlrworks-1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/stringtemplate:0 dev-java/antlr:0 >=dev-java/antlr-3.1.3:3 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.antlr.org/download/antlrworks-1.2.3-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acc32c119285c0636f7e01c027330399
diff --git a/metadata/md5-cache/dev-util/argouml-0.34 b/metadata/md5-cache/dev-util/argouml-0.34
index 15b53f18449c..ce8b5b18c306 100644
--- a/metadata/md5-cache/dev-util/argouml-0.34
+++ b/metadata/md5-cache/dev-util/argouml-0.34
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.34/ArgoUML-0.34.tar.gz http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip doc? ( http://argouml-downloads.tigris.org/nonav/argouml-0.34/manual-0.34.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.34/quickguide-0.34.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffac973de0a65466a64031fb37ddfbed
diff --git a/metadata/md5-cache/dev-util/bluej-3.1.1 b/metadata/md5-cache/dev-util/bluej-3.1.1
index f883cdefd29b..db3af047c3ea 100644
--- a/metadata/md5-cache/dev-util/bluej-3.1.1
+++ b/metadata/md5-cache/dev-util/bluej-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bluej.org/download/files/source/BlueJ-source-311.zip doc? ( http://bluej.org/download/files/bluej-ref-manual.pdf http://bluej.org/tutorial/tutorial-201.pdf -> bluej-tutorial-2.0.1.pdf http://bluej.org/tutorial/testing-tutorial.pdf -> bluej-testing-tutorial.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8dd7dc98dd869d05eee7a2ff8f0723c1
diff --git a/metadata/md5-cache/dev-util/checkstyle-4.4 b/metadata/md5-cache/dev-util/checkstyle-4.4
index d6b39772ce9f..98b0f732b361 100644
--- a/metadata/md5-cache/dev-util/checkstyle-4.4
+++ b/metadata/md5-cache/dev-util/checkstyle-4.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/commons-collections:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-src-4.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f7ac79b066aef372a5c9744c9ab590b
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.4 b/metadata/md5-cache/dev-util/checkstyle-5.4
index 2667befb4bd8..150a7f8ccfad 100644
--- a/metadata/md5-cache/dev-util/checkstyle-5.4
+++ b/metadata/md5-cache/dev-util/checkstyle-5.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-5.4-src.tar.gz http://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9a589370bab6c082804e65418800cdb
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.5 b/metadata/md5-cache/dev-util/checkstyle-5.5
index fd8713410664..473adf649f58 100644
--- a/metadata/md5-cache/dev-util/checkstyle-5.5
+++ b/metadata/md5-cache/dev-util/checkstyle-5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7:0[java] dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-5.5-src.tar.gz http://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f7ee12ec9255f8b28530944b4555c26e
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1 b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
index b8b946ba16b8..5aad49cb00cc 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=CUnit - C Unit Test Framework
 EAPI=5
 HOMEPAGE=http://cunit.sourceforge.net
 IUSE=ncurses 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 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-2-src.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=20a2a594893224aa708a92e8dbb1bfaa
+_md5_=b9991433c64e84ceaf2201c04e6806bd
diff --git a/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1 b/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
index e0ba8cd7edbe..09fad5a5e5e7 100644
--- a/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
+++ b/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/picocontainer:1 dev-java/javolution:4 >=dev-j
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://d1.almworks.com/.files/deskzilla-1_7_1_without_jre.tar.gz http://dev.gentoo.org/~ercpe/distfiles/dev-util/deskzilla/deskzilla_gentoo.license
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbd8712e9f694a978e8770256ef89631
diff --git a/metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1 b/metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1
index b7a5c0405592..703b619f6bdf 100644
--- a/metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1
+++ b/metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=dev-java/swt-3.5.1:3.5 >=dev-java/ant-1.7.1 >=dev-java/ant-core-1.7.1 >=dev-java/asm-3.1:3 >=dev-java/commons-codec-1.3 >=dev-java/commons-el-1.0 >=dev-java/commons-httpclient-3.1:3 >=dev-java/commons-logging-1.0.4 >=dev-java/hamcrest-core-1.1 >=dev-java/icu4j-4.0.1:4 >=dev-java/jsch-0.1.41 >=dev-java/junit-3.8.2:0 >=dev-java/junit-4.5:4 >=dev-java/lucene-1.9.1:1.9 >=dev-java/lucene-analyzers-1.9.1:1.9 >=dev-java/sat4j-core-2.1:2 >=dev-java/sat4j-pseudo-2.1:2 dev-java/tomcat-servlet-api:2.5 x86? ( gnome? ( gnome-base/gconf ) ) dev-java/ant-nodeps >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-R3_5_1-fetched-src.tar.bz2 http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-R0_4_0.tar.gz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e4adbc3cef415638dbdb7bc4841b6bf
diff --git a/metadata/md5-cache/dev-util/findbugs-3.0.1 b/metadata/md5-cache/dev-util/findbugs-3.0.1
index eea759c56da2..56cb112fc10a 100644
--- a/metadata/md5-cache/dev-util/findbugs-3.0.1
+++ b/metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 dev-java/asm:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f676f6af09ead451896d5a28971319bf
diff --git a/metadata/md5-cache/dev-util/fujaba-4.2.0 b/metadata/md5-cache/dev-util/fujaba-4.2.0
index 12ce204a64eb..d4c90f2e86e5 100644
--- a/metadata/md5-cache/dev-util/fujaba-4.2.0
+++ b/metadata/md5-cache/dev-util/fujaba-4.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* dev-java/log4j ~dev-java/jdom-1.0_beta10 dev-java/xerces:1.3 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=ftp://ftp.uni-paderborn.de/private/fujaba/Fujaba_4/FujabaToolSuite_Developer4_2_0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed87de9e200ba7eda1871e01b74de581
diff --git a/metadata/md5-cache/dev-util/jarwizard-2.50 b/metadata/md5-cache/dev-util/jarwizard-2.50
index 742c1e208742..c8afa69cd871 100644
--- a/metadata/md5-cache/dev-util/jarwizard-2.50
+++ b/metadata/md5-cache/dev-util/jarwizard-2.50
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jarwizard/jarwizard_250_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1f6c0ade0077a4a7ef519558f8309dd
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r2 b/metadata/md5-cache/dev-util/jconfig-2.8-r2
index aa2a143979f8..68dfd1cfd0f2 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r2
+++ b/metadata/md5-cache/dev-util/jconfig-2.8-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cfad2ec28a30e5b9d4eb2c74b5f20e0e
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
index 8ea7e32a0808..198a1c208253 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r3
+++ b/metadata/md5-cache/dev-util/jconfig-2.8-r3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c3f72262dfdd7ab956d9291b496cd6f
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8.5 b/metadata/md5-cache/dev-util/jconfig-2.8.5
index 85728371ab51..8ebaf126b315 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8.5
+++ b/metadata/md5-cache/dev-util/jconfig-2.8.5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cdcea7867f94253d5747556476fd033
diff --git a/metadata/md5-cache/dev-util/jconfig-2.9 b/metadata/md5-cache/dev-util/jconfig-2.9
index 5be4e0b39213..90bfb6192a6e 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.9
+++ b/metadata/md5-cache/dev-util/jconfig-2.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6855f56442e51bc57b6806bf179cfdd4
diff --git a/metadata/md5-cache/dev-util/jif-3.1_rc1 b/metadata/md5-cache/dev-util/jif-3.1_rc1
index 776b4822cbd2..ba1d7baf780f 100644
--- a/metadata/md5-cache/dev-util/jif-3.1_rc1
+++ b/metadata/md5-cache/dev-util/jif-3.1_rc1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-lang/inform-6.21.4 >=games-engines/gargoyle-2010.1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.slade.altervista.org/downloads/JIF31_src_RC1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f0f0f37a09f873f14d22bd09cd10d8f
diff --git a/metadata/md5-cache/dev-util/netbeans-8.0.2 b/metadata/md5-cache/dev-util/netbeans-8.0.2
index b9e0fe788e38..2e024a424434 100644
--- a/metadata/md5-cache/dev-util/netbeans-8.0.2
+++ b/metadata/md5-cache/dev-util/netbeans-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-nb-8.0.2 ~dev-java/netbeans-platform-8.0.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-8.0.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-8.0.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-8.0.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-8.0.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-8.0.2 ) netbeans_modules_extide? ( ~dev-java/netbeans-extide-8.0.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-8.0.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-8.0.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-8.0.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-8.0.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-8.0.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-8.0.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-8.0.2 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-8.0.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-8.0.2 ) doc? ( ~dev-java/netbeans-javadoc-8.0.2 ) >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=linguas_af? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ar? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_bg? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ca? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_cs? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_de? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_el? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_es? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_fr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_gl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_hi_IN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_id? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_it? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ja? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ko? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_lt? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_nl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pt_BR? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pt_PT? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ro? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ru? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_si? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sq? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sv? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ta_IN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_tl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_tr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_vi? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_zh_CN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_zh_TW? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b63b936178d6dcae9e82261ed4643db4
diff --git a/metadata/md5-cache/dev-util/pmd-4.2.5 b/metadata/md5-cache/dev-util/pmd-4.2.5
index b4a11393ab4b..01dd066481af 100644
--- a/metadata/md5-cache/dev-util/pmd-4.2.5
+++ b/metadata/md5-cache/dev-util/pmd-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/ant-core dev-java/asm:3 dev-java/jaxen:1.1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pmd/pmd-src-4.2.5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a122b1cd2c7988544747f6ba8e182457
diff --git a/metadata/md5-cache/dev-util/radare2-0.9.9 b/metadata/md5-cache/dev-util/radare2-0.9.9
new file mode 100644
index 000000000000..f72c6937f142
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-0.9.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=ssl? ( dev-libs/openssl:= ) virtual/pkgconfig
+DESCRIPTION=Advanced command line hexadecimal editor and more
+EAPI=5
+HOMEPAGE=http://www.radare.org
+IUSE=debug ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:= )
+SLOT=0
+SRC_URI=http://www.radare.org/get/radare2-0.9.9.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a17e39f163768d76111410360425521c
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.3.6 b/metadata/md5-cache/dev-util/shellcheck-0.3.6
index 4b6208bb4b59..8d4c173ed207 100644
--- a/metadata/md5-cache/dev-util/shellcheck-0.3.6
+++ b/metadata/md5-cache/dev-util/shellcheck-0.3.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.8.4:= >=dev-haskell/cabal-1.8 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Shell script analysis tool
 EAPI=5
 HOMEPAGE=http://www.shellcheck.net/
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
+RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.8.4:=
 SLOT=0/0.3.6
 SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.3.6/ShellCheck-0.3.6.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8140cfafdbe3a20b77343db2f0ee2552
+_md5_=0eac58920d8d9035505f5847d5738416
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.8-r1 b/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
index b3b74cb283af..75781f89b67b 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=|| ( virtual/jdk:1.7 virtual/jdk:1.8 ) dev-java/netbeans-platform:8.0 dev-java/netbeans-profiler:8.0 >=dev-java/java-config-2.2.0
 SLOT=7
 SRC_URI=https://java.net/downloads/visualvm/release138/visualvm_138-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa743647bfccd91c0181bd1f38836a9c
diff --git a/metadata/md5-cache/dev-util/weka-3.6.6-r1 b/metadata/md5-cache/dev-util/weka-3.6.6-r1
index e7f47c088057..1a929fef0b9e 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.6-r1
+++ b/metadata/md5-cache/dev-util/weka-3.6.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcc10da5e9c6d3dcebd1fb3d3722f324
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.11.10 b/metadata/md5-cache/dev-vcs/bfg-1.11.10
index 1eaf655dcdd9..84a982e5aa68 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.11.10
+++ b/metadata/md5-cache/dev-vcs/bfg-1.11.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.11.10/bfg-1.11.10.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ab4c9e8228ff66155a5a5c114358b65
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.11.7 b/metadata/md5-cache/dev-vcs/bfg-1.11.7
index dbca4cc528d5..cf0d56ebf015 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.11.7
+++ b/metadata/md5-cache/dev-vcs/bfg-1.11.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.11.7/bfg-1.11.7.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=559a328486508f0d1ff549729188bb5f
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.11.8 b/metadata/md5-cache/dev-vcs/bfg-1.11.8
index 7ad41e67ffc7..0556b1bf9203 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.11.8
+++ b/metadata/md5-cache/dev-vcs/bfg-1.11.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.11.8/bfg-1.11.8.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8fdb71bdf7ce33ed080ade4c9cfcf65
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.0 b/metadata/md5-cache/dev-vcs/bfg-1.12.0
index 20f7f54af1b0..21c064691fe0 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.0
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.0/bfg-1.12.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf244ca54c5afd36e4419c27e8d323b8
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.1 b/metadata/md5-cache/dev-vcs/bfg-1.12.1
index 8cc8e9daa6ae..1a1066cca436 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.1
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.1/bfg-1.12.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7257bb91383d386db64af519333c74ab
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.3 b/metadata/md5-cache/dev-vcs/bfg-1.12.3
index 68442ec954ff..fde180c753fa 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.3
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.3/bfg-1.12.3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80a5e9f482422c8ded6bb340222853a7
diff --git a/metadata/md5-cache/dev-vcs/git-2.4.2 b/metadata/md5-cache/dev-vcs/git-2.4.4
similarity index 89%
rename from metadata/md5-cache/dev-vcs/git-2.4.2
rename to metadata/md5-cache/dev-vcs/git-2.4.4
index e57fde88885f..c089ef2c7d3d 100644
--- a/metadata/md5-cache/dev-vcs/git-2.4.2
+++ b/metadata/md5-cache/dev-vcs/git-2.4.4
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=http://git-core.googlecode.com/files/git-2.4.2.tar.xz mirror://kernel/software/scm/git/git-2.4.2.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.2.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.2.tar.xz )
+SRC_URI=http://git-core.googlecode.com/files/git-2.4.4.tar.xz mirror://kernel/software/scm/git/git-2.4.4.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.4.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.4.tar.xz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=df4bc81cac419978f6a9cfd9d4c006e4
+_md5_=70cdc69d21309f5d0a6b498686621c6f
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.5.0 b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
index be1df53fb4b7..f0a26e527f3e 100644
--- a/metadata/md5-cache/dev-vcs/statcvs-0.5.0
+++ b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-vcs/cvs dev-java/jtreemap:0 dev-java/jcommon:1.0 >=dev-java/jfreechart-1.0.11:1.0 dev-java/jdom:1.0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/statcvs/statcvs-0.5.0-source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0bcdf7bdb004cffc61fdae423e2a352
diff --git a/metadata/md5-cache/dev-vcs/statsvn-0.5.0 b/metadata/md5-cache/dev-vcs/statsvn-0.5.0
index 56df21f519bb..730d8046203a 100644
--- a/metadata/md5-cache/dev-vcs/statsvn-0.5.0
+++ b/metadata/md5-cache/dev-vcs/statsvn-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-vcs/subversion-1.3.0 dev-java/xerces:2 >=dev-vcs/statcvs-0.5:0 >=dev-java/backport-util-concurrent-3.1:0 dev-java/jcommon:1.0 dev-java/jfreechart:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/statsvn/statsvn-0.5.0-source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62075aea6e6a1db83fe66dcff8d3d66b
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.5 b/metadata/md5-cache/games-board/domination-1.1.1.5
index 321944e1814a..f02fe54d3b77 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.5
+++ b/metadata/md5-cache/games-board/domination-1.1.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.5.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e6238645da2c7c6c45fbf6fe6715a4e
diff --git a/metadata/md5-cache/games-board/megamek-0.34.10 b/metadata/md5-cache/games-board/megamek-0.34.10
index c4828b0898c1..1c334b3509db 100644
--- a/metadata/md5-cache/games-board/megamek-0.34.10
+++ b/metadata/md5-cache/games-board/megamek-0.34.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/megamek/MegaMek-v0.34.10.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c335df3f62667975dc3543efff11d2c8
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
index fbf4c6ad74dc..96b02e81f076 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc88af6f40142f18cc9c6f141741a9fc
diff --git a/metadata/md5-cache/games-strategy/freecol-0.10.7 b/metadata/md5-cache/games-strategy/freecol-0.10.7
index d241be07ef49..1e47dcb5d1b6 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.10.7
+++ b/metadata/md5-cache/games-strategy/freecol-0.10.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.10.7-src.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e2a9f3795c94fa38c8ba01bc1158193
diff --git a/metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12 b/metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12
index 4af5a0c77f21..48b0fba33c78 100644
--- a/metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12
+++ b/metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 virtual/opengl games-misc/games-envd >=dev-java/java-c
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=amd64? ( http://downloads.puppygames.net/RevengeOfTheTitans-amd64.tar.gz -> revenge-of-the-titans-1.80.12-amd64.tar.gz ) x86? ( http://downloads.puppygames.net/RevengeOfTheTitans-i386.tar.gz -> revenge-of-the-titans-1.80.12-i386.tar.gz )
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=373722535e44f98397eac32bf757b9d6
diff --git a/metadata/md5-cache/games-strategy/triplea-1.7.0.3 b/metadata/md5-cache/games-strategy/triplea-1.7.0.3
index c986e4106b98..099bf241fb4b 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.7.0.3
+++ b/metadata/md5-cache/games-strategy/triplea-1.7.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-httpclient:3 dev-java/apple-java-extensions-bin dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_7_0_3_source_code_only.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d04384fbbfdfd8cb7f98c21deb71fae8
diff --git a/metadata/md5-cache/games-strategy/triplea-1.8.0.5 b/metadata/md5-cache/games-strategy/triplea-1.8.0.5
index 93b88c9a61b6..85adf1e49f2d 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.8.0.5
+++ b/metadata/md5-cache/games-strategy/triplea-1.8.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-httpclient:3 dev-java/apple-java-extensions-bin dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_5_source_code_only.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afa91ee13cbca6894e0405b52024e2bb
diff --git a/metadata/md5-cache/kde-apps/gwenview-4.14.3 b/metadata/md5-cache/kde-apps/gwenview-4.14.3
index d8256184bebb..1e67a6d382d6 100644
--- a/metadata/md5-cache/kde-apps/gwenview-4.14.3
+++ b/metadata/md5-cache/kde-apps/gwenview-4.14.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/gwenview-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9b02c7ca636dfd87ad8df1a84192576d
+_md5_=203e41b44fc1b32ea44717be9cbaebd8
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-4.14.3 b/metadata/md5-cache/kde-apps/kolourpaint-4.14.3
index 8a2b3b18309d..cf8d36155ddd 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-4.14.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-4.14.3
@@ -10,4 +10,4 @@ RDEPEND=media-libs/qimageblitz !kde-base/kolourpaint kde-apps/oxygen-icons handb
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kolourpaint-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=422209d447f8770b31aa720aaa06f502
+_md5_=b5323447563db637761ed223fd84a94e
diff --git a/metadata/md5-cache/kde-apps/konqueror-4.14.3 b/metadata/md5-cache/kde-apps/konqueror-4.14.3
index 9a1931b4b459..afee9bfed31b 100644
--- a/metadata/md5-cache/kde-apps/konqueror-4.14.3
+++ b/metadata/md5-cache/kde-apps/konqueror-4.14.3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kde-baseapps-4.14.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0d88f52be1e3450ad8e4ede19dd4b904
+_md5_=0cdefcff17659369c1eca297d84c9a9a
diff --git a/metadata/md5-cache/kde-base/krossjava-4.14.3 b/metadata/md5-cache/kde-base/krossjava-4.14.3
index 5a92848b3301..c9aeb555055e 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.14.3
+++ b/metadata/md5-cache/kde-base/krossjava-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 !!dev-java/ibm-jdk-bin >=dev-java/java-config-2.2.0 kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8f84d10c5dd79a139c6b40b8f7ae66a7
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.1-r1 b/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
index 3eb6b26089e7..f0328d3ce5d8 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.postfix.org/
 IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=IBM
 RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g:* ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !vda
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.0.1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v13-2.10.0.patch )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cfa1a364be1f6f9918a4be13b36ea73e
+_md5_=0443f6a1c5c0b97a6a1eace1c633f1ba
diff --git a/metadata/md5-cache/media-gfx/aoi-2.5 b/metadata/md5-cache/media-gfx/aoi-2.5
index ac0dfd10ecdb..ccf860ca7eef 100644
--- a/metadata/md5-cache/media-gfx/aoi-2.5
+++ b/metadata/md5-cache/media-gfx/aoi-2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/aoi/aoi25.zip doc? ( mirror://sourceforge/aoi/manual2.3.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f6d74217ddb16d821352a0d4407682d2
diff --git a/metadata/md5-cache/media-gfx/aoi-2.7.2 b/metadata/md5-cache/media-gfx/aoi-2.7.2
index 4e46b5911ac4..94521bb28daf 100644
--- a/metadata/md5-cache/media-gfx/aoi-2.7.2
+++ b/metadata/md5-cache/media-gfx/aoi-2.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/aoi/aoi272.zip doc? ( mirror://sourceforge/aoi/manual2.6.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69f36d3596baf522f63a55a4c1a68878
diff --git a/metadata/md5-cache/media-gfx/darktable-1.6.7 b/metadata/md5-cache/media-gfx/darktable-1.6.7
new file mode 100644
index 000000000000..15cc6932b7bc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/darktable-1.6.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/exiv2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango colord? ( x11-misc/colord:0= ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 dev-libs/json-glib ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) web-services? ( dev-libs/json-glib ) webp? ( media-libs/libwebp:0= ) dev-util/intltool virtual/pkgconfig nls? ( 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 virtual lighttable and darkroom for photographers
+EAPI=5
+HOMEPAGE=http://www.darktable.org/
+IUSE=colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ru linguas_sq linguas_sv linguas_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/exiv2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango colord? ( x11-misc/colord:0= ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) libsecret? ( >=app-crypt/libsecret-0.18 dev-libs/json-glib ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) web-services? ( dev-libs/json-glib ) webp? ( media-libs/libwebp:0= ) x11-themes/gtk-engines:2 kde? ( kde-apps/kwalletd:4 )
+REQUIRED_USE=cpu_flags_x86_sse3
+SLOT=0
+SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-1.6.7/darktable-1.6.7.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf -> darktable-usermanual-1.6.0.pdf )
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=95a1554f28a83e88bfb29d81566fb7f6
diff --git a/metadata/md5-cache/media-gfx/opcion-1.1.1-r2 b/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
index cb3b03e89ecb..1c57cd9c330e 100644
--- a/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
+++ b/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/jgoodies-looks-1.2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opcion/Opcion_v1.1.1_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cc2c09f7b387cec221af063fc583823
diff --git a/metadata/md5-cache/media-gfx/plantuml-7999 b/metadata/md5-cache/media-gfx/plantuml-7999
index e8851318f4d6..786901cbea6a 100644
--- a/metadata/md5-cache/media-gfx/plantuml-7999
+++ b/metadata/md5-cache/media-gfx/plantuml-7999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=media-gfx/graphviz-2.26.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/plantuml/plantuml-7999.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c82cc1d1725f7031666fbe2c86066664
diff --git a/metadata/md5-cache/media-gfx/potrace-1.12 b/metadata/md5-cache/media-gfx/potrace-1.12
new file mode 100644
index 000000000000..6f47a8d114a6
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/potrace-1.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Transforming bitmaps into vector graphics
+EAPI=5
+HOMEPAGE=http://potrace.sourceforge.net/
+IUSE=metric static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=http://potrace.sourceforge.net/download/1.12/potrace-1.12.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a289fa6a5d877915f37609157646f624
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
index be5c2c05e87f..32c004dbfaff 100644
--- a/metadata/md5-cache/media-sound/entagged-tageditor-0.35
+++ b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/squareness-jlf dev-db/hsqldb >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/entagged-tageditor-0.35.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=494d48cc2266652c5abb2f37ded0bf37
diff --git a/metadata/md5-cache/media-sound/jtagger-1.0-r1 b/metadata/md5-cache/media-sound/jtagger-1.0-r1
index c7ec32119835..b78c56de8b90 100644
--- a/metadata/md5-cache/media-sound/jtagger-1.0-r1
+++ b/metadata/md5-cache/media-sound/jtagger-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/jlayer:0 >=dev-java/jid3-0.46-r1:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dronten.googlepages.com/jtagger.zip -> jtagger-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c79318f81833a84e11900058a043fe03
diff --git a/metadata/md5-cache/media-sound/protux-0.50.100 b/metadata/md5-cache/media-sound/protux-0.50.100
index c7af5e6b1a3b..093c2c4f9182 100644
--- a/metadata/md5-cache/media-sound/protux-0.50.100
+++ b/metadata/md5-cache/media-sound/protux-0.50.100
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://protux.sourceforge.net/releases/protux-0.50.100.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0b84515dfdf8795c980cd9e0f2f5433
diff --git a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
index 19ce2b45556e..ae72ef3159bb 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/channeleditor/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3104778b7c9af851f1d77c70e0f34888
diff --git a/metadata/md5-cache/media-tv/freevo-1.9.0 b/metadata/md5-cache/media-tv/freevo-1.9.0
index 014eb864a822..5cdce99e14ef 100644
--- a/metadata/md5-cache/media-tv/freevo-1.9.0
+++ b/metadata/md5-cache/media-tv/freevo-1.9.0
@@ -3,11 +3,11 @@ DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 DESCRIPTION=Digital video jukebox (PVR, DVR)
 EAPI=3
 HOMEPAGE=http://www.freevo.org/
-IUSE=directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X
+IUSE=cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=dev-python/beautifulsoup:python-2 virtual/python-imaging dev-python/pygame >=dev-python/twisted-core-2.5 >=dev-python/twisted-web-0.6 dev-python/zope-interface >=dev-python/kaa-base-0.6.0 >=dev-python/kaa-metadata-0.7.3 >=dev-python/kaa-imlib2-0.2.3 dev-python/kaa-display media-video/mplayer[directfb?,fbcon?] >=media-libs/libsdl-1.2.5[directfb?,fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 directfb? ( media-libs/xine-lib[directfb] ) fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) flac? ( media-libs/flac ) gphoto2? ( media-libs/libgphoto2 ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) matrox? ( >=media-video/matroxset-0.3 ) mixer? ( media-sound/aumix ) tv? ( media-tv/xmltv ) xine? ( media-video/xine-ui ) vorbis? ( media-sound/vorbis-tools ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
+RDEPEND=dev-python/beautifulsoup:python-2 virtual/python-imaging dev-python/pygame >=dev-python/twisted-core-2.5 >=dev-python/twisted-web-0.6 dev-python/zope-interface >=dev-python/kaa-base-0.6.0 >=dev-python/kaa-metadata-0.7.3 >=dev-python/kaa-imlib2-0.2.3 dev-python/kaa-display media-video/mplayer[fbcon?] >=media-libs/libsdl-1.2.5[fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) flac? ( media-libs/flac ) gphoto2? ( media-libs/libgphoto2 ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) matrox? ( >=media-video/matroxset-0.3 ) mixer? ( media-sound/aumix ) tv? ( media-tv/xmltv ) xine? ( media-video/xine-ui ) vorbis? ( media-sound/vorbis-tools ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/freevo-1.9.0.tar.gz
 _eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a66d1454d493fe00aebca5c8b0f0c92b
+_md5_=14dfde1a1850e25afc88787f4798660f
diff --git a/metadata/md5-cache/media-tv/freevo-1.9.0-r1 b/metadata/md5-cache/media-tv/freevo-1.9.0-r1
index 45d0d931dc67..3689fd8d48be 100644
--- a/metadata/md5-cache/media-tv/freevo-1.9.0-r1
+++ b/metadata/md5-cache/media-tv/freevo-1.9.0-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_tar
 DESCRIPTION=Digital video jukebox (PVR, DVR)
 EAPI=5
 HOMEPAGE=http://www.freevo.org/
-IUSE=directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X python_targets_python2_7
+IUSE=cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/twisted-core-2.5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/twisted-web-0.6[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-base-0.6.0[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-metadata-0.7.3[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-imlib2-0.2.3[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/kaa-display[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-video/mplayer[directfb?,fbcon?] >=media-libs/libsdl-1.2.5[directfb?,fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 directfb? ( media-libs/xine-lib[directfb] ) fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) flac? ( media-libs/flac ) gphoto2? ( media-libs/libgphoto2 ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) matrox? ( >=media-video/matroxset-0.3 ) mixer? ( media-sound/aumix ) tv? ( media-tv/xmltv ) xine? ( media-video/xine-ui ) vorbis? ( media-sound/vorbis-tools ) >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+RDEPEND=dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] virtual/python-imaging[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/twisted-core-2.5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/twisted-web-0.6[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-base-0.6.0[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-metadata-0.7.3[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/kaa-imlib2-0.2.3[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/kaa-display[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-video/mplayer[fbcon?] >=media-libs/libsdl-1.2.5[fbcon?] media-libs/sdl-image[jpeg,png] x11-apps/xset cdparanoia? ( media-sound/cdparanoia ) dvd? ( >=media-video/lsdvd-0.10 fbcon? ( media-libs/xine-lib[fbcon] ) encode? ( media-video/dvdbackup ) ) flac? ( media-libs/flac ) gphoto2? ( media-libs/libgphoto2 ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 ) matrox? ( >=media-video/matroxset-0.3 ) mixer? ( media-sound/aumix ) tv? ( media-tv/xmltv ) xine? ( media-video/xine-ui ) vorbis? ( media-sound/vorbis-tools ) >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/freevo/freevo-1.9.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=d4275193132b7d6ad45aee3fd0c0189f
+_md5_=f334e3ce1d3bc0e0187780d6834487c0
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1 b/metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1
index 109ef5b50fc9..3621690e544b 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:2.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-forms:0 dev-java/jgoodies-looks:2.0 dev-java/l2fprod-common:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/stax:0 dev-java/swt:4.2 dev-java/xalan:0 x11-libs/libXt:0 x11-libs/libSM:0 x11-libs/libICE:0 x11-libs/libXext:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXdmcp:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.2.1_src.zip themes? ( http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/amarachthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/aquathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumithemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/bbjthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beigeazulthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/coronaHthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cougarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/crystal2themepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/iBarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/macosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/midnightthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/quickSilverRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/toxicthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/underlingthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/xplunathemepack.zip http://tvbrowser.org/downloads/noia.zip http://tvbrowser.org/downloads/nuvola.zip http://tvbrowser.org/downloads/tulliana.zip http://tvbrowser.org/downloads/tango_without_heart.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f8660987b9f35eb0d6557c5c8e8b5ea5
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4 b/metadata/md5-cache/media-tv/tvbrowser-3.4
index 9014409e0c47..097dabb204ab 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/stax:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36f37a6f9060456803b427acef71b20b
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0 b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0
index 880d18e1f4e9..8fd8e4bc891d 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/stax:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4.1.0_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8125fc1f115c784b24cc6496aabb1185
diff --git a/metadata/md5-cache/media-tv/tvbrowser-9999 b/metadata/md5-cache/media-tv/tvbrowser-9999
index 783027651e19..175ebe2873f4 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-9999
+++ b/metadata/md5-cache/media-tv/tvbrowser-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.3 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/stax:0 dev-java/swt:4.2 dev-java/xalan:0 x11-libs/libXt:0 x11-libs/libSM:0 x11-libs/libICE:0 x11-libs/libXext:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXdmcp:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=themes? ( http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/amarachthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/aquathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumithemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/bbjthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beigeazulthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/coronaHthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cougarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/crystal2themepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/iBarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/macosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/midnightthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/quickSilverRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/toxicthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/underlingthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/xplunathemepack.zip http://tvbrowser.org/downloads/noia.zip http://tvbrowser.org/downloads/nuvola.zip http://tvbrowser.org/downloads/tulliana.zip http://tvbrowser.org/downloads/tango_without_heart.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ee33f308e510cfcd2b66452aac8522c8
diff --git a/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2 b/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
index d8db16a7834a..b8ddf9c9b4a7 100644
--- a/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
+++ b/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl[-bindist] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bluray.beandog.org/aacskeys/aacskeys-0.4.0c.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46da9b20916ff7baeb339bb0c25ba231
diff --git a/metadata/md5-cache/media-video/aacskeys-0.4.0e b/metadata/md5-cache/media-video/aacskeys-0.4.0e
index 844bb344014d..6000f83d340b 100644
--- a/metadata/md5-cache/media-video/aacskeys-0.4.0e
+++ b/metadata/md5-cache/media-video/aacskeys-0.4.0e
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl[-bindist] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bluray.beandog.org/aacskeys/aacskeys-0.4.0e.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68b1a97c4e027acb8bcdc3edbd4c663d
diff --git a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1 b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
index 170284eaf1ca..8fddba1fe6d5 100644
--- a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
+++ b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sbriesen.de/gentoo/distfiles/bdsup2sub-4.0.0.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2936f910774ffe6d4a2d1059dd393f4e
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.3 b/metadata/md5-cache/media-video/google2srt-0.5.3
index e2089bd0f999..d22eac6c24ad 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.3
+++ b/metadata/md5-cache/media-video/google2srt-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/google2srt/Google2SRT-0.5.3.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2883bc4294912a9cee85518fa2ae46a
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.6 b/metadata/md5-cache/media-video/google2srt-0.5.6
index b78d6669acc3..595c51e92c66 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.6
+++ b/metadata/md5-cache/media-video/google2srt-0.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/google2srt/Google2SRT-0.5.6.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5801299748c9655399d8c0bdfb87134
diff --git a/metadata/md5-cache/media-video/jubler-4.6.1-r3 b/metadata/md5-cache/media-video/jubler-4.6.1-r3
index 677902024ca8..d912b51591ab 100644
--- a/metadata/md5-cache/media-video/jubler-4.6.1-r3
+++ b/metadata/md5-cache/media-video/jubler-4.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 virtual/ffmpeg mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell >=dev-java/zemberek-2.0[linguas_tr] ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://jubler.googlecode.com/files/Jubler-source-4.6.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5530bfacf4d6490fbbc358c25a1ee7a
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10 b/metadata/md5-cache/media-video/projectx-0.91.0.10
index cfc17a33e0f1..23aea0f20dc5 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-net X? ( =dev-java/browserlauncher2-1* ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10.tar.xz http://sbriesen.de/gentoo/distfiles/projectx-idctfast.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz http://sbriesen.de/gentoo/distfiles/projectx-icon.png
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10791336764614208ada7a599beafbfd
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2 b/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
index 8728d4b7e1d1..27dd025cad4a 100644
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
+++ b/metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=0.8.8b-r2
 SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8b.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=c645f45ec9a3c17f8b720fc50b213e36
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8d b/metadata/md5-cache/net-analyzer/cacti-0.8.8d
index 0a6769f94824..1dc56b314221 100644
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8d
+++ b/metadata/md5-cache/net-analyzer/cacti-0.8.8d
@@ -4,10 +4,10 @@ DESCRIPTION=Cacti is a complete frontend to rrdtool
 EAPI=5
 HOMEPAGE=http://www.cacti.net/
 IUSE=snmp doc vhosts
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
 SLOT=0.8.8d
 SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8d.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
-_md5_=77eca4609596849e01229e873b2c12f2
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_md5_=24a52573cee505dc58f34214d7acb5b1
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.3.5 b/metadata/md5-cache/net-analyzer/icinga2-2.3.5
new file mode 100644
index 000000000000..09bb8e74dfcf
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-util/cmake dev-libs/openssl:= >=dev-libs/boost-1.41 sys-devel/bison >=sys-devel/flex-2.5.35 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig
+DESCRIPTION=Distributed, general purpose, network monitoring engine
+EAPI=5
+HOMEPAGE=http://icinga.org/icinga2
+IUSE=+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax apache2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/cmake dev-libs/openssl:= >=dev-libs/boost-1.41 sys-devel/bison >=sys-devel/flex-2.5.35 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
+SLOT=0
+SRC_URI=http://github.com/Icinga/icinga2/archive/v2.3.5.tar.gz -> icinga2-2.3.5.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=051d5f1dcb759704131e797737f192e2
diff --git a/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1 b/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
index a057b0fc6cf8..5fce1618f2ab 100644
--- a/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
+++ b/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jcommander:0 net-analyzer/munin >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/gentoo/jmx2munin/tarball/jmx2munin-gentoo-1.0_p20120811 -> jmx2munin-gentoo-1.0_p20120811.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc713112d99323d794c0c24f2e4f45a5
diff --git a/metadata/md5-cache/net-analyzer/lilac-1.0.3 b/metadata/md5-cache/net-analyzer/lilac-1.0.3
index d3dc303f1b96..0f9a56d57f0b 100644
--- a/metadata/md5-cache/net-analyzer/lilac-1.0.3
+++ b/metadata/md5-cache/net-analyzer/lilac-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-php/PEAR-PEAR-1.6.1 >=net-analyzer/nagios-3.0 >=virtual/mysql-5.0 dev-lang/php[curl,json,mysql,pcntl,pdo,posix,simplexml] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.0.3
 SRC_URI=mirror://gentoo/lilac-1.0.3.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=3a66f8b1d69f121f222ca2784c1d8000
diff --git a/metadata/md5-cache/net-analyzer/nagtrap-0.1.3 b/metadata/md5-cache/net-analyzer/nagtrap-0.1.3
index d42fb032644e..bbbf4eef0b28 100644
--- a/metadata/md5-cache/net-analyzer/nagtrap-0.1.3
+++ b/metadata/md5-cache/net-analyzer/nagtrap-0.1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[mysql] net-analyzer/snmptt[mysql] net-analyzer/nagios-core virtual/httpd-php
 SLOT=0
 SRC_URI=http://www.nagiosforge.org/gf/download/frsrelease/126/252/nagtrap-0.1.3.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b06c3d14048de4d837d60e3377b707d8
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=cff28e3cf8a1ae2e01c6588a5aed2350
diff --git a/metadata/md5-cache/net-analyzer/nagvis-1.6.6 b/metadata/md5-cache/net-analyzer/nagvis-1.6.6
index c4485a9643d9..338438a99b72 100644
--- a/metadata/md5-cache/net-analyzer/nagvis-1.6.6
+++ b/metadata/md5-cache/net-analyzer/nagvis-1.6.6
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.nagvis.org/
 IUSE=apache2 automap apache2
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=|| ( net-analyzer/nagios net-analyzer/icinga ) automap? ( >=media-gfx/graphviz-2.14 ) apache2? ( dev-lang/php[apache2] ) net-analyzer/mk-livestatus dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml] virtual/httpd-php apache2? ( =www-servers/apache-2* )
+RDEPEND=|| ( net-analyzer/nagios net-analyzer/icinga ) automap? ( >=media-gfx/graphviz-2.14 ) apache2? ( dev-lang/php[apache2] ) net-analyzer/mk-livestatus dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml] virtual/httpd-php:* apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagvis/nagvis-1.6.6.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=854143fa9ae785f96be369c67701ad5b
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a3fa0b339a114da412b384cd43fa7bc6
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.12.5 b/metadata/md5-cache/net-analyzer/wireshark-1.12.5
index 1a62badd3efa..df2dd1d4ca31 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.12.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.12.5
@@ -4,11 +4,11 @@ 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 sbc selinux smi ssl zlib +filecaps
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-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 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 ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/1.12.5
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.12.5.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fcaps	eeefea88d5fef2853d4c1e3770340302	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	55ebcc6f3269308d226969c26704e343	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a169af52d673eae440617b48286dd340
+_md5_=6f6a81ff02b067c1818c65123fc144e3
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.5 b/metadata/md5-cache/net-analyzer/zabbix-2.2.5
index c8789cab7663..7d5f365a49d7 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=d2b6066dca32d3d7e9ef2529f996febb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.9 b/metadata/md5-cache/net-analyzer/zabbix-2.2.9
index b6c91bce737e..4a021809ae83 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.9
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=9ae208d0d1a10fa14bfe5ac38df33d1f
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.4.5 b/metadata/md5-cache/net-analyzer/zabbix-2.4.5
index b566d30358ea..4790d3c66717 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.4.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.6 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.4.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=a7bd13eb16cb0e065d68d372147e0ab1
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.72-r2 b/metadata/md5-cache/net-dns/dnsmasq-2.72-r2
index a0333ded2f7c..ccbca54dfd8a 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.72-r2
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.72-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=5
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 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:0 dev-lang/lua:5.1 ) ) conntrack? ( 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 )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.72.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ae33769fe7032870c4d6a88fa7a01b98
+_md5_=ed831e70145734f59e3c41a2ccf8cde4
diff --git a/metadata/md5-cache/net-im/kouchat-1.1.0 b/metadata/md5-cache/net-im/kouchat-1.1.0
index 0de0a8aecc57..78fd3a75baf9 100644
--- a/metadata/md5-cache/net-im/kouchat-1.1.0
+++ b/metadata/md5-cache/net-im/kouchat-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://kouchat.googlecode.com/files/kouchat-1.1.0-src.tar.gz http://dev.gentoo.org/~serkan/distfiles/kouchat-1.1.0-buildfiles.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=02eab42bee188a63b01d7d60af481c16
diff --git a/metadata/md5-cache/net-im/openfire-3.10.0 b/metadata/md5-cache/net-im/openfire-3.10.0
index b25c6f830f71..41c7363e66da 100644
--- a/metadata/md5-cache/net-im/openfire-3.10.0
+++ b/metadata/md5-cache/net-im/openfire-3.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_10_0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8f91a196ae982a8ed4ccdb6576a5ca8
diff --git a/metadata/md5-cache/net-irc/jircii-41 b/metadata/md5-cache/net-irc/jircii-41
index fe5588c158bd..55650ebf39cc 100644
--- a/metadata/md5-cache/net-irc/jircii-41
+++ b/metadata/md5-cache/net-irc/jircii-41
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://jirc.hick.org/download/jerkb41.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d67b77df1d67acf9f8e65a773fba420
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330 b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
index a8b66dda1db6..88b3782e43f3 100644
--- a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
+++ b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/NativeThread-0_pre20080330.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e3906e0978cf3a34d854cda1f73ac59
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15 b/metadata/md5-cache/net-libs/gnutls-3.3.15
index 4cc14cef57fb..d88ff132b78c 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15
@@ -4,10 +4,10 @@ DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi 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 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/nettle-3[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.15.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f06963239c5adc3776c2fa49c90be37
+_md5_=d88f4885da0f6e7d0b10a6b0c276e145
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15-r1 b/metadata/md5-cache/net-libs/gnutls-3.3.15-r1
new file mode 100644
index 000000000000..087b71ea2143
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/nettle-3[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=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(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
+EAPI=5
+HOMEPAGE=http://www.gnutls.org/
+IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <dev-libs/nettle-3[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.15.tar.xz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ccbe4d01edf1b0bc652ff6d165947a7f
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.2 b/metadata/md5-cache/net-libs/gnutls-3.4.2-r1
similarity index 99%
rename from metadata/md5-cache/net-libs/gnutls-3.4.2
rename to metadata/md5-cache/net-libs/gnutls-3.4.2-r1
index b4cecaa3cf81..54cca5e0fc14 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.4.2
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.2.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ba8dfb44cfee551e4f1994c2e67a5c8b
+_md5_=ab8d0c82ec8b162ebe69454ed5aa21ab
diff --git a/metadata/md5-cache/net-libs/libssh2-1.6.0 b/metadata/md5-cache/net-libs/libssh2-1.6.0
index fa741ed4ba5d..927ec5d60491 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.6.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=5
 HOMEPAGE=http://www.libssh2.org/
 IUSE=gcrypt static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.6.0.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=147e232af59049605e76798f53be0f84
+_md5_=883f32c37f19449a22333e0c4c391d89
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
index 8547f92b37bc..be6d8ff031c4 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
@@ -8,5 +8,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a712212e387409a27de1c81d72d34062
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
index 2c543f7c8f48..221813fa2b79 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8924238a97f4e953ede5d6215b7742c8
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.8.7 b/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
index 84afc401cdba..eb82f07d4d4c 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://mirror.i2p2.de/i2psource_0.8.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=474656cb23ec2ce9cdce392df570311e
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.0.2 b/metadata/md5-cache/net-libs/nghttp2-1.0.2
new file mode 100644
index 000000000000..aa0d1e26e04d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=cxx? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=5
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_32 abi_x86_64 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
+LICENSE=MIT
+RDEPEND=cxx? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
+SLOT=0/1.14
+SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.0.2/nghttp2-1.0.2.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=70f9b5749dd3a5f08f66981d6179f854
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 80cca35e895b..89672527d18b 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -8,4 +8,4 @@ LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
 SLOT=0/1.14
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6b2c5229ec84118243b8dc9ec2edc9d0
+_md5_=20c15dd7f59bf9a5a67b450564e5c1f4
diff --git a/metadata/md5-cache/net-libs/vanessa-socket-0.0.13 b/metadata/md5-cache/net-libs/vanessa-socket-0.0.13
new file mode 100644
index 000000000000..2e180ff94de3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/vanessa-socket-0.0.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/vanessa-logger-0.0.6
+DESCRIPTION=Simplifies TCP/IP socket operations
+EAPI=5
+HOMEPAGE=http://www.vergenet.net/linux/vanessa/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.vergenet.net/linux/vanessa/download/vanessa_socket/0.0.13/vanessa_socket-0.0.13.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a871e54753a98ed65771846e967a1515
diff --git a/metadata/md5-cache/net-mail/Freemail-9999 b/metadata/md5-cache/net-mail/Freemail-9999
index ef3ede798b5e..d0def48d5b14 100644
--- a/metadata/md5-cache/net-mail/Freemail-9999
+++ b/metadata/md5-cache/net-mail/Freemail-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bcprov:0 net-p2p/freenet >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8fdd21c44ee24d404a9079a9d3bba54e
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.64 b/metadata/md5-cache/net-mail/libpst-0.6.64
new file mode 100644
index 000000000000..45c3346f69ca
--- /dev/null
+++ b/metadata/md5-cache/net-mail/libpst-0.6.64
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python? ( =dev-lang/python-2* )
+DESCRIPTION=Tools and library for reading Outlook files (.pst format)
+EAPI=4
+HOMEPAGE=http://www.five-ten-sg.com/libpst/
+IUSE=debug dii doc python static-libs
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.64.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c2d9532072ca3bdfacacf423aa75062a
diff --git a/metadata/md5-cache/net-mail/mlmmj-1.2.19.0 b/metadata/md5-cache/net-mail/mlmmj-1.2.19.0
new file mode 100644
index 000000000000..afc2613f7eda
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mlmmj-1.2.19.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=virtual/mta
+DESCRIPTION=Mailing list managing made joyful
+EAPI=4
+HOMEPAGE=http://mlmmj.org/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://mlmmj.org/releases/mlmmj-1.2.19.0.tar.bz2
+_md5_=2e25467b1f28a94add756286c31e539c
diff --git a/metadata/md5-cache/net-misc/curl-7.43.0 b/metadata/md5-cache/net-misc/curl-7.43.0
new file mode 100644
index 000000000000..cfe4687e1514
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.43.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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 ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A Client that groks URLs
+EAPI=5
+HOMEPAGE=http://curl.haxx.se/
+IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba 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
+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 ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://curl.haxx.se/download/curl-7.43.0.tar.bz2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a9792a9f0ad266f8fcccd1711a539620
diff --git a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2 b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
index 5be8bf87d3e8..c1b136d28308 100644
--- a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
+++ b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/jsap:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.moldaner.de/wakeonlan/download/wakeonlan-1.0.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d36884bc38c0526393e7f20731334d5
diff --git a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0 b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
index fa6b7baa6622..e5b5ee325bcc 100644
--- a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
+++ b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jrdesktop/jrdesktop-source-0.3.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be9a11e5199ac670758079b409d96118
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index ccc032410e54..6e07814d41fc 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.4
+++ b/metadata/md5-cache/net-misc/mindterm-3.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jzlib:0 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.appgate.com/downloads/MindTerm-3.4/mindterm_3.4-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a7d0ac46a35e5a36de74670da671889
diff --git a/metadata/md5-cache/net-misc/stunnel-5.08 b/metadata/md5-cache/net-misc/stunnel-5.08
deleted file mode 100644
index 2302430b681b..000000000000
--- a/metadata/md5-cache/net-misc/stunnel-5.08
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=TLS/SSL - Port Wrapper
-EAPI=5
-HOMEPAGE=http://www.stunnel.org/index.html
-IUSE=ipv6 selinux tcpd ssl
-KEYWORDS=alpha sparc
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl selinux? ( sec-policy/selinux-stunnel )
-SLOT=0
-SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.08.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.08.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.08.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.08.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.08.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.08.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.08.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ebaad65ec2a3518e040901347cc7c3a4
diff --git a/metadata/md5-cache/net-misc/stunnel-5.16-r1 b/metadata/md5-cache/net-misc/stunnel-5.19
similarity index 64%
rename from metadata/md5-cache/net-misc/stunnel-5.16-r1
rename to metadata/md5-cache/net-misc/stunnel-5.19
index baa772880a94..36c6c236daf5 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.16-r1
+++ b/metadata/md5-cache/net-misc/stunnel-5.19
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) dev-libs/openssl:= selinux? ( sec-policy/selinux-stunnel )
 SLOT=0
-SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.16.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.16.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.16.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.16.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.16.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.16.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.16.tar.gz
+SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.19.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.19.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.19.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.19.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.19.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.19.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.19.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f84cbf628cfefd19012985898383039d
+_md5_=c9fe5ddbef762553613be5ac0493e577
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.7 b/metadata/md5-cache/net-misc/yajhfc-0.5.7
index 8a4beaf5e230..4bd73380c8d2 100644
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.7
+++ b/metadata/md5-cache/net-misc/yajhfc-0.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/gnu-hylafax:0 dev-java/tablelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_7-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e7e99b5680bd85a29cb9fd1f5ef3c716
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2 b/metadata/md5-cache/net-nds/jxplorer-3.2
index 0a95063febd6..e17cad8c75c6 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.2
@@ -8,5 +8,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9afbd75cd9f3c550cde82e602ab6f7b9
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2-r2 b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
index dbdef1263c6a..9b45d9d077c2 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.2-r2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c4303e087e1b0a45312ed366f47fc2a
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1
index 48ab8761340c..47508d9b519b 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1-project.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5d35696130cc3f1ba6afa27ec8858ed4
diff --git a/metadata/md5-cache/net-nds/phpldapadmin-1.2.3 b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3
index 81fb0e185096..0468d15a4d28 100644
--- a/metadata/md5-cache/net-nds/phpldapadmin-1.2.3
+++ b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[hash,ldap,session,xml,nls] || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.2.3
 SRC_URI=mirror://sourceforge/phpldapadmin/phpldapadmin-1.2.3.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=2f20f69310b5411e8854ddd6d3ee206c
diff --git a/metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1 b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
index aa3f577ef862..3689e3719332 100644
--- a/metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
+++ b/metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[hash,ldap,session,xml,nls] || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=1.2.3-r1
 SRC_URI=mirror://sourceforge/phpldapadmin/phpldapadmin-1.2.3.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=e0a55ddf82d1c949361b2454765710a2
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1466 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1466
index d2dd2c705a10..7ef12dc7e5e1 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1466
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1466
@@ -10,5 +10,5 @@ PDEPEND=net-libs/NativeThread:0
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger:0 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01466.zip -> freenet-0.7.5_p1466.zip mirror://gentoo/seednodes-20140810.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=16bc3a9cd69ddcbfd212526ad77b1097
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1467 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1467
index db3cf032de20..26ee7c199a2a 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1467
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1467
@@ -10,5 +10,5 @@ PDEPEND=net-libs/NativeThread:0
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger:0 dev-java/bcprov:1.49 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01467.zip -> freenet-0.7.5_p1467.zip mirror://gentoo/seednodes-20150427.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af54402106cd199502596c8cd57899d8
diff --git a/metadata/md5-cache/net-p2p/frostwire-4.20.9 b/metadata/md5-cache/net-p2p/frostwire-4.20.9
index e7fb33c5cb15..87834e4a4dd5 100644
--- a/metadata/md5-cache/net-p2p/frostwire-4.20.9
+++ b/metadata/md5-cache/net-p2p/frostwire-4.20.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/aopalliance dev-java/commons-logging dev-java/commons-net dev-java/commons-codec dev-java/icu4j:0 dev-java/jgoodies-looks:1.2 dev-java/jmdns dev-java/jython:0 dev-java/log4j dev-java/xml-commons-external >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/frostwire/frostwire-4.20.9.noarch.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41b4c286833f16f1392e5f324b27db8c
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.18 b/metadata/md5-cache/net-p2p/i2p-0.9.18
index f211cb9aa842..8092c3c9d52e 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.18
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.18
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=>=dev-java/bcprov-1.50 dev-java/eclipse-ecj:* dev-java/jakarta-jstl dev-java/java-service-wrapper dev-java/jrobin dev-java/slf4j-api dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6:= >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.18/i2psource_0.9.18.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=16e8704d7f73108a80fade84fdb27fc9
diff --git a/metadata/md5-cache/net-p2p/myster-8.0-r1 b/metadata/md5-cache/net-p2p/myster-8.0-r1
index 49d893a416d7..c3a4ed868245 100644
--- a/metadata/md5-cache/net-p2p/myster-8.0-r1
+++ b/metadata/md5-cache/net-p2p/myster-8.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/myster/Myster_PR8_Generic.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d715697dd3532433883b00df552f11e7
diff --git a/metadata/md5-cache/net-p2p/phex-3.2.0.102-r1 b/metadata/md5-cache/net-p2p/phex-3.2.0.102-r1
index a40312167f7d..b44a4f0c3770 100644
--- a/metadata/md5-cache/net-p2p/phex-3.2.0.102-r1
+++ b/metadata/md5-cache/net-p2p/phex-3.2.0.102-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-httpclient:3 dev-java/commons-logging:0 dev-java/jgoodies-forms:0 dev-java/jgoodies-looks:2.0 dev-java/log4j:0 dev-java/l2fprod-common:0 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-collections:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/phex/phex_3.2.0.102_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e81c0123e4fdf7265330fd0cfab3d4b
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index 68e500ceceda..646306170ee9 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19299ba8cc80dd39d03a8a4fff67c5c9
diff --git a/metadata/md5-cache/net-p2p/vuze-5.3.0.0 b/metadata/md5-cache/net-p2p/vuze-5.3.0.0
index 1d744a5b5445..7966c0955d97 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.3.0.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.3.0.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.3.0.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5300/Vuze_5300_source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=470343721da65d29339496cc2ca2467a
diff --git a/metadata/md5-cache/net-p2p/vuze-5.6.0.0 b/metadata/md5-cache/net-p2p/vuze-5.6.0.0
index 168c5fec3bce..64662633a61c 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.6.0.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.6.0.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.6.0.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5600/Vuze_5600_source.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ce43019dc7e00f16cff215a5985652e
diff --git a/metadata/md5-cache/net-p2p/yaggui-0.9.2 b/metadata/md5-cache/net-p2p/yaggui-0.9.2
index 998989a8aeb5..663acf917b11 100644
--- a/metadata/md5-cache/net-p2p/yaggui-0.9.2
+++ b/metadata/md5-cache/net-p2p/yaggui-0.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/jgoodies-looks-1.2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/yaggui/Yaggui-src-0.9.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8522cd38a7fe8c6a9888bde3b51d27ed
diff --git a/metadata/md5-cache/net-print/gmso2-0.1-r1 b/metadata/md5-cache/net-print/gmso2-0.1-r1
index 987152a718ac..4ff0dcc9c997 100644
--- a/metadata/md5-cache/net-print/gmso2-0.1-r1
+++ b/metadata/md5-cache/net-print/gmso2-0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/libmso:0 dev-java/jinklevel:0 >=dev-java/java-gnome-4.0.15:4.0 >=virtual/jre-1.5 x11-libs/gksu >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mso.googlecode.com/files/gmso2-0.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c885befb542b5c00ffde60e501ffeda3
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.61-r1 b/metadata/md5-cache/net-proxy/sshuttle-0.61-r1
deleted file mode 100644
index bc54b65d46aa..000000000000
--- a/metadata/md5-cache/net-proxy/sshuttle-0.61-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-arch/xz-utils =dev-lang/python-2*
-DESCRIPTION=Transparent proxy server that works as a poor man's VPN using ssh
-EAPI=4
-HOMEPAGE=https://github.com/apenwarr/sshuttle/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~radhermit/dist/sshuttle-0.61.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7679a932096a96f49c4705016b7aea5d
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.61-r3 b/metadata/md5-cache/net-proxy/sshuttle-0.61-r3
index 6f41840b9c51..013aa4e42166 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.61-r3
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.61-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Transparent proxy server that works as a poor man's VPN using ssh
 EAPI=5
 HOMEPAGE=https://github.com/apenwarr/sshuttle/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-firewall/iptables
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/dist/sshuttle-0.61.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=25341ccbeb629e90004a85e9efa28cb4
+_md5_=884b02cb68c64e97cb5aefe65c775a51
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
index eceb65c2fcf8..849e5fa02547 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/gnu-regexp dev-java/junit dev-java/jal >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/gasgano/gasgano-2.4.3.tar.gz doc? ( http://www.eso.org/sci/software/gasgano//VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5283f7544f385328886ba87813637e97
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.5 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
index a300c1f8ebd0..8165b65422f4 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/gnu-regexp dev-java/junit dev-java/jal >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/gasgano/gasgano-2.4.5.tar.gz doc? ( http://www.eso.org/sci/software/gasgano//VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50b32654e32e1a300494d6579a05316e
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-1.5.2 b/metadata/md5-cache/sci-biology/beast-mcmc-1.5.2
index c5799930c0be..3f7152c9bcdc 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-1.5.2
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-1.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:1.0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/beast-mcmc-1.5.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6721f7912a558149082c55361668d28e
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5 b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5
index 695ff444abb7..698642643e80 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:1.0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/beast-mcmc-1.7.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c0fe841a7d5c80a2de09b157e8690ee
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-9999 b/metadata/md5-cache/sci-biology/beast-mcmc-9999
index 7c1f082a361b..66469fd46c80 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-9999
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:1.0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e169b3e0583d376a2e88e7c39a6f26a1
diff --git a/metadata/md5-cache/sci-biology/gatk-2.4 b/metadata/md5-cache/sci-biology/gatk-2.4
index 9fb187a4009e..72f0ed08bb01 100644
--- a/metadata/md5-cache/sci-biology/gatk-2.4
+++ b/metadata/md5-cache/sci-biology/gatk-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/broadgsa/gatk/archive/2.4.tar.gz -> gatk-2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76787e40e77ec41c267c267b69640c92
diff --git a/metadata/md5-cache/sci-biology/gatk-9999 b/metadata/md5-cache/sci-biology/gatk-9999
index b6bcd3896f76..6ab5ac913fe4 100644
--- a/metadata/md5-cache/sci-biology/gatk-9999
+++ b/metadata/md5-cache/sci-biology/gatk-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f7bbf9a654ffda9c7c3058c638d4db24
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.7.3 b/metadata/md5-cache/sci-biology/goby-1.9.7.3
index 43e45d311c4e..9539a1a756db 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.7.3
+++ b/metadata/md5-cache/sci-biology/goby-1.9.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-libs/protobuf[java] dev-java/fastutil:5.0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.7.3 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-deps.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60228fe0be71463df4cdf829c342dcb0
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.8.1 b/metadata/md5-cache/sci-biology/goby-1.9.8.1
index 0d8c23325d5a..a57c7f4f2d84 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.8.1
+++ b/metadata/md5-cache/sci-biology/goby-1.9.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-libs/protobuf[java] dev-java/fastutil:5.0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.8.1 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-deps.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54ba893de1536071160ba9dfd3b56093
diff --git a/metadata/md5-cache/sci-biology/mauve-9999 b/metadata/md5-cache/sci-biology/mauve-9999
index b85632279e38..f534b98f465a 100644
--- a/metadata/md5-cache/sci-biology/mauve-9999
+++ b/metadata/md5-cache/sci-biology/mauve-9999
@@ -7,5 +7,5 @@ IUSE=doc elibc_FreeBSD elibc_FreeBSD
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 sci-biology/mauvealigner ~dev-java/biojava-1.6 >=dev-java/dbus-java-2.5.1 ~dev-java/zeus-jscl-1.08 dev-java/ant-nodeps >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff36d81e55c44a5a698560c938a8f0ef
diff --git a/metadata/md5-cache/sci-biology/picard-1.103 b/metadata/md5-cache/sci-biology/picard-1.103
index 736db6f74a57..ac8e35d63235 100644
--- a/metadata/md5-cache/sci-biology/picard-1.103
+++ b/metadata/md5-cache/sci-biology/picard-1.103
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/snappy:1.0 dev-java/cofoja:0 dev-java/commons-jexl:2 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/sci-biology/picard/picard-1.103.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d287f534cbc50dfeccdfd519f8cc0353
diff --git a/metadata/md5-cache/sci-biology/readseq-20080420-r1 b/metadata/md5-cache/sci-biology/readseq-20080420-r1
index c2b923232af6..6bca0b13a679 100644
--- a/metadata/md5-cache/sci-biology/readseq-20080420-r1
+++ b/metadata/md5-cache/sci-biology/readseq-20080420-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=!=sci-biology/meme-4.8.1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dberkholz/distfiles/readseq-source-20080420.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69dc5eae2146414a5b5ddc10e523f7b9
diff --git a/metadata/md5-cache/sci-biology/readseq-20100513 b/metadata/md5-cache/sci-biology/readseq-20100513
index f5f877befab2..2b8ffd6a52c3 100644
--- a/metadata/md5-cache/sci-biology/readseq-20100513
+++ b/metadata/md5-cache/sci-biology/readseq-20100513
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=!=sci-biology/meme-4.8.1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ercpe/distfiles/sci-biology/readseq/readseq-20100513.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e89d69efaa960f790f66ff1d7c367c0
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
index bec9a5e16206..319b68de480a 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.0.45-full.tar.gz http://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=18992da4ae093935b9f589cd019fb1c8
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
index 36b5ab01253e..bbe3baca670f 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 sci-libs/naga >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.2.27-full.tar.gz http://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=70727c3feff21d8f907f0c9f1461cddd
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r1 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r1
deleted file mode 100644
index 00fc467a32d2..000000000000
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 app-text/rman x11-misc/imake x11-proto/inputproto x11-proto/xextproto virtual/fortran
-DESCRIPTION=Molecular Graphics Visualisation Tool
-EAPI=5
-HOMEPAGE=http://www.openrasmol.org/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 RASLIC )
-RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
-SLOT=0
-SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f3f399e8159a423831543a0dcb0defe7
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
index 707927a79959..3b5a5e3fa2bb 100644
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+++ b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=s
 DESCRIPTION=Molecular Graphics Visualisation Tool
 EAPI=5
 HOMEPAGE=http://www.openrasmol.org/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 RASLIC )
 RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8752a6ad471327a9d87a09022451cb36
+_md5_=442caa9e1d476be9e1288968709d57b3
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index 7731e077c2a8..60b698688b9a 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.09
+++ b/metadata/md5-cache/sci-electronics/electric-8.09
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.09.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ede23ed32c70680c331b0e3d1794eb72
diff --git a/metadata/md5-cache/sci-electronics/electric-8.10 b/metadata/md5-cache/sci-electronics/electric-8.10
index b11fc33d1a02..5203e51be45d 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.10
+++ b/metadata/md5-cache/sci-electronics/electric-8.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.10.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c974d43593aa5a44388d7618b82c826
diff --git a/metadata/md5-cache/sci-electronics/electric-8.11 b/metadata/md5-cache/sci-electronics/electric-8.11
index 02cf3be636b3..0590595d94fd 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.11
+++ b/metadata/md5-cache/sci-electronics/electric-8.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.11.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6976ebf8a40c32d033835f04a2527909
diff --git a/metadata/md5-cache/sci-electronics/electric-9.00 b/metadata/md5-cache/sci-electronics/electric-9.00
index 5f0bfe5ca2c3..3138b5444aca 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.00
+++ b/metadata/md5-cache/sci-electronics/electric-9.00
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.00.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e13299d57501249c6a1327c2b98c55ba
diff --git a/metadata/md5-cache/sci-electronics/electric-9.02 b/metadata/md5-cache/sci-electronics/electric-9.02
index a44c3c810494..ed1df1f737b9 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.02
+++ b/metadata/md5-cache/sci-electronics/electric-9.02
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.02.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=073f9b375ac3c882015562c9796a35f1
diff --git a/metadata/md5-cache/sci-electronics/electric-9.03 b/metadata/md5-cache/sci-electronics/electric-9.03
index 674b16c06acc..2c4f0f1afb50 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.03
+++ b/metadata/md5-cache/sci-electronics/electric-9.03
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b29f58cdcc68af21c220a7e65846ab0a
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.0.3 b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
index 92e2aea267d8..8c3d86c5134e 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.0.3
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-java/rxtx-2.2_pre2 dev-java/swing-layout:1 dev-java/jcalendar:1.2 dev-java/jcharts dev-libs/glib:2[dbus] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/BT747_2.0.3_full.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e47920d40a275bba8e915aa955cb2b1e
diff --git a/metadata/md5-cache/sci-geosciences/josm-5485 b/metadata/md5-cache/sci-geosciences/josm-5485
index 39909e12c413..2142739a4188 100644
--- a/metadata/md5-cache/sci-geosciences/josm-5485
+++ b/metadata/md5-cache/sci-geosciences/josm-5485
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://josm.fabian-fingerle.de/josm-5485.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51447e7bda9db5e2b966d3deaa33c81b
diff --git a/metadata/md5-cache/sci-geosciences/josm-5608 b/metadata/md5-cache/sci-geosciences/josm-5608
index 529c5c57ad07..2d1dbe4b57c8 100644
--- a/metadata/md5-cache/sci-geosciences/josm-5608
+++ b/metadata/md5-cache/sci-geosciences/josm-5608
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://josm.hboeck.de/josm-5608.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c5e4b558ee60efd99b330287e61b8a2
diff --git a/metadata/md5-cache/sci-geosciences/josm-6060 b/metadata/md5-cache/sci-geosciences/josm-6060
index 5ec42fcf6483..40b6fc706df2 100644
--- a/metadata/md5-cache/sci-geosciences/josm-6060
+++ b/metadata/md5-cache/sci-geosciences/josm-6060
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://josm.hboeck.de/josm-6060.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3be0bf0b99dd76b07c5fd91456a071b8
diff --git a/metadata/md5-cache/sci-geosciences/josm-7347 b/metadata/md5-cache/sci-geosciences/josm-7347
index 46d1b477d896..cf15d061c3aa 100644
--- a/metadata/md5-cache/sci-geosciences/josm-7347
+++ b/metadata/md5-cache/sci-geosciences/josm-7347
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/josm-7347.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc16f53ff546c8747e18743fd32ae2f4
diff --git a/metadata/md5-cache/sci-geosciences/josm-9999 b/metadata/md5-cache/sci-geosciences/josm-9999
index 9e7b2296c9f9..069333199b8f 100644
--- a/metadata/md5-cache/sci-geosciences/josm-9999
+++ b/metadata/md5-cache/sci-geosciences/josm-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d2a5fb0898a8ed9b5de3df6b2986b66
diff --git a/metadata/md5-cache/sci-geosciences/mkgmap-1995 b/metadata/md5-cache/sci-geosciences/mkgmap-1995
index 7d3177287180..8ac2ce54351e 100644
--- a/metadata/md5-cache/sci-geosciences/mkgmap-1995
+++ b/metadata/md5-cache/sci-geosciences/mkgmap-1995
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.mkgmap.org.uk/snapshots/mkgmap-r1995-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8bede0e0140bdfc050b054133792af71
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.87.1 b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.87.1
new file mode 100644
index 000000000000..a15ed39eacc8
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.87.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare
+DEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/libxml2:2 dev-libs/boost sci-libs/geos sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) pbf? ( dev-libs/protobuf-c ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Converts OSM data to SQL and insert into PostgreSQL db
+EAPI=5
+HOMEPAGE=http://wiki.openstreetmap.org/wiki/Osm2pgsql
+IUSE=+lua +pbf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/libxml2:2 dev-libs/boost sci-libs/geos sci-libs/proj sys-libs/zlib lua? ( dev-lang/lua:= ) pbf? ( dev-libs/protobuf-c )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.87.1.tar.gz -> osm2pgsql-0.87.1.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=2d764df41adc6e086f77c4a9a6da032c
diff --git a/metadata/md5-cache/sci-geosciences/osmosis-0.35.1 b/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
index e18f1beae9e4..00d72061ad89 100644
--- a/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
+++ b/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-0.35.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f04c90fd8e32538755528b4115379f89
diff --git a/metadata/md5-cache/sci-libs/jmol-acme-1.0 b/metadata/md5-cache/sci-libs/jmol-acme-1.0
index ec701c3faa52..02228cc45311 100644
--- a/metadata/md5-cache/sci-libs/jmol-acme-1.0
+++ b/metadata/md5-cache/sci-libs/jmol-acme-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.acme.com/resources/classes/Acme.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af104e194669d46f851f81bcf6e6e54e
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index 3e70ab711a81..a3aed5add475 100644
--- a/metadata/md5-cache/sci-libs/naga-2.1
+++ b/metadata/md5-cache/sci-libs/naga-2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/naga-2.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=37a9da1cd8746b3e7d619e7e7140debd
diff --git a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14 b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
index 4e017bcb6973..9e8bf8c3cdb4 100644
--- a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
+++ b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.objectclub.jp/download/files/vecmath/vecmath1.2-1.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5df363f86767f7e7ea017044b2385440
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
index 5fefcfa5736e..66d7906a81b5 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=app-shells/bash-3.0:* >=dev-lang/polyml-5.4.1:=[-portable] >=dev-lang/perl-5.8.8-r2 >=dev-java/java-config-2.2.0
 SLOT=0/2011.1
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2011-1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f9dbb7927184fc033f9d48977d146c7
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2012-r1 b/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
index 5ccef8b372c6..d07ed3ca3188 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) pide? ( >=dev-lang/scala-2.8.2 ) ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=app-shells/bash-3.0:* >=dev-lang/polyml-5.4.1:=[-portable] >=dev-lang/perl-5.8.8-r2 >=dev-java/java-config-2.2.0
 SLOT=0/2012
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz doc? ( http://dev.gentoo.org/~gienah/snapshots/Isabelle2012-doc-src.tar.gz ) pide? ( http://www4.in.tum.de/~wenzelm/test/jedit_build-20120414.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6ba16fa432256a68dc5c086e90c44a00
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2013-r2 b/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
index d03c10269f41..4f43894a5f9b 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.7 proofgeneral? ( >=app-emacs/proofgeneral-4.1 ) >=app-shells/bash-3.0:* dev-java/ant-core:0 >=dev-java/jcommon-1.0.18:1.0 >=dev-java/jfreechart-1.0.14:1.0 >=dev-java/itext-2.1.5:0 dev-java/xml-xmlbeans:1 >=dev-lang/ghc-7.6.3 >=dev-lang/polyml-5.5.0:=[-portable] >=dev-lang/perl-5.8.8-r2 dev-lang/swi-prolog virtual/jdk:1.7 doc? ( virtual/latex-base dev-tex/rail ) >=dev-lang/scala-2.10.2:2.10 ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=dev-java/java-config-2.2.0
 SLOT=0/2013
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/Isabelle2013.tar.gz http://isabelle.in.tum.de/components/jedit_build-20130104.tar.gz -> jedit_build-isabelle-component-20130104.tar.gz http://isabelle.in.tum.de/components/jfreechart-1.0.14.tar.gz -> jfreechart-isabelle-component-1.0.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=83d7271f3d7287736470c5a73c2a0958
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1 b/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
index 468c775a18db..e72f145971dd 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.7 proofgeneral? ( >=app-emacs/proofgeneral-4.1 ) >=app-shells/bash-3.0:* dev-java/ant-core:0 >=dev-java/jcommon-1.0.18:1.0 >=dev-java/jfreechart-1.0.14:1.0 >=dev-java/itext-2.1.5:0 dev-java/xml-xmlbeans:1 dev-java/xz-java:0 >=dev-lang/ghc-7.6.3 >=dev-lang/polyml-5.5.1:=[-portable] >=dev-lang/perl-5.8.8-r2 dev-lang/swi-prolog virtual/jdk:1.7 doc? ( virtual/latex-base dev-tex/rail ) >=dev-lang/scala-2.11.1:2.11 ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=dev-java/java-config-2.2.0
 SLOT=0/2013.2
 SRC_URI=http://www.cl.cam.ac.uk/users/lcp/archive/Isabelle2013-2.tar.gz http://isabelle.in.tum.de/components/jedit_build-20131106.tar.gz -> jedit_build-isabelle-component-20131106.tar.gz http://isabelle.in.tum.de/dist/contrib/jfreechart-1.0.14-1.tar.gz -> jfreechart-isabelle-component-1.0.14-1.tar.gz http://dev.gentoo.org/~gienah/snapshots/polyml-isabelle-component-5.5.1-1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=401c9d9ce83b013be6361517faf6c64f
diff --git a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2 b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
index af1ff367d36a..8ca64d6123c1 100644
--- a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
+++ b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0/1.5.2
 SRC_URI=http://alloy.mit.edu/kodkod/1.5.2/kodkod-1.5.2.zip http://waf.googlecode.com/files/waf-1.7.16
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
 _md5_=155413a35775249b8a5e2dd0b0c454c5
diff --git a/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2 b/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
index 38902b8821f2..ff63587be6cc 100644
--- a/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
+++ b/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/antlr:3 =sci-mathematics/kodkod-1.5*:= isabelle? ( >=sci-mathematics/isabelle-2011-r1:= ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0/1.5.2
 SRC_URI=http://www21.in.tum.de/~blanchet/kodkodi-1.5.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7162edda687d6d49ff4a52d42f4691c8
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.97.336 b/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
index f69c752e488e..a5016c0197b0 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.97.336.tar.gz -> rstudio-0.97.336.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.0.rc1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa92a49479792e819e4cf6142357cefa
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.97.551 b/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
index abd4654d37ab..7afbbe594dde 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.97.551.tar.gz -> rstudio-0.97.551.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.0.rc1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=37829e02ca812a08aad72325b738ee5a
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
index 2a172a6523a8..81e3913112a0 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50 dev-libs/mathjax dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.1028.tar.gz -> rstudio-0.98.1028.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip http://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d6305a5bffdc5079ecc411f1d43e0d4
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
index 0b7d60adeacd..dd16f917a1fb 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.1091.tar.gz -> rstudio-0.98.1091.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip http://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz http://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz http://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=771dfe7f6593a28375745738931eaa78
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
index da36ac4b8afe..9636636e2c18 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.490.tar.gz -> rstudio-0.98.490.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f576c87ef9c2a3e0e1219bbd2443345
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
index 203b630d32d8..4e417fc7cd22 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.490.tar.gz -> rstudio-0.98.490.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb7b9e517edbd5055dbd0bd4e2cacd42
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.932 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
index 8bdb1593dc32..fa5c9896b4a9 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.932.tar.gz -> rstudio-0.98.932.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip http://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72dd62de087b5bccae14c8f4438d7388
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.953 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
index d9dcf37d1284..4e26cd70370b 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.953.tar.gz -> rstudio-0.98.953.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip http://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b13bd2acf55a3ca805187b013f3ffe69
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2 b/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
index bc2882ec848d..463ec2465df2 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
@@ -8,5 +8,5 @@ LICENSE=netlogo
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/3.0.2/netlogo-3.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=476c3f319c1506cec50c586f7a6e71be
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4 b/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
index 0f3ecec59e2b..1877c2c5f50b 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
@@ -9,5 +9,5 @@ LICENSE=netlogo
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/4.0.4/netlogo-4.0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbd0dfc8e54e4eaa8425e4480b1e80eb
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1 b/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
index d4896d44b816..47d7423f0098 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/5.0.3/netlogo-5.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c7ad8f3efba094a0e05cfa29a1a7c7e
diff --git a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1 b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
index 4f9759da4fbc..504778903f06 100644
--- a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
+++ b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jaxodraw/jaxodraw-2.0-1_src.tar.gz http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=123fc7f497435f6f5245a6af67502aa2
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
index b8a5405489b6..c110b683539c 100644
--- a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
+++ b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 !!sci-mathematics/gcalc >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67a5c56fc80db896cd963021882eafe1
diff --git a/metadata/md5-cache/sci-visualization/veusz-1.23 b/metadata/md5-cache/sci-visualization/veusz-1.23
index 0be4a6d3fc42..a610ec2289e2 100644
--- a/metadata/md5-cache/sci-visualization/veusz-1.23
+++ b/metadata/md5-cache/sci-visualization/veusz-1.23
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.11.4[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Qt scientific plotting package with good Postscript output
 EAPI=5
 HOMEPAGE=http://home.gna.org/veusz/
 IUSE=dbus doc emf fits hdf5 minuit vo python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.6[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) minuit? ( dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/PyQt4-4.11.4[X,svg,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) minuit? ( dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://download.gna.org/veusz/veusz-1.23.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=79555546a285a11e227b1f233055cadd
+_md5_=7a745ac477315922b1ad9450f6daa16f
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.45 b/metadata/md5-cache/sys-apps/hdparm-9.45
index bf0098e61160..8c3943a57ee2 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.45
+++ b/metadata/md5-cache/sys-apps/hdparm-9.45
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.45.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=93421d8a1ac80fa6c0bc5ebd4396d6d9
+_md5_=fc5ffe08ebec21da8c359dc187d325f8
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.56 b/metadata/md5-cache/sys-apps/moreutils-0.56
new file mode 100644
index 000000000000..2618f7106396
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/moreutils-0.56
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=doc? ( dev-lang/perl >=app-text/docbook2X-0.8.8-r2 app-text/docbook-xml-dtd:4.4 )
+DESCRIPTION=a growing collection of the unix tools that nobody thought to write thirty years ago
+EAPI=5
+HOMEPAGE=http://joeyh.name/code/moreutils/
+IUSE=+doc +perl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/moreutils/moreutils_0.56.orig.tar.gz
+_eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=bf0ca10608794517a11842021aa6736e
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.5-r1 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.5-r1
deleted file mode 100644
index 25cc110889f0..000000000000
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/automake virtual/pkgconfig
-DESCRIPTION=NSS module for name lookups using LDAP
-EAPI=5
-HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
-IUSE=debug kerberos +pam sasl test +utils python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=LGPL-2.1
-RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( dev-libs/cyrus-sasl[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !sys-auth/nss_ldap !sys-auth/pam_ldap
-REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=633b256383e0f1ea8497199e4dce2422
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
index b29e558df286..fcff220566ce 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
@@ -9,5 +9,5 @@ RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=08663701df1d03d832bc28fbb866d8eb
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	s6	274e4dec773e1303b2552f2b0b0e52aa	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=2c60c95ae57bda85d12a912e2dcbd41f
diff --git a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1 b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
index e27e9b0f064d..9aac52c3dc82 100644
--- a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
+++ b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmdebug,-smp] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/charmdebug/charmdebug_6.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24c49bd9655cc547fc769e121eb77f29
diff --git a/metadata/md5-cache/sys-cluster/cinder-2014.2.3-r1 b/metadata/md5-cache/sys-cluster/cinder-2014.2.3-r1
new file mode 100644
index 000000000000..886e396bff6e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-2014.2.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/pbr-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo test? ( >=dev-python/hacking-0.9.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/coverage-3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fixtures-0.3.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mox-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sphinx-1.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/sphinx-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sphinx-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/subunit-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/testtools-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-sphinx-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=5
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume iscsi lvm mysql postgres sqlite test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.15.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/eventlet-0.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-messaging-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-barbicanclient-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/taskflow-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.39[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ~dev-python/sqlalchemy-migrate-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://launchpad.net/cinder/juno/2014.2.3/+download/cinder-2014.2.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=35b925a2612a33ebb4eb0be5609b4260
diff --git a/metadata/md5-cache/sys-cluster/cinder-2015.1.0 b/metadata/md5-cache/sys-cluster/cinder-2015.1.0-r1
similarity index 96%
rename from metadata/md5-cache/sys-cluster/cinder-2015.1.0
rename to metadata/md5-cache/sys-cluster/cinder-2015.1.0-r1
index bab925a03d19..54b24f6c7918 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2015.1.0
+++ b/metadata/md5-cache/sys-cluster/cinder-2015.1.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=5
 HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume iscsi lvm mysql postgres sqlite test python_targets_python2_7
+IUSE=+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-2.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-0.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/taskflow-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-vmware-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-vmware-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-2.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-0.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/taskflow-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-vmware-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-vmware-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/cinder/kilo/2015.1.0/+download/cinder-2015.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=455571b184708d9d241287101f182ae6
+_md5_=d84116e72e2f00e5106595073120c663
diff --git a/metadata/md5-cache/sys-cluster/cinder-2015.1.9999 b/metadata/md5-cache/sys-cluster/cinder-2015.1.9999
index 4b6d90ac9012..b7c940837979 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2015.1.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2015.1.9999
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=5
 HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume iscsi lvm mysql postgres sqlite test python_targets_python2_7
+IUSE=+api +scheduler +volume iscsi lvm +memcached mysql postgres sqlite test python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-2.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-0.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/taskflow-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-vmware-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-vmware-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/anyjson-0.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/kombu-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.22.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-novaclient-2.24.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-swiftclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/requests-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/taskflow-0.7.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/taskflow-0.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/suds-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-vmware-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-vmware-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] iscsi? ( || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c38f24015ef68d6a3f2311ce887c657e
+_md5_=cb0fe10b3fc6036a0282de4a865367a8
diff --git a/metadata/md5-cache/sys-cluster/nova-2015.1.0-r2 b/metadata/md5-cache/sys-cluster/nova-2015.1.0-r3
similarity index 91%
rename from metadata/md5-cache/sys-cluster/nova-2015.1.0-r2
rename to metadata/md5-cache/sys-cluster/nova-2015.1.0-r3
index 1a600b4b508a..1df873ba4231 100644
--- a/metadata/md5-cache/sys-cluster/nova-2015.1.0-r2
+++ b/metadata/md5-cache/sys-cluster/nova-2015.1.0-r3
@@ -3,12 +3,12 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A cloud computing fabric controller (main part of an IaaS system) written in Python
 EAPI=5
 HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi python_targets_python2_7
+IUSE=+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=compute-only? ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) ) iscsi? ( sys-fs/lsscsi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !mysql !postgres !sqlite ) compute? ( ^^ ( kvm xen ) ) || ( python_targets_python2_7 )
+RDEPEND=compute-only? ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) ) iscsi? ( sys-fs/lsscsi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) compute? ( ^^ ( kvm xen ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/nova/kilo/2015.1.0/+download/nova-2015.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=01590c7600ad5cb016b0818adc9a8d23
+_md5_=c0c68c22f9c2959784b8631eba17e291
diff --git a/metadata/md5-cache/sys-cluster/nova-2015.1.9999 b/metadata/md5-cache/sys-cluster/nova-2015.1.9999
index a95c96ffb404..4438268f4f9b 100644
--- a/metadata/md5-cache/sys-cluster/nova-2015.1.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2015.1.9999
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A cloud computing fabric controller (main part of an IaaS system) written in Python
 EAPI=5
 HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi python_targets_python2_7
+IUSE=+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi python_targets_python2_7
 LICENSE=Apache-2.0
-RDEPEND=compute-only? ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) ) iscsi? ( sys-fs/lsscsi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !mysql !postgres !sqlite ) compute? ( ^^ ( kvm xen ) ) || ( python_targets_python2_7 )
+RDEPEND=compute-only? ( >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-0.9.7[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg:2 >=dev-python/sqlalchemy-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <=dev-python/sqlalchemy-0.9.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/keystonemiddleware-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ~dev-python/sqlalchemy-migrate-0.9.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/paramiko-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/iso8601-0.1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-cinderclient-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-cinderclient-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-2.3.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-neutronclient-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-glanceclient-0.15.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-glanceclient-0.18.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-barbicanclient-3.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/python-barbicanclient-3.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/stevedore-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websockify-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websockify-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-concurrency-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-1.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-config-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-context-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-log-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-serialization-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-utils-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-db-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-rootwrap-1.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-messaging-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-i18n-1.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/rfc3986-0.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/oslo-middleware-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) ) iscsi? ( sys-fs/lsscsi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) compute? ( ^^ ( kvm xen ) ) || ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=955da560381e063a593f41006f489f27
+_md5_=f349e794ea80bf591039f037cd8c9a5f
diff --git a/metadata/md5-cache/sys-cluster/projections-6.2.1 b/metadata/md5-cache/sys-cluster/projections-6.2.1
index bc770b708744..e5de0c222e98 100644
--- a/metadata/md5-cache/sys-cluster/projections-6.2.1
+++ b/metadata/md5-cache/sys-cluster/projections-6.2.1
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmtracing] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/projections/projections_6.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbc449a9ea40f911075bc3b08dc1fcb8
diff --git a/metadata/md5-cache/sys-cluster/swift-2.2.2-r1 b/metadata/md5-cache/sys-cluster/swift-2.2.2-r1
index 971a89a70373..39c69154055a 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.2.2-r1
+++ b/metadata/md5-cache/sys-cluster/swift-2.2.2-r1
@@ -3,12 +3,12 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=5
 HOMEPAGE=https://launchpad.net/swift
-IUSE=proxy account container object test +memcache python_targets_python2_7
+IUSE=proxy account container object test +memcached python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/dnspython-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcache? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/dnspython-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.9.15[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/swift/kilo/2.2.2/+download/swift-2.2.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=91af768579226f29ad97afff0a38d8a9
+_md5_=2962bd1d9e3ed78dc253fb275a64a873
diff --git a/metadata/md5-cache/sys-cluster/swift-2.3.0 b/metadata/md5-cache/sys-cluster/swift-2.3.0
index 318b57934cc8..ebd46e4258a3 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.3.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.3.0
@@ -3,12 +3,12 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_
 DESCRIPTION=A highly available, distributed, and eventually consistent object/blob store
 EAPI=5
 HOMEPAGE=https://launchpad.net/swift
-IUSE=proxy account container object test +memcache python_targets_python2_7
+IUSE=proxy account container object test +memcached python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/dnspython-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcache? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-python/dnspython-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.16.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/eventlet-0.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/simplejson-2.0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PyECLib-1.0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/swift/kilo/2.3.0/+download/swift-2.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b640770e4a3d36fc06056c610fefda0
+_md5_=9ea406407c60629c44e8939f1601c543
diff --git a/metadata/md5-cache/sys-fs/avfs-1.0.3 b/metadata/md5-cache/sys-fs/avfs-1.0.3
new file mode 100644
index 000000000000..b53077d2c602
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/avfs-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=>=sys-fs/fuse-2.4 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils ) virtual/pkgconfig
+DESCRIPTION=AVFS is a virtual filesystem that allows browsing of compressed files
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/avf
+IUSE=static-libs +lzma
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-fs/fuse-2.4 sys-libs/zlib app-arch/bzip2 lzma? ( app-arch/xz-utils )
+SLOT=0
+SRC_URI=mirror://sourceforge/avf/avfs-1.0.3.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=de825efcac9ff881eb2deeefc2a4805f
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 597812fd8086..9b1f1c485925 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/lzo:2= sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs
 RESTRICT=test
 SLOT=0/0
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=018c3ddd596410244b1efa715c95ff06
+_md5_=433f8231db23b14f34abdc9119391a72
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.4 b/metadata/md5-cache/sys-fs/fuse-2.9.4
new file mode 100644
index 000000000000..f38aac7e4ed6
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=An interface for filesystems implemented in userspace
+EAPI=5
+HOMEPAGE=http://fuse.sourceforge.net
+IUSE=examples kernel_linux kernel_FreeBSD static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse/fuse-2.9.4.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1d46cdb4e432b7819b8ade7cae6600e3
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
index 9a33c748b56f..c56581dfe3a6 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_5.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3df6a491bbd6ded90584f979c82a0aad
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
index a92a261e7c19..41dcbf45e630 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cc57e89aaf8b341d77a79dcbb681c3c
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
index b5e45dfbc213..80ea2b5f2882 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=142a16bfaea799e2d00b6947b9d238fb
diff --git a/metadata/md5-cache/sys-fs/owfs-2.7_p21-r3 b/metadata/md5-cache/sys-fs/owfs-2.7_p21-r3
deleted file mode 100644
index a5ad1f0f1e91..000000000000
--- a/metadata/md5-cache/sys-fs/owfs-2.7_p21-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-lang/perl:=[-build(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Access 1-Wire devices like a filesystem
-EAPI=5
-HOMEPAGE=http://www.owfs.org/ http://owfs.sourceforge.net/
-IUSE=debug fuse ftpd httpd parport perl php python server tcl usb zeroconf python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/owfs/owfs-2.7p21.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	depend.php	df169a364e191b840b695604097e3c21	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=57d186b0c1623fbb44f5353f8d8c0c4d
diff --git a/metadata/md5-cache/sys-fs/owfs-2.7_p21-r4 b/metadata/md5-cache/sys-fs/owfs-2.7_p21-r4
new file mode 100644
index 000000000000..7ad7dec11410
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/owfs-2.7_p21-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php:=[cli] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) perl? ( dev-lang/swig ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) dev-lang/perl:=[-build(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Access 1-Wire devices like a filesystem
+EAPI=5
+HOMEPAGE=http://www.owfs.org/ http://owfs.sourceforge.net/
+IUSE=debug fuse ftpd httpd parport perl php python server tcl usb zeroconf python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=fuse? ( sys-fs/fuse ) perl? ( dev-lang/perl ) php? ( dev-lang/php:=[cli] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) usb? ( virtual/libusb:0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) dev-lang/perl:=[-build(-)]
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/owfs/owfs-2.7p21.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=0bdb988716aa79a9274ec35c6e7ab641
diff --git a/metadata/md5-cache/sys-fs/udev-220-r3 b/metadata/md5-cache/sys-fs/udev-220-r3
new file mode 100644
index 000000000000..01799157d60e
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-220-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) dev-util/gperf >=sys-apps/coreutils-8.16 sys-libs/libcap virtual/os-headers virtual/pkgconfig >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-3.9 doc? ( >=dev-util/gtk-doc-1.18 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl doc gudev introspection +kmod selinux static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
+RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 gudev? ( !dev-libs/libgudev )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-220.tar.xz http://dev.gentoo.org/~ssuominen/udev-220-patches-4.tar.xz http://dev.gentoo.org/~williamh/dist/udev-220-patches-4.tar.xz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5965440928c157700d3095a0c985ef4a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
index 384222467bd0..d0fbc47ff6ba 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.0 kernel tree
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
 IUSE=deblob experimental symlink build deblob
-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=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-7.base.tar.xz mirror://gentoo/genpatches-4.0-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-7.experimental.tar.xz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=86c6975459c6ed085b0d7e2f8d31e10a
+_md5_=75866f43578afc4f30b5569d1e852e41
diff --git a/metadata/md5-cache/www-apache/mod_h2-0.7.0 b/metadata/md5-cache/www-apache/mod_h2-0.7.0
new file mode 100644
index 000000000000..cb1a521799a6
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=>=net-libs/nghttp2-1.0 ssl? ( www-servers/apache[alpn] ) =www-servers/apache-2.4*
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=5
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 ssl? ( www-servers/apache[alpn] ) || ( www-servers/apache[apache2_mpms_worker] www-servers/apache[apache2_mpms_event] www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser] ) =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v0.7.0/mod_h2-0.7.0.tar.gz
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e6c1c6da803644a1407911df488859c0
diff --git a/metadata/md5-cache/www-apache/mod_h2-9999 b/metadata/md5-cache/www-apache/mod_h2-9999
index c2f0ebb482a7..76d5b8b49e8f 100644
--- a/metadata/md5-cache/www-apache/mod_h2-9999
+++ b/metadata/md5-cache/www-apache/mod_h2-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst setup unpack
-DEPEND==net-libs/nghttp2-0.7* ssl? ( www-servers/apache[alpn] ) =www-servers/apache-2.4* dev-vcs/git
+DEPEND=>=net-libs/nghttp2-1.0 ssl? ( www-servers/apache[alpn] ) =www-servers/apache-2.4* dev-vcs/git
 DESCRIPTION=HTTP/2 module for Apache
 EAPI=5
 HOMEPAGE=https://github.com/icing/mod_h2
 IUSE=ssl
 LICENSE=Apache-2.0
-RDEPEND==net-libs/nghttp2-0.7* ssl? ( www-servers/apache[alpn] ) || ( www-servers/apache[apache2_mpms_worker] www-servers/apache[apache2_mpms_event] www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser] ) =www-servers/apache-2.4*
+RDEPEND=>=net-libs/nghttp2-1.0 ssl? ( www-servers/apache[alpn] ) || ( www-servers/apache[apache2_mpms_worker] www-servers/apache[apache2_mpms_event] www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser] ) =www-servers/apache-2.4*
 SLOT=0
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	git-2	e28f0d8a9b321431b1e699782851b827	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=303a1d471d1e199c8ef05f09c8d20193
+_md5_=ee8380bdc8f19d0280f2c5ca83b2652b
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.37 b/metadata/md5-cache/www-apache/mod_jk-1.2.37
index 93b36c1d489c..343c7f987f44 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.37
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.37
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8bdbc2632f8e602d6daa6555f9cff38
diff --git a/metadata/md5-cache/www-apps/agendav-1.2.6.2 b/metadata/md5-cache/www-apps/agendav-1.2.6.2
index 79dfa4d3f768..3b6e190616e5 100644
--- a/metadata/md5-cache/www-apps/agendav-1.2.6.2
+++ b/metadata/md5-cache/www-apps/agendav-1.2.6.2
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-3+ LGPL-2.1+ GPL-3+
 RDEPEND=>=dev-lang/php-5.3[curl,unicode] virtual/httpd-php || ( >=virtual/mysql-5.1 >=dev-db/postgresql-8.1 ) =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
 SLOT=1.2.6.2
 SRC_URI=https://github.com/adobo/agendav/tarball/1.2.6.2 -> agendav-1.2.6.2.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=f39db098ada57c72eadd02e18c1b43ee
diff --git a/metadata/md5-cache/www-apps/ampache-3.4.3 b/metadata/md5-cache/www-apps/ampache-3.4.3
index 5675b4a45189..1450aed2583c 100644
--- a/metadata/md5-cache/www-apps/ampache-3.4.3
+++ b/metadata/md5-cache/www-apps/ampache-3.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.4.3
 SRC_URI=http://www.ampache.org/downloads/ampache-3.4.3.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=b5195ed8a5d29f944d19efc88b1ffbc6
diff --git a/metadata/md5-cache/www-apps/baikal-0.2.4 b/metadata/md5-cache/www-apps/baikal-0.2.4
index 805ed604650e..adff260142cd 100644
--- a/metadata/md5-cache/www-apps/baikal-0.2.4
+++ b/metadata/md5-cache/www-apps/baikal-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/php-5.3[pdo,xml,mysql?,sqlite?] mysql? ( virtual/mysql ) sqli
 REQUIRED_USE=|| ( mysql sqlite )
 SLOT=0.2.4
 SRC_URI=http://baikal-server.com/get/baikal-regular-0.2.4.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=49f5207116744a8a4d9fd8e7f5365f6b
diff --git a/metadata/md5-cache/www-apps/baikal-0.2.7 b/metadata/md5-cache/www-apps/baikal-0.2.7
index 3c471d8cb30e..6fcee13e252c 100644
--- a/metadata/md5-cache/www-apps/baikal-0.2.7
+++ b/metadata/md5-cache/www-apps/baikal-0.2.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/php-5.3[pdo,xml,mysql?,sqlite?] mysql? ( virtual/mysql ) sqli
 REQUIRED_USE=|| ( mysql sqlite )
 SLOT=0.2.7
 SRC_URI=http://baikal-server.com/get/baikal-regular-0.2.7.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=2dc6f520fcc7ca49f9721f8e04fb2bdb
diff --git a/metadata/md5-cache/www-apps/davical-1.0.2-r2 b/metadata/md5-cache/www-apps/davical-1.0.2-r2
index fd99c19bdb95..6ebcf6525766 100644
--- a/metadata/md5-cache/www-apps/davical-1.0.2-r2
+++ b/metadata/md5-cache/www-apps/davical-1.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.51 www-servers/apache =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
 SLOT=1.0.2-r2
 SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.0.2.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=400f905f97a0f91b2918d8a475e10d2e
diff --git a/metadata/md5-cache/www-apps/davical-1.1.0-r1 b/metadata/md5-cache/www-apps/davical-1.1.0-r1
index 562d53595b68..2470efa3fd69 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.0-r1
+++ b/metadata/md5-cache/www-apps/davical-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.51 www-servers/apache =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
 SLOT=1.1.0-r1
 SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.1.0.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=26819ac4037adf56e4cf6286c5c89cd6
diff --git a/metadata/md5-cache/www-apps/davical-1.1.1-r2 b/metadata/md5-cache/www-apps/davical-1.1.1-r2
index 6d42a6d0e1ff..b366611c5f5c 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.1-r2
+++ b/metadata/md5-cache/www-apps/davical-1.1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.51 virtual/httpd-php =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
 SLOT=1.1.1-r2
 SRC_URI=http://debian.mcmillan.net.nz/packages/davical/davical-1.1.1.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=5c1a896dade3204ab5e0a6d79da97b47
diff --git a/metadata/md5-cache/www-apps/davical-1.1.3.1-r2 b/metadata/md5-cache/www-apps/davical-1.1.3.1-r2
index 4fd642626b9d..358583af0dd3 100644
--- a/metadata/md5-cache/www-apps/davical-1.1.3.1-r2
+++ b/metadata/md5-cache/www-apps/davical-1.1.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/pwgen dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.55 virtual/httpd-php =dev-lang/php-5* >=app-admin/webapp-config-1.50.15
 SLOT=1.1.3.1-r2
 SRC_URI=https://gitlab.com/davical-project/davical/repository/archive.tar.gz?ref=r1.1.3.1 -> davical-1.1.3.1.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=5fd3f7647ce0e156acf12d06494e1b44
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20140505e b/metadata/md5-cache/www-apps/dokuwiki-20140505e
index 0de182ca96e3..1df0ae00bb66 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20140505e
+++ b/metadata/md5-cache/www-apps/dokuwiki-20140505e
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=20140505e
 SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-05-05e.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=eb93b4d88ab1c45d677ee806cafd8111
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20140929d b/metadata/md5-cache/www-apps/dokuwiki-20140929d
index 40743ad154e7..b5e33dd1284e 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20140929d
+++ b/metadata/md5-cache/www-apps/dokuwiki-20140929d
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=20140929d
 SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-09-29d.tgz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=c1ee56e6a1c62940533abe7b016e4562
diff --git a/metadata/md5-cache/www-apps/dotproject-2.1.7-r1 b/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
index 14c02dc8cafc..cb06e9faec67 100644
--- a/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
+++ b/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/poppler[utils] dev-php/PEAR-Date virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=2.1.7-r1
 SRC_URI=mirror://sourceforge/dotproject/dotproject-2.1.7.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=76eec3e48da218d79425650e29f7483d
diff --git a/metadata/md5-cache/www-apps/eyeos-2.5 b/metadata/md5-cache/www-apps/eyeos-2.5
index 50071a3b1925..4b07e469c180 100644
--- a/metadata/md5-cache/www-apps/eyeos-2.5
+++ b/metadata/md5-cache/www-apps/eyeos-2.5
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-lang/php[curl,crypt,gd,json,mysql,mysqli,pdo,sharedmem,sqlite] >=app-admin/webapp-config-1.50.15
 SLOT=2.5
 SRC_URI=mirror://sourceforge/eyeos/eyeos2/eyeos-2.5.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=2e22281d0ba0c9c0cd513b551f562469
diff --git a/metadata/md5-cache/www-apps/gallery-2.3.2 b/metadata/md5-cache/www-apps/gallery-2.3.2
index a2a00ab047e8..fa8fe1f023b4 100644
--- a/metadata/md5-cache/www-apps/gallery-2.3.2
+++ b/metadata/md5-cache/www-apps/gallery-2.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=raw? ( media-gfx/dcraw ) ffmpeg? ( virtual/ffmpeg ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) netpbm? ( media-libs/netpbm media-gfx/jhead ) unzip? ( app-arch/unzip ) zip? ( app-arch/zip ) sqlite? ( dev-lang/php[pdo] dev-lang/php[sqlite] ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) dev-lang/php[session,postgres?,gd?] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=2.3.2
 SRC_URI=mirror://sourceforge/gallery/gallery-2.3.2-full.tar.gz
-_eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=confutils	2ab69b52fa6ea0c0669a47fb94b354b4	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=efab6b1a20ebd5628f90b9b35d76b8f3
diff --git a/metadata/md5-cache/www-apps/joomla-3.3.3 b/metadata/md5-cache/www-apps/joomla-3.3.3
index 19de1f7fe0a6..836f59717878 100644
--- a/metadata/md5-cache/www-apps/joomla-3.3.3
+++ b/metadata/md5-cache/www-apps/joomla-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/php-5.3.10[json,mysql?,postgres?,zlib,xml] >=app-admin/webapp
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=3.3.3
 SRC_URI=http://joomlacode.org/gf/download/frsrelease/19665/160049/Joomla_3.3.3-Stable-Full_Package.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=466d993a297d605719c333ed9be42530
diff --git a/metadata/md5-cache/www-apps/joomla-3.3.6 b/metadata/md5-cache/www-apps/joomla-3.3.6
index 42c73febd2a8..6b5abb32a484 100644
--- a/metadata/md5-cache/www-apps/joomla-3.3.6
+++ b/metadata/md5-cache/www-apps/joomla-3.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3.10[json,zlib,xml] || ( dev-lang/php[mysql] dev-lang/php[postgres] ) >=app-admin/webapp-config-1.50.15
 SLOT=3.3.6
 SRC_URI=http://joomlacode.org/gf/download/frsrelease/19822/161256/Joomla_3.3.6-Stable-Full_Package.zip
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=7d5c06d74b255d6df4654c6ddbe012b9
diff --git a/metadata/md5-cache/www-apps/joomla-3.4.0_alpha b/metadata/md5-cache/www-apps/joomla-3.4.0_alpha
index 449c901638dc..54a0db1c0c05 100644
--- a/metadata/md5-cache/www-apps/joomla-3.4.0_alpha
+++ b/metadata/md5-cache/www-apps/joomla-3.4.0_alpha
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3.10[json,zlib,xml] || ( dev-lang/php[mysql] dev-lang/php[postgres] ) >=app-admin/webapp-config-1.50.15
 SLOT=3.4.0_alpha
 SRC_URI=https://github.com/joomla/joomla-cms/releases/download/3.4.0-alpha/Joomla_3.4.0-alpha-Alpha-Full_Package.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=4227f241bba37b7ad2192eec88cc8642
diff --git a/metadata/md5-cache/www-apps/mantisbt-1.2.15-r1 b/metadata/md5-cache/www-apps/mantisbt-1.2.15-r1
index f94b53ec8134..3eb5d8853807 100644
--- a/metadata/md5-cache/www-apps/mantisbt-1.2.15-r1
+++ b/metadata/md5-cache/www-apps/mantisbt-1.2.15-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/httpd-php virtual/httpd-cgi >=dev-php/adodb-5.10 >=app-admin/webapp-config-1.50.15
 SLOT=1.2.15-r1
 SRC_URI=mirror://sourceforge/mantisbt/mantisbt-1.2.15.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=e292663f67c3b482e62b59c542c7f4be
diff --git a/metadata/md5-cache/www-apps/owncloud-5.0.19 b/metadata/md5-cache/www-apps/owncloud-5.0.19
index 491e146d0e97..9d47b2bd2f66 100644
--- a/metadata/md5-cache/www-apps/owncloud-5.0.19
+++ b/metadata/md5-cache/www-apps/owncloud-5.0.19
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sq
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=5.0.19
 SRC_URI=http://download.owncloud.org/community/owncloud-5.0.19.tar.bz2 -> owncloud-5.0.19.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=dd5ad2ba150f215975ea39d2d87491ae
diff --git a/metadata/md5-cache/www-apps/owncloud-6.0.7 b/metadata/md5-cache/www-apps/owncloud-6.0.7
index 00f2d4c028e8..f8d6bcc85d00 100644
--- a/metadata/md5-cache/www-apps/owncloud-6.0.7
+++ b/metadata/md5-cache/www-apps/owncloud-6.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sq
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=6.0.7
 SRC_URI=http://download.owncloud.org/community/owncloud-6.0.7.tar.bz2 -> owncloud-6.0.7.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=581ba7a28bf27598c7026d628fbecd89
diff --git a/metadata/md5-cache/www-apps/owncloud-6.0.8 b/metadata/md5-cache/www-apps/owncloud-6.0.8
index 0a6fcf539538..3347a1842083 100644
--- a/metadata/md5-cache/www-apps/owncloud-6.0.8
+++ b/metadata/md5-cache/www-apps/owncloud-6.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sq
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=6.0.8
 SRC_URI=http://download.owncloud.org/community/owncloud-6.0.8.tar.bz2 -> owncloud-6.0.8.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=bac9eb8ba0e4c47027297dfacedf28e4
diff --git a/metadata/md5-cache/www-apps/owncloud-7.0.5 b/metadata/md5-cache/www-apps/owncloud-7.0.5
index 5ef12ae4ef6f..2f1e53e5a4e1 100644
--- a/metadata/md5-cache/www-apps/owncloud-7.0.5
+++ b/metadata/md5-cache/www-apps/owncloud-7.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sq
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=7.0.5
 SRC_URI=http://download.owncloud.org/community/owncloud-7.0.5.tar.bz2 -> owncloud-7.0.5.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=1d9443179003d9c987bde4c13b3cb188
diff --git a/metadata/md5-cache/www-apps/owncloud-7.0.6 b/metadata/md5-cache/www-apps/owncloud-7.0.6
index 0d2c000b2fcd..3b63cee5177d 100644
--- a/metadata/md5-cache/www-apps/owncloud-7.0.6
+++ b/metadata/md5-cache/www-apps/owncloud-7.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,postgres?,simplexml,sq
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=7.0.6
 SRC_URI=http://download.owncloud.org/community/owncloud-7.0.6.tar.bz2 -> owncloud-7.0.6.tar.bz2
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=971ff3b21b604704eb9f7464a47af02c
diff --git a/metadata/md5-cache/www-apps/phpmp-0.11.0 b/metadata/md5-cache/www-apps/phpmp-0.11.0
index 6b8c8d86854c..4588074c2d63 100644
--- a/metadata/md5-cache/www-apps/phpmp-0.11.0
+++ b/metadata/md5-cache/www-apps/phpmp-0.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=0.11.0
 SRC_URI=mirror://sourceforge/musicpd/phpMp-0.11.0.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=f6bd9c0fbb51f0cd7be8e5590d28dd25
diff --git a/metadata/md5-cache/www-apps/rutorrent-3.4-r1 b/metadata/md5-cache/www-apps/rutorrent-3.4-r1
index a24d6d642ab1..e25702221ee9 100644
--- a/metadata/md5-cache/www-apps/rutorrent-3.4-r1
+++ b/metadata/md5-cache/www-apps/rutorrent-3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.4-r1
 SRC_URI=http://rutorrent.googlecode.com/files/rutorrent-3.4.tar.gz http://rutorrent.googlecode.com/files/plugins-3.4.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=47e626e24ec2605de4fdb048dd60b5b7
diff --git a/metadata/md5-cache/www-apps/tt-rss-1.15.3 b/metadata/md5-cache/www-apps/tt-rss-1.15.3
index ddb19668ad2f..345ae897d4ad 100644
--- a/metadata/md5-cache/www-apps/tt-rss-1.15.3
+++ b/metadata/md5-cache/www-apps/tt-rss-1.15.3
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] ) !daemon? ( dev-lan
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=1.15.3
 SRC_URI=https://github.com/gothfox/Tiny-Tiny-RSS/archive/1.15.3.tar.gz -> tt-rss-1.15.3.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=69b688fc11c0176b19703f34cb9cd290
diff --git a/metadata/md5-cache/www-apps/tt-rss-20150304 b/metadata/md5-cache/www-apps/tt-rss-20150304
index 3d26702efb70..67df14ff26d6 100644
--- a/metadata/md5-cache/www-apps/tt-rss-20150304
+++ b/metadata/md5-cache/www-apps/tt-rss-20150304
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] ) !daemon? ( dev-lan
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=20150304
 SRC_URI=http://dev.gentoo.org/~tomka/files/tt-rss-20150304.tar.bz2
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=18f607a138ee610c326003e4bc9e21b9
diff --git a/metadata/md5-cache/www-apps/websvn-2.3.2 b/metadata/md5-cache/www-apps/websvn-2.3.2
index 168ab8920020..df5a773039d2 100644
--- a/metadata/md5-cache/www-apps/websvn-2.3.2
+++ b/metadata/md5-cache/www-apps/websvn-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/subversion enscript? ( app-text/enscript ) virtual/httpd-php >=a
 RESTRICT=mirror
 SLOT=2.3.2
 SRC_URI=http://websvn.tigris.org/files/documents/1380/48737/websvn-2.3.2.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=d207c5371bb1857e33854d96c8ede17c
diff --git a/metadata/md5-cache/www-apps/websvn-2.3.3 b/metadata/md5-cache/www-apps/websvn-2.3.3
index e29d72726b87..9fb4315b6a24 100644
--- a/metadata/md5-cache/www-apps/websvn-2.3.3
+++ b/metadata/md5-cache/www-apps/websvn-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/subversion enscript? ( app-text/enscript ) virtual/httpd-php >=a
 RESTRICT=mirror
 SLOT=2.3.3
 SRC_URI=http://websvn.tigris.org/files/documents/1380/49056/websvn-2.3.3.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4	webapp	6621f8b5df9f14800054a5953065efeb
 _md5_=0998710d70dc108ad47efbbc43c58db7
diff --git a/metadata/md5-cache/www-client/chromium-45.0.2421.0 b/metadata/md5-cache/www-client/chromium-45.0.2431.0
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-45.0.2421.0
rename to metadata/md5-cache/www-client/chromium-45.0.2431.0
index dfaf0683bed9..05a1421f614d 100644
--- a/metadata/md5-cache/www-client/chromium-45.0.2421.0
+++ b/metadata/md5-cache/www-client/chromium-45.0.2431.0
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 RESTRICT=proprietary-codecs? ( bindist )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-45.0.2421.0.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-45.0.2431.0.tar.xz
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	chromium	ee8d79e69886593b65f7ee5e9d2710b4	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=76b6b0a68f9f64f25c36cf80da41ef63
+_md5_=d59846f508c8ea8e8cd493e8e6aa67d2
diff --git a/metadata/md5-cache/www-client/opera-beta-31.0.1889.16 b/metadata/md5-cache/www-client/opera-beta-31.0.1889.16
new file mode 100644
index 000000000000..c1035805e515
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-31.0.1889.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+linguas_af +linguas_az +linguas_be +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_en_US +linguas_es_419 +linguas_es +linguas_fil +linguas_fi +linguas_fr_CA +linguas_fr +linguas_fy +linguas_gd +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kk +linguas_ko +linguas_lt +linguas_lv +linguas_me +linguas_mk +linguas_ms +linguas_nb +linguas_nl +linguas_nn +linguas_pa +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_uz +linguas_vi +linguas_zh_CN +linguas_zh_TW +linguas_zu
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/31.0.1889.16/linux/opera-beta_31.0.1889.16_amd64.deb )
+_eclasses_=chromium	ee8d79e69886593b65f7ee5e9d2710b4	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=707dbe3d785552bc2d2b6c5cc16fd3a2
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.27.0 b/metadata/md5-cache/www-misc/zoneminder-1.27.0
index e9430fc27772..8ae6bc6d6243 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.27.0
+++ b/metadata/md5-cache/www-misc/zoneminder-1.27.0
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= dev-libs/libpcre dev-perl/DateManip dev-perl/DBD-mysql d
 REQUIRED_USE=|| ( openssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/v1.27.0.tar.gz -> zoneminder-1.27.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=fe259759f334684b8fb2c7fcd13f3272
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.28.0 b/metadata/md5-cache/www-misc/zoneminder-1.28.0
index 3bc2a37096a0..649c30ad1f82 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.28.0
+++ b/metadata/md5-cache/www-misc/zoneminder-1.28.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-php[apache2] dev-lang/perl:= dev-lang/php[apache2,cg
 REQUIRED_USE=|| ( openssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/v1.28.0.tar.gz -> zoneminder-1.28.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=64a9888da1cacf56ea26565f25ea401b
diff --git a/metadata/md5-cache/www-misc/zoneminder-1.28.1 b/metadata/md5-cache/www-misc/zoneminder-1.28.1
index c2ea20908b21..7d63a1186aa4 100644
--- a/metadata/md5-cache/www-misc/zoneminder-1.28.1
+++ b/metadata/md5-cache/www-misc/zoneminder-1.28.1
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-php[apache2] dev-lang/perl:= dev-lang/php[apache2,cg
 REQUIRED_USE=|| ( openssl gnutls )
 SLOT=0
 SRC_URI=https://github.com/ZoneMinder/ZoneMinder/archive/v1.28.1.tar.gz -> zoneminder-1.28.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=998fb4e5db6f1d5e2cef0ac61f08737a
diff --git a/metadata/md5-cache/www-servers/axis-1.4-r2 b/metadata/md5-cache/www-servers/axis-1.4-r2
index f5cafa190505..3e21dd9e9e4a 100644
--- a/metadata/md5-cache/www-servers/axis-1.4-r2
+++ b/metadata/md5-cache/www-servers/axis-1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-discovery:0 dev-java/wsdl4j:0 dev-jav
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/ws/axis/1_4/axis-src-1_4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=23a7c597ec548c5ed15bd52db20362e9
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.35 b/metadata/md5-cache/www-servers/lighttpd-1.4.35
index 0722ae7d9f8b..833c706c5d05 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.35
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.35
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=701fd67e2e641f212dccd7e9b1272989
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.35-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.35-r1
index f6956cd97123..a2788f7d2e7a 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.35-r1
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.35-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=2c6d3514b31392133e1f368b8d38b880
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.35-r2 b/metadata/md5-cache/www-servers/lighttpd-1.4.35-r2
index db98ca92930d..aaa6bfc70f33 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.35-r2
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.35-r2
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) l
 REQUIRED_USE=kerberos? ( ssl )
 SLOT=0
 SRC_URI=http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=7d2baf6d8522e13ff90249e4335ba8d7
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.5.3 b/metadata/md5-cache/www-servers/monkeyd-1.5.3
index 5a02f1e53b8d..c9ad01ee35db 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.5.3
+++ b/metadata/md5-cache/www-servers/monkeyd-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=php? ( dev-lang/php )
 REQUIRED_USE=elibc_uclibc? ( !debug )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.5/monkey-1.5.3.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1c68faf7a80090ed71e956245f937217
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.5.5 b/metadata/md5-cache/www-servers/monkeyd-1.5.5
index 9f43001aed0a..6befc85d649a 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.5.5
+++ b/metadata/md5-cache/www-servers/monkeyd-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=php? ( dev-lang/php )
 REQUIRED_USE=elibc_uclibc? ( !debug )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.5/monkey-1.5.5.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=03b68c56332cd940a5ee54e97ec4cac6
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.5.6 b/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
similarity index 77%
rename from metadata/md5-cache/www-servers/monkeyd-1.5.6
rename to metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
index ba84f134fec9..4721ea2cc5d2 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.5.6
+++ b/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.monkey-project.com/
 IUSE=-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=php? ( dev-lang/php )
-REQUIRED_USE=elibc_uclibc? ( !debug )
+RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
+REQUIRED_USE=elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz
-_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=5f64da6c745c16014b67db1942f7df1b
+_eclasses_=depend.php	4da4ed8b8e8169c593b1e9ccf4007770	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a0dbcf2c4a66988f7dad1cddb7de071f
diff --git a/metadata/md5-cache/www-servers/resin-4.0.22 b/metadata/md5-cache/www-servers/resin-4.0.22
index 2dcadbe059ee..a5b8294ee920 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.22
+++ b/metadata/md5-cache/www-servers/resin-4.0.22
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.22 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.22-src.zip mirror://gentoo/resin-gentoo-patches-4.0.22-r1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74f8505457845ad43681840e34f660c9
diff --git a/metadata/md5-cache/www-servers/resin-4.0.25 b/metadata/md5-cache/www-servers/resin-4.0.25
index 4f8b3ea38ef9..dc1a19632fd4 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.25
+++ b/metadata/md5-cache/www-servers/resin-4.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.25 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.25-src.zip mirror://gentoo/resin-gentoo-patches-4.0.25-r1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c225ed6f1d20fa2db84550e174a2ef5
diff --git a/metadata/md5-cache/www-servers/resin-4.0.26 b/metadata/md5-cache/www-servers/resin-4.0.26
index eae5381ab6af..f2218812f07e 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.26
+++ b/metadata/md5-cache/www-servers/resin-4.0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.26 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip mirror://gentoo/resin-gentoo-patches-4.0.26.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=568ecff4e881470c0dc48cd61d5d38d4
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.44 b/metadata/md5-cache/www-servers/tomcat-6.0.44
index bbf499332513..90dcc1104f75 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.44
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.44
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:3.7 dev-java/tomcat-servlet-api:2.5 >=virtual/jre-1
 RESTRICT=test
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07f84ffec70d5efec178578536dbb3b0
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.59 b/metadata/md5-cache/www-servers/tomcat-7.0.59
index 6cb62ec4c869..394226395b4e 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.59
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.59
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 extra-webap
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f678000ffdb5a996f5a028e0698b262
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.59-r1 b/metadata/md5-cache/www-servers/tomcat-7.0.59-r1
index 669e9569d3f5..467f727ae58a 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.59-r1
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.59-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.59 websockets?
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd016d87acd8346a63a47bdb1fdd16c5
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.22 b/metadata/md5-cache/www-servers/tomcat-8.0.22
index 719829c29607..bdb011dcb864 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.22
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.22
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.22:3.1 extra-w
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.22/src/apache-tomcat-8.0.22-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c94bbde3d72bba9b6e759e687d59794e
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.22-r1 b/metadata/md5-cache/www-servers/tomcat-8.0.22-r1
index 1dc8c51e72b2..224b2d5ba6ae 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.22-r1
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.22-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.22:3.1 !<dev-j
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.22/src/apache-tomcat-8.0.22-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f12f451ab9aa2392bae6d2939f0335e
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.23 b/metadata/md5-cache/www-servers/tomcat-8.0.23
index 969b609053c9..1f32a4becc08 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.23
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.23
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.23:3.1 extra-w
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.23/src/apache-tomcat-8.0.23-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b29255535f62110057de534b75bef956
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.23-r1 b/metadata/md5-cache/www-servers/tomcat-8.0.23-r1
index 976a0497690d..ddad7d506e5b 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.23-r1
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.23-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.23:3.1 !<dev-j
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.23/src/apache-tomcat-8.0.23-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	31d37149e3fbdc590f33c23861da8cae	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5676a7e5b9d83e0d8c18f8d4a0910d0b
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5 b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
index 188f0fa4169b..e0fd6ecb255c 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
+++ b/metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org X servers
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=dmx kdrive xnest xorg xvfb ipv6 minimal nptl selinux tslib +udev static-libs doc
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 )
 RDEPEND=>=app-eselect/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 <x11-libs/libXfont-1.5.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=virtual/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver )
@@ -12,4 +12,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) )
 SLOT=0/1.12.4
 SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://gentoo/xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
-_md5_=1c3d777b2b9a0cf2e4c863240532c924
+_md5_=8568c8f11ba4f796ee98c77d65ae287a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-352.09 b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
similarity index 82%
rename from metadata/md5-cache/x11-drivers/nvidia-drivers-352.09
rename to metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
index 309577776664..555062f47ba2 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-352.09
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? (
 REQUIRED_USE=tools? ( X || ( gtk2 gtk3 ) )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/352.09/NVIDIA-FreeBSD-x86_64-352.09.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/352.09/NVIDIA-Linux-x86_64-352.09.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/352.09/NVIDIA-FreeBSD-x86-352.09.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/352.09/NVIDIA-Linux-x86-352.09.run )
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/352.21/NVIDIA-FreeBSD-x86_64-352.21.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/352.21/NVIDIA-Linux-x86_64-352.21.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/352.21/NVIDIA-FreeBSD-x86-352.21.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/352.21/NVIDIA-Linux-x86-352.21.run )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	nvidia-driver	800f567ff607d5d5171a8149456e294e	portability	a45c088f246ef5091e029f6285d7ce42	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0fd356f33f797e6fc7b1e3c1080e9436
+_md5_=ed37dcf53938ec6a071fbf9e5b013e43
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111 b/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
index 7d3090738441..fa64cac683e1 100644
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
@@ -4,10 +4,10 @@ DESCRIPTION=A VNC server for real X displays
 EAPI=5
 HOMEPAGE=http://www.karlrunge.com/x11vnc/
 IUSE=avahi crypt fbcon ssl xinerama
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 avahi? ( >=net-dns/avahi-0.6.4 ) ssl? ( dev-libs/openssl:= ) >=net-libs/libvncserver-0.9.8 xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f57e31af8c9ea57b83e472bfd88c0260
+_md5_=b032387f0c8dfef537413ddf172c79e4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fb52a90c0744..315b5442b434 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jun 2015 07:07:20 +0000
+Thu, 18 Jun 2015 05:07:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index de64ff3ae692..9e41d2104f2b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 17 07:07:16 UTC 2015
+Thu Jun 18 05:06:57 UTC 2015
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index cace75e9e11a..eefcd19b1c59 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -600,7 +600,7 @@
 1110191613 ./dev-db/lib_mysqludf_json/lib_mysqludf_json-0.0.2.ebuild
 1410310440 ./dev-db/recutils/recutils-1.7.ebuild
 1403020231 ./dev-db/recutils/recutils-1.5.ebuild
-1505290510 ./dev-db/hyperdex/hyperdex-1.7.0.ebuild
+1506180547 ./dev-db/hyperdex/hyperdex-1.7.1.ebuild
 1501150941 ./dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild
 1405070759 ./dev-db/hyperdex/hyperdex-9999.ebuild
 1408110001 ./dev-db/freetds/freetds-0.64.ebuild
@@ -749,7 +749,7 @@
 1501051931 ./dev-db/spatialite/spatialite-3.0.1.ebuild
 1503030931 ./dev-db/lmdb/lmdb-0.9.14.ebuild
 1505311531 ./dev-db/postgresql/postgresql-9.3.7.ebuild
-1506161201 ./dev-db/postgresql/postgresql-9.0.21.ebuild
+1506171201 ./dev-db/postgresql/postgresql-9.0.21.ebuild
 1506121701 ./dev-db/postgresql/postgresql-9.0.22.ebuild
 1504082331 ./dev-db/postgresql/postgresql-9.0.19-r1.ebuild
 1504082201 ./dev-db/postgresql/postgresql-9.4.1.ebuild
@@ -760,16 +760,16 @@
 1504082331 ./dev-db/postgresql/postgresql-9.2.10-r1.ebuild
 1506121701 ./dev-db/postgresql/postgresql-9.4.4.ebuild
 1504082201 ./dev-db/postgresql/postgresql-9.0.19.ebuild
-1506161201 ./dev-db/postgresql/postgresql-9.3.8.ebuild
+1506171201 ./dev-db/postgresql/postgresql-9.3.8.ebuild
 1504082201 ./dev-db/postgresql/postgresql-9.2.10.ebuild
 1506121701 ./dev-db/postgresql/postgresql-9.2.13.ebuild
 1505311531 ./dev-db/postgresql/postgresql-9.4.2.ebuild
 1504082331 ./dev-db/postgresql/postgresql-9.4.1-r1.ebuild
-1506161201 ./dev-db/postgresql/postgresql-9.4.3.ebuild
-1506161201 ./dev-db/postgresql/postgresql-9.2.12.ebuild
+1506171201 ./dev-db/postgresql/postgresql-9.4.3.ebuild
+1506171201 ./dev-db/postgresql/postgresql-9.2.12.ebuild
 1504082201 ./dev-db/postgresql/postgresql-9.3.6.ebuild
 1505311531 ./dev-db/postgresql/postgresql-9.2.11.ebuild
-1506161201 ./dev-db/postgresql/postgresql-9.1.17.ebuild
+1506171201 ./dev-db/postgresql/postgresql-9.1.17.ebuild
 1505311531 ./dev-db/postgresql/postgresql-9.0.20.ebuild
 1504082201 ./dev-db/postgresql/postgresql-9.1.15.ebuild
 1505221731 ./dev-db/postgresql/postgresql-9999.ebuild
@@ -1000,7 +1000,7 @@
 1506132031 ./dev-vcs/git/git-9999-r2.ebuild
 1506132031 ./dev-vcs/git/git-2.3.8.ebuild
 1506132031 ./dev-vcs/git/git-1.8.5.6.ebuild
-1506132031 ./dev-vcs/git/git-2.4.2.ebuild
+1506171550 ./dev-vcs/git/git-2.4.4.ebuild
 1506132031 ./dev-vcs/git/git-2.2.2.ebuild
 1506132031 ./dev-vcs/git/git-9999-r3.ebuild
 1506132031 ./dev-vcs/git/git-1.9.5.ebuild
@@ -1097,12 +1097,12 @@
 1506042144 ./kde-apps/lokalize/lokalize-4.14.3.ebuild
 1506042144 ./kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-4.14.3.ebuild
 1506042144 ./kde-apps/phonon-kde/phonon-kde-4.14.3.ebuild
-1506042144 ./kde-apps/gwenview/gwenview-4.14.3.ebuild
+1506171631 ./kde-apps/gwenview/gwenview-4.14.3.ebuild
 1506042144 ./kde-apps/kapman/kapman-4.14.3.ebuild
 1506042144 ./kde-apps/libkipi/libkipi-4.14.3.ebuild
 1506042144 ./kde-apps/kblackbox/kblackbox-4.14.3.ebuild
 1506042144 ./kde-apps/knavalbattle/knavalbattle-4.14.3.ebuild
-1506042144 ./kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild
+1506171631 ./kde-apps/kolourpaint/kolourpaint-4.14.3.ebuild
 1506042144 ./kde-apps/kde-base-artwork/kde-base-artwork-4.14.3.ebuild
 1506042144 ./kde-apps/libkdegames/libkdegames-4.14.3.ebuild
 1506042144 ./kde-apps/khangman/khangman-4.14.3.ebuild
@@ -1276,7 +1276,7 @@
 1506042144 ./kde-apps/kdeartwork-styles/kdeartwork-styles-4.14.3.ebuild
 1506042144 ./kde-apps/keditbookmarks/keditbookmarks-4.14.3.ebuild
 1506042144 ./kde-apps/kdeadmin-meta/kdeadmin-meta-4.14.3.ebuild
-1506042144 ./kde-apps/konqueror/konqueror-4.14.3.ebuild
+1506171601 ./kde-apps/konqueror/konqueror-4.14.3.ebuild
 1506042144 ./kde-apps/kmines/kmines-4.14.3.ebuild
 1506042144 ./kde-apps/krdc/krdc-4.14.3.ebuild
 1506042144 ./kde-apps/bovo/bovo-4.14.3.ebuild
@@ -2294,6 +2294,7 @@
 1505210001 ./net-misc/curl/curl-7.42.1.ebuild
 1505241655 ./net-misc/curl/curl-7.42.1-r1.ebuild
 1504291231 ./net-misc/curl/curl-7.42.0.ebuild
+1506172101 ./net-misc/curl/curl-7.43.0.ebuild
 1311060711 ./net-misc/pcapfix/pcapfix-0.7.ebuild
 1506111031 ./net-misc/strongswan/strongswan-5.3.2.ebuild
 1501172331 ./net-misc/strongswan/strongswan-5.2.2.ebuild
@@ -2885,11 +2886,10 @@
 1408051438 ./net-misc/connman/connman-1.24.ebuild
 1409231352 ./net-misc/connman/connman-1.25.ebuild
 1408110101 ./net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
-1504270331 ./net-misc/stunnel/stunnel-5.08.ebuild
-1504270601 ./net-misc/stunnel/stunnel-5.16-r1.ebuild
 1506161201 ./net-misc/stunnel/stunnel-5.17.ebuild
 1505200931 ./net-misc/stunnel/stunnel-5.14.ebuild
 1506121831 ./net-misc/stunnel/stunnel-5.18.ebuild
+1506171430 ./net-misc/stunnel/stunnel-5.19.ebuild
 1505171233 ./net-misc/rygel/rygel-0.24.4.ebuild
 1503151701 ./net-misc/rygel/rygel-0.24.2.ebuild
 1506091333 ./net-misc/rygel/rygel-0.26.1.ebuild
@@ -4359,10 +4359,10 @@
 1102150256 ./x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.3.1.ebuild
 1108201951 ./x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.0.ebuild
 1502212346 ./x11-drivers/xf86-video-i740/xf86-video-i740-1.3.5.ebuild
-1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
 1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
 1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
 1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+1506180748 ./x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
 1506142001 ./x11-drivers/nvidia-drivers/nvidia-drivers-346.72.ebuild
 1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
 1505301531 ./x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
@@ -4600,7 +4600,7 @@
 1501261401 ./app-arch/lziprecover/lziprecover-1.16.ebuild
 1108172220 ./app-arch/pxz/pxz-9999.ebuild
 1108120059 ./app-arch/pxz/pxz-5.0_pre20110811.ebuild
-1506161201 ./app-arch/p7zip/p7zip-9.20.1-r5.ebuild
+1506180801 ./app-arch/p7zip/p7zip-9.20.1-r5.ebuild
 1505041531 ./app-arch/p7zip/p7zip-9.20.1-r4.ebuild
 1505041523 ./app-arch/p7zip/p7zip-9.38.1-r1.ebuild
 1210242301 ./app-arch/pdv/pdv-1.5.1-r2.ebuild
@@ -4924,11 +4924,12 @@
 1504082131 ./sys-cluster/glusterfs/glusterfs-3.5.3.ebuild
 1408120231 ./sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
 1412282001 ./sys-cluster/slurm/slurm-2.6.3.ebuild
-1505120831 ./sys-cluster/cinder/cinder-2015.1.9999.ebuild
+1506180031 ./sys-cluster/cinder/cinder-2015.1.9999.ebuild
+1506180050 ./sys-cluster/cinder/cinder-2014.2.3-r1.ebuild
+1506180050 ./sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
 1504022201 ./sys-cluster/cinder/cinder-2014.2.2.ebuild
 1504130631 ./sys-cluster/cinder/cinder-2014.2.9999.ebuild
 1504130613 ./sys-cluster/cinder/cinder-2014.2.3.ebuild
-1505120831 ./sys-cluster/cinder/cinder-2015.1.0.ebuild
 1303111758 ./sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
 1504082131 ./sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
 1301181636 ./sys-cluster/resource-agents/resource-agents-3.9.4.ebuild
@@ -5004,8 +5005,8 @@
 1312140011 ./sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
 1505041901 ./sys-cluster/openstack-meta/openstack-meta-2014.2.9999.ebuild
 1505041834 ./sys-cluster/openstack-meta/openstack-meta-2015.1.9999.ebuild
-1505030001 ./sys-cluster/swift/swift-2.3.0.ebuild
-1504141825 ./sys-cluster/swift/swift-2.2.2-r1.ebuild
+1506180031 ./sys-cluster/swift/swift-2.3.0.ebuild
+1506180031 ./sys-cluster/swift/swift-2.2.2-r1.ebuild
 1312140013 ./sys-cluster/projections/projections-6.2.1.ebuild
 1412282001 ./sys-cluster/gearmand/gearmand-0.34-r1.ebuild
 1201120218 ./sys-cluster/classads/classads-1.0.10.ebuild
@@ -5033,9 +5034,9 @@
 1504022201 ./sys-cluster/corosync/corosync-2.3.3.ebuild
 1212021715 ./sys-cluster/c3/c3-4.0.1.ebuild
 1503240731 ./sys-cluster/nova/nova-2014.2.9999.ebuild
+1506180010 ./sys-cluster/nova/nova-2015.1.0-r3.ebuild
 1504130631 ./sys-cluster/nova/nova-2014.2.3.ebuild
-1505270901 ./sys-cluster/nova/nova-2015.1.9999.ebuild
-1505270901 ./sys-cluster/nova/nova-2015.1.0-r2.ebuild
+1506180031 ./sys-cluster/nova/nova-2015.1.9999.ebuild
 1408110031 ./sys-cluster/lspbs/lspbs-1.1-r1.ebuild
 1009291531 ./sys-cluster/onesis/onesis-2.0_rc10.ebuild
 1009291531 ./sys-cluster/onesis/onesis-2.0.2.ebuild
@@ -5305,45 +5306,45 @@
 1411282101 ./dev-ml/fieldslib/fieldslib-109.20.03.ebuild
 1305242048 ./dev-ml/fieldslib/fieldslib-109.20.00.ebuild
 1401191738 ./dev-ml/fieldslib/fieldslib-109.20.02.ebuild
-1505161401 ./dev-qt/qtserialport/qtserialport-5.4.1.ebuild
-1504012344 ./dev-qt/qt-docs/qt-docs-5.4.1_p0.ebuild
-1505161401 ./dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild
+1506171822 ./dev-qt/qtserialport/qtserialport-5.4.2.ebuild
+1506171646 ./dev-qt/qt-docs/qt-docs-5.4.2_p0.ebuild
+1506171821 ./dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
 1505262115 ./dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
 1311071001 ./dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
 1505301431 ./dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
-1505161331 ./dev-qt/qthelp/qthelp-5.4.1.ebuild
+1506171821 ./dev-qt/qthelp/qthelp-5.4.2.ebuild
 1505262109 ./dev-qt/qthelp/qthelp-4.8.7.ebuild
 1505070431 ./dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
 1505301401 ./dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
-1505161431 ./dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild
-1505161431 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild
+1506171819 ./dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
+1506171820 ./dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
 1412311631 ./dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
 1506021531 ./dev-qt/qtdemo/qtdemo-4.8.7.ebuild
 1505301431 ./dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
 1505262116 ./dev-qt/assistant/assistant-4.8.7.ebuild
 1505301401 ./dev-qt/assistant/assistant-4.8.6-r1.ebuild
-1505161401 ./dev-qt/assistant/assistant-5.4.1.ebuild
+1506171818 ./dev-qt/assistant/assistant-5.4.2.ebuild
 1401261555 ./dev-qt/assistant/assistant-4.8.5.ebuild
 1505262112 ./dev-qt/qtscript/qtscript-4.8.7.ebuild
-1505161401 ./dev-qt/qtscript/qtscript-5.4.1.ebuild
+1506171822 ./dev-qt/qtscript/qtscript-5.4.2.ebuild
 1401261556 ./dev-qt/qtscript/qtscript-4.8.5.ebuild
 1505301401 ./dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
-1505161331 ./dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild
+1506171821 ./dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
 1311050131 ./dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
 1505301431 ./dev-qt/qtopenvg/qtopenvg-4.8.6-r1.ebuild
 1505262113 ./dev-qt/qtopenvg/qtopenvg-4.8.7.ebuild
-1505161331 ./dev-qt/qttest/qttest-5.4.1.ebuild
 1401261556 ./dev-qt/qttest/qttest-4.8.5.ebuild
+1506171823 ./dev-qt/qttest/qttest-5.4.2.ebuild
 1505301431 ./dev-qt/qttest/qttest-4.8.6-r1.ebuild
 1505262112 ./dev-qt/qttest/qttest-4.8.7.ebuild
-1505161401 ./dev-qt/qdoc/qdoc-5.4.1.ebuild
-1505161331 ./dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
+1506171819 ./dev-qt/qdoc/qdoc-5.4.2.ebuild
+1506171824 ./dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
 1505301401 ./dev-qt/qtsvg/qtsvg-4.8.6-r1.ebuild
+1506171823 ./dev-qt/qtsvg/qtsvg-5.4.2.ebuild
 1401261556 ./dev-qt/qtsvg/qtsvg-4.8.5.ebuild
 1505262114 ./dev-qt/qtsvg/qtsvg-4.8.7.ebuild
-1505161401 ./dev-qt/qtsvg/qtsvg-5.4.1.ebuild
-1505161401 ./dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild
-1505161431 ./dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild
+1506171821 ./dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
+1506171822 ./dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
 1506042231 ./dev-qt/qtphonon/qtphonon-4.8.7.ebuild
 1506042231 ./dev-qt/qtphonon/qtphonon-4.8.5.ebuild
 1506042231 ./dev-qt/qtphonon/qtphonon-4.8.6-r1.ebuild
@@ -5353,75 +5354,75 @@
 1504012201 ./dev-qt/qt-meta/qt-meta-4.8.5.ebuild
 1505262116 ./dev-qt/linguist/linguist-4.8.7.ebuild
 1505301431 ./dev-qt/linguist/linguist-4.8.6-r1.ebuild
+1506171819 ./dev-qt/linguist/linguist-5.4.2.ebuild
 1401261555 ./dev-qt/linguist/linguist-4.8.5.ebuild
-1505161401 ./dev-qt/linguist/linguist-5.4.1.ebuild
-1505161401 ./dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
+1506171822 ./dev-qt/qtquick1/qtquick1-5.4.2.ebuild
 1505301401 ./dev-qt/qtdeclarative/qtdeclarative-4.8.6-r1.ebuild
 1505262114 ./dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
 1401261555 ./dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
-1505161401 ./dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild
+1506171820 ./dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
 1505262113 ./dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild
-1505161401 ./dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild
+1506171824 ./dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
 1401261556 ./dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
 1505301401 ./dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild
 1505262113 ./dev-qt/qt3support/qt3support-4.8.7.ebuild
 1401261555 ./dev-qt/qt3support/qt3support-4.8.5.ebuild
 1505301401 ./dev-qt/qt3support/qt3support-4.8.6-r1.ebuild
-1505161431 ./dev-qt/qtdiag/qtdiag-5.4.1.ebuild
+1506171820 ./dev-qt/qtdiag/qtdiag-5.4.2.ebuild
 1505301401 ./dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+1506171823 ./dev-qt/qttranslations/qttranslations-5.4.2.ebuild
 1505262112 ./dev-qt/qttranslations/qttranslations-4.8.7.ebuild
-1505161401 ./dev-qt/qttranslations/qttranslations-5.4.1.ebuild
-1505161401 ./dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild
-1505161401 ./dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild
-1505161401 ./dev-qt/qdbus/qdbus-5.4.1.ebuild
+1506171824 ./dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
+1506171819 ./dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
+1506171819 ./dev-qt/qdbus/qdbus-5.4.2.ebuild
 1505262116 ./dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+1506171821 ./dev-qt/qtopengl/qtopengl-5.4.2.ebuild
 1401261556 ./dev-qt/qtopengl/qtopengl-4.8.5.ebuild
-1505161401 ./dev-qt/qtopengl/qtopengl-5.4.1.ebuild
 1505301401 ./dev-qt/qtopengl/qtopengl-4.8.6-r1.ebuild
+1506171824 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
 1401261556 ./dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
 1505262115 ./dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
-1505161401 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild
 1505301401 ./dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6-r1.ebuild
 1505161431 ./dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904.ebuild
 1505101901 ./dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20130904-r2.ebuild
-1505161331 ./dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild
+1506171822 ./dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
 1505301431 ./dev-qt/pixeltool/pixeltool-4.8.6-r1.ebuild
 1505262113 ./dev-qt/pixeltool/pixeltool-4.8.7.ebuild
 1401261555 ./dev-qt/pixeltool/pixeltool-4.8.5.ebuild
-1505161401 ./dev-qt/pixeltool/pixeltool-5.4.1.ebuild
+1506171819 ./dev-qt/pixeltool/pixeltool-5.4.2.ebuild
 1505301431 ./dev-qt/designer/designer-4.8.6-r1.ebuild
 1503181731 ./dev-qt/designer/designer-4.8.5.ebuild
+1506171818 ./dev-qt/designer/designer-5.4.2.ebuild
 1505262115 ./dev-qt/designer/designer-4.8.7.ebuild
-1505161401 ./dev-qt/designer/designer-5.4.1.ebuild
+1506171821 ./dev-qt/qtgui/qtgui-5.4.2.ebuild
 1503312231 ./dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
 1505301401 ./dev-qt/qtgui/qtgui-4.8.6-r4.ebuild
-1505162151 ./dev-qt/qtgui/qtgui-5.4.1-r2.ebuild
 1505262115 ./dev-qt/qtgui/qtgui-4.8.7.ebuild
 1505161431 ./dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r1.ebuild
 1505111844 ./dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20130904-r4.ebuild
 1401261555 ./dev-qt/qtbearer/qtbearer-4.8.5.ebuild
 1505262114 ./dev-qt/qtbearer/qtbearer-4.8.7.ebuild
 1505301431 ./dev-qt/qtbearer/qtbearer-4.8.6-r1.ebuild
-1505161401 ./dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild
-1505161331 ./dev-qt/qtsql/qtsql-5.4.1.ebuild
+1506171822 ./dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
 1505301401 ./dev-qt/qtsql/qtsql-4.8.6-r1.ebuild
 1412281901 ./dev-qt/qtsql/qtsql-4.8.5.ebuild
 1505262113 ./dev-qt/qtsql/qtsql-4.8.7.ebuild
+1506171823 ./dev-qt/qtsql/qtsql-5.4.2.ebuild
+1506171820 ./dev-qt/qtdbus/qtdbus-5.4.2.ebuild
 1505262115 ./dev-qt/qtdbus/qtdbus-4.8.7.ebuild
-1505161331 ./dev-qt/qtdbus/qtdbus-5.4.1.ebuild
 1505301401 ./dev-qt/qtdbus/qtdbus-4.8.6-r1.ebuild
 1401261555 ./dev-qt/qtdbus/qtdbus-4.8.5.ebuild
-1505161401 ./dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild
-1505161401 ./dev-qt/qtwayland/qtwayland-5.4.1.ebuild
-1505161401 ./dev-qt/qtpaths/qtpaths-5.4.1.ebuild
-1505161401 ./dev-qt/qtsensors/qtsensors-5.4.1.ebuild
-1505161331 ./dev-qt/qtxml/qtxml-5.4.1.ebuild
+1506171824 ./dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
+1506171823 ./dev-qt/qtwayland/qtwayland-5.4.2.ebuild
+1506171822 ./dev-qt/qtpaths/qtpaths-5.4.2.ebuild
+1506171822 ./dev-qt/qtsensors/qtsensors-5.4.2.ebuild
+1506171824 ./dev-qt/qtxml/qtxml-5.4.2.ebuild
 1505262114 ./dev-qt/qtcore/qtcore-4.8.7.ebuild
 1505301401 ./dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
 1503290701 ./dev-qt/qtcore/qtcore-4.8.5-r2.ebuild
-1505170501 ./dev-qt/qtcore/qtcore-5.4.1.ebuild
-1505161401 ./dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild
+1506171820 ./dev-qt/qtcore/qtcore-5.4.2.ebuild
 1505301431 ./dev-qt/qdbusviewer/qdbusviewer-4.8.6-r1.ebuild
+1506171819 ./dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
 1401261555 ./dev-qt/qdbusviewer/qdbusviewer-4.8.5.ebuild
 1505262114 ./dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
 1505301401 ./dev-qt/qtchooser/qtchooser-0_p20150102.ebuild
@@ -5504,6 +5505,7 @@
 1505110101 ./sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
 1505110101 ./sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
 1505110101 ./sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
+1506180733 ./sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
 1505110101 ./sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
 1307131529 ./sci-geosciences/xtide/xtide-2.13.1.ebuild
 1310271239 ./sci-geosciences/xtide/xtide-2.13.ebuild
@@ -6004,7 +6006,7 @@
 1505131531 ./sci-visualization/veusz/veusz-1.22.ebuild
 1504082131 ./sci-visualization/veusz/veusz-1.20.ebuild
 1409231603 ./sci-visualization/veusz/veusz-1.21.1.ebuild
-1505131518 ./sci-visualization/veusz/veusz-1.23.ebuild
+1506172131 ./sci-visualization/veusz/veusz-1.23.ebuild
 1105152151 ./sci-visualization/veusz/veusz-1.11.ebuild
 1504082131 ./sci-visualization/veusz/veusz-1.21.ebuild
 1504082131 ./sci-visualization/qtiplot/qtiplot-0.9.8.9-r2.ebuild
@@ -6552,7 +6554,7 @@
 1503021231 ./app-admin/logrotate/logrotate-3.8.8.ebuild
 1411021101 ./app-admin/logrotate/logrotate-3.8.7.ebuild
 1505131001 ./app-admin/logrotate/logrotate-3.8.9.ebuild
-1506111731 ./app-admin/logrotate/logrotate-3.8.9-r1.ebuild
+1506172201 ./app-admin/logrotate/logrotate-3.8.9-r1.ebuild
 1202170001 ./app-admin/lsat/lsat-0.9.7.1-r1.ebuild
 1205131601 ./app-admin/cronolog/cronolog-1.6.2-r4.ebuild
 0910120320 ./app-admin/cronolog/cronolog-1.6.2-r3.ebuild
@@ -6724,7 +6726,7 @@
 1506170536 ./dev-java/dom4j/dom4j-1.6.1-r5.ebuild
 1306280201 ./dev-java/dom4j/dom4j-1.6.1-r4.ebuild
 1506090001 ./dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
-1506161031 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
+1506171101 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
 1408110031 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild
 1408110031 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
 1309252140 ./dev-java/classmate/classmate-0.9.0.ebuild
@@ -6770,8 +6772,7 @@
 1310202101 ./dev-java/ant-apache-resolver/ant-apache-resolver-1.9.2.ebuild
 1205251531 ./dev-java/ant-apache-resolver/ant-apache-resolver-1.8.2.ebuild
 1307051517 ./dev-java/ant-apache-resolver/ant-apache-resolver-1.9.1.ebuild
-1504161701 ./dev-java/jnr-unixsocket/jnr-unixsocket-0.3.ebuild
-1504161634 ./dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
+1506172031 ./dev-java/jnr-unixsocket/jnr-unixsocket-0.6.ebuild
 1210191231 ./dev-java/jaxp/jaxp-1.4-r1.ebuild
 1409061144 ./dev-java/codemodel/codemodel-2.1-r1.ebuild
 1504212231 ./dev-java/codemodel/codemodel-2.6.ebuild
@@ -7027,13 +7028,8 @@
 1403040401 ./dev-java/commons-math/commons-math-3.2.ebuild
 1012120936 ./dev-java/commons-math/commons-math-2.1-r1.ebuild
 1302171401 ./dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
-1307120159 ./dev-java/jnr-constants/jnr-constants-0.8.4.ebuild
-1503220231 ./dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
+1506171231 ./dev-java/jnr-constants/jnr-constants-0.8.6.ebuild
 1308171218 ./dev-java/jnr-constants/jnr-constants-0.8.3-r1.ebuild
-1205092131 ./dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
-1208100131 ./dev-java/jnr-constants/jnr-constants-0.8.3.ebuild
-1308171218 ./dev-java/jnr-constants/jnr-constants-0.8.2-r1.ebuild
-1503212201 ./dev-java/jnr-constants/jnr-constants-0.8.5.ebuild
 1307081714 ./dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
 1208241631 ./dev-java/commons-daemon/commons-daemon-1.0.9.ebuild
 1203091831 ./dev-java/commons-daemon/commons-daemon-1.0.7.ebuild
@@ -7054,15 +7050,11 @@
 1001282052 ./dev-java/freehep-swing/freehep-swing-2.0.3.ebuild
 1302181606 ./dev-java/jebl/jebl-2013.02.18.ebuild
 0910252139 ./dev-java/jebl/jebl-9999.ebuild
-1503212231 ./dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild
-1504030201 ./dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
-1411131811 ./dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
-1504030131 ./dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
+1506172001 ./dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+1506172001 ./dev-java/jnr-ffi/jnr-ffi-0.7.11-r1.ebuild
+1506172001 ./dev-java/jnr-ffi/jnr-ffi-1.0.10.ebuild
 1205281901 ./dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
 1308311931 ./dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
-1209251504 ./dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild
-1309171828 ./dev-java/jnr-ffi/jnr-ffi-0.7.11.ebuild
-1302071757 ./dev-java/jnr-ffi/jnr-ffi-0.7.9.ebuild
 1401162131 ./dev-java/groovy/groovy-1.8.5-r1.ebuild
 1401162131 ./dev-java/groovy/groovy-1.7.5.ebuild
 1401162131 ./dev-java/groovy/groovy-1.6.8.ebuild
@@ -7168,11 +7160,7 @@
 1408110031 ./dev-java/jacl/jacl-1.3.3.ebuild
 1408110031 ./dev-java/jacl/jacl-1.4.1.ebuild
 1408110031 ./dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild
-1408110031 ./dev-java/jnr-netdb/jnr-netdb-1.1.2.ebuild
-1408110031 ./dev-java/jnr-netdb/jnr-netdb-1.0.6.ebuild
-1504030201 ./dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
-1408110031 ./dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild
-1503220101 ./dev-java/jnr-netdb/jnr-netdb-1.1.2-r1.ebuild
+1506172031 ./dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
 1311252301 ./dev-java/jcommander/jcommander-1.32.ebuild
 1310202101 ./dev-java/ant-trax/ant-trax-1.9.2.ebuild
 1307051832 ./dev-java/ant-trax/ant-trax-1.9.1.ebuild
@@ -7196,8 +7184,7 @@
 1001282048 ./dev-java/freehep-graphicsio-pdf/freehep-graphicsio-pdf-2.1.1.ebuild
 1410280901 ./dev-java/openspml/openspml-0.5-r1.ebuild
 0708160406 ./dev-java/openspml/openspml-0.5.ebuild
-1504022131 ./dev-java/jnr-enxio/jnr-enxio-0.4.ebuild
-1504031231 ./dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
+1506172201 ./dev-java/jnr-enxio/jnr-enxio-0.7.ebuild
 1407151222 ./dev-java/netty-transport/netty-transport-4.0.21.ebuild
 1405211448 ./dev-java/netty-transport/netty-transport-4.0.19.ebuild
 1502240001 ./dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -7381,7 +7368,7 @@
 1408110031 ./dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
 1408110031 ./dev-java/hamcrest-core/hamcrest-core-1.1.ebuild
 1408110031 ./dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
-1506161031 ./dev-java/batik/batik-1.8.ebuild
+1506171101 ./dev-java/batik/batik-1.8.ebuild
 1303271401 ./dev-java/batik/batik-1.7-r3.ebuild
 1112191554 ./dev-java/commons-vfs/commons-vfs-1.0.ebuild
 1307101543 ./dev-java/commons-vfs/commons-vfs-2.0-r1.ebuild
@@ -7538,7 +7525,7 @@
 1502212231 ./dev-java/guava/guava-18.0.ebuild
 1502212231 ./dev-java/guava/guava-17.0.ebuild
 1001032325 ./dev-java/commons-httpclient/commons-httpclient-3.1.ebuild
-1506161031 ./dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
+1506171101 ./dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild
 1112191633 ./dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
 1001282049 ./dev-java/freehep-io/freehep-io-2.0.2.ebuild
 1503081243 ./dev-java/gson/gson-2.3.1.ebuild
@@ -7602,7 +7589,7 @@
 1001282047 ./dev-java/freehep-graphics2d/freehep-graphics2d-2.1.1.ebuild
 1503060223 ./dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.5.1.ebuild
 0712170135 ./dev-java/laf-plugin/laf-plugin-0.2.ebuild
-1505211301 ./dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
+1506171401 ./dev-java/netbeans-websvccommon/netbeans-websvccommon-8.0.2.ebuild
 1205120731 ./dev-java/sun-jaf/sun-jaf-1.1.1.ebuild
 1408110031 ./dev-java/cos/cos-20021105-r3.ebuild
 1405010201 ./dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
@@ -7641,17 +7628,9 @@
 1505302301 ./dev-java/jsr181/jsr181-1.0-r1.ebuild
 1505211131 ./dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
 1504022131 ./dev-java/spring-aop/spring-aop-3.2.4.ebuild
-1309272026 ./dev-java/jnr-posix/jnr-posix-3.0.1.ebuild
-1307120157 ./dev-java/jnr-posix/jnr-posix-2.5.0.ebuild
-1503220231 ./dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild
-1007171307 ./dev-java/jnr-posix/jnr-posix-1.1.4.ebuild
-1309171840 ./dev-java/jnr-posix/jnr-posix-3.0.0.ebuild
-1209251447 ./dev-java/jnr-posix/jnr-posix-2.3.0.ebuild
-1302071823 ./dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
-1309171840 ./dev-java/jnr-posix/jnr-posix-2.5.2.ebuild
-1201121606 ./dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
+1506172031 ./dev-java/jnr-posix/jnr-posix-3.0.1-r1.ebuild
+1506172031 ./dev-java/jnr-posix/jnr-posix-2.4.0.ebuild
 1308171221 ./dev-java/jnr-posix/jnr-posix-1.1.8-r1.ebuild
-1503220217 ./dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
 1506090031 ./dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
 1505211301 ./dev-java/netbeans-webcommon/netbeans-webcommon-8.0.2.ebuild
 1504022131 ./dev-java/janino/janino-2.7.0.ebuild
@@ -7913,7 +7892,7 @@
 1506041739 ./www-client/links/links-2.9-r1.ebuild
 1501061911 ./www-client/links/links-2.9.ebuild
 1506041801 ./www-client/links/links-2.8-r1.ebuild
-1506082332 ./www-client/chromium/chromium-45.0.2421.0.ebuild
+1506172147 ./www-client/chromium/chromium-45.0.2431.0.ebuild
 1506042231 ./www-client/chromium/chromium-44.0.2403.18.ebuild
 1506042231 ./www-client/chromium/chromium-43.0.2357.65.ebuild
 1506121828 ./www-client/chromium/chromium-45.0.2427.7.ebuild
@@ -7991,6 +7970,7 @@
 1506042231 ./www-client/qupzilla/qupzilla-1.8.6.ebuild
 1408110031 ./www-client/netrik/netrik-1.16.1-r1.ebuild
 1506111819 ./www-client/google-chrome-beta/google-chrome-beta-44.0.2403.39_p1.ebuild
+1506180757 ./www-client/opera-beta/opera-beta-31.0.1889.16.ebuild
 1506030802 ./www-client/opera-beta/opera-beta-30.0.1835.49.ebuild
 1504082131 ./www-client/weboob/weboob-9999.ebuild
 1504082131 ./www-client/weboob/weboob-9998.ebuild
@@ -9242,6 +9222,7 @@
 1206081601 ./app-misc/rioutil/rioutil-1.5.0-r2.ebuild
 1506131301 ./app-misc/bijiben/bijiben-3.16.2.ebuild
 1503181831 ./app-misc/bijiben/bijiben-3.14.2.ebuild
+1506180747 ./app-misc/dateutils/dateutils-0.3.3.ebuild
 1503081950 ./app-misc/dateutils/dateutils-0.3.2.ebuild
 1412080335 ./app-misc/dateutils/dateutils-0.3.1.ebuild
 1401300951 ./app-misc/dateutils/dateutils-0.2.7.ebuild
@@ -9472,9 +9453,8 @@
 1503311531 ./sys-auth/fingerprint-gui/fingerprint-gui-1.05.ebuild
 1503311531 ./sys-auth/fingerprint-gui/fingerprint-gui-1.05-r1.ebuild
 1504092131 ./sys-auth/pam-csync/pam-csync-0.42.0-r1.ebuild
-1505152131 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
 1505152112 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
-1506152127 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
+1506180101 ./sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
 1408110031 ./sys-auth/libnss-cache/libnss-cache-0.10.2.ebuild
 1408110031 ./sys-auth/libnss-cache/libnss-cache-0.1-r1.ebuild
 1408110031 ./sys-auth/libnss-cache/libnss-cache-0.10.1.ebuild
@@ -10098,12 +10078,7 @@
 1505111925 ./dev-libs/go-usb/go-usb-9999.ebuild
 1504100331 ./dev-libs/ding-libs/ding-libs-0.4.0.ebuild
 1408261313 ./dev-libs/busybee/busybee-0.5.2.ebuild
-1405221217 ./dev-libs/busybee/busybee-0.5.0.ebuild
 1505281215 ./dev-libs/busybee/busybee-0.6.0.ebuild
-1311200747 ./dev-libs/busybee/busybee-0.4.0.ebuild
-1402210653 ./dev-libs/busybee/busybee-0.4.1.ebuild
-1408250958 ./dev-libs/busybee/busybee-0.5.1.ebuild
-1208181810 ./dev-libs/busybee/busybee-0.1.0.ebuild
 1505271701 ./dev-libs/dbus-glib/dbus-glib-0.102.ebuild
 1412240401 ./dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
 1506071331 ./dev-libs/appstream-glib/appstream-glib-0.3.4.ebuild
@@ -10198,7 +10173,7 @@
 1506111731 ./dev-libs/apr/apr-1.5.2.ebuild
 1505301731 ./dev-libs/apr/apr-1.5.0-r2.ebuild
 1505271731 ./dev-libs/openssl/openssl-0.9.8z_p6.ebuild
-1506151601 ./dev-libs/openssl/openssl-0.9.8z_p7.ebuild
+1506172231 ./dev-libs/openssl/openssl-0.9.8z_p7.ebuild
 1506111857 ./dev-libs/openssl/openssl-1.0.1n.ebuild
 1506111857 ./dev-libs/openssl/openssl-1.0.2b.ebuild
 1503192131 ./dev-libs/openssl/openssl-1.0.1l-r1.ebuild
@@ -10208,7 +10183,7 @@
 1503192101 ./dev-libs/openssl/openssl-0.9.8z_p5-r1.ebuild
 1503200231 ./dev-libs/openssl/openssl-1.0.0r.ebuild
 1505271731 ./dev-libs/openssl/openssl-1.0.1m.ebuild
-1506151601 ./dev-libs/openssl/openssl-1.0.1o.ebuild
+1506172231 ./dev-libs/openssl/openssl-1.0.1o.ebuild
 1505271431 ./dev-libs/libRocket/libRocket-1.2.1_p20130110-r1.ebuild
 1504082101 ./dev-libs/libRocket/libRocket-1.3.0.0.ebuild
 1504082101 ./dev-libs/libRocket/libRocket-9999.ebuild
@@ -10223,15 +10198,8 @@
 1506111731 ./dev-libs/apr-util/apr-util-1.5.4.ebuild
 0801151201 ./dev-libs/libezV24/libezV24-0.1.1.ebuild
 1205042301 ./dev-libs/tre/tre-0.8.0.ebuild
-1407110637 ./dev-libs/replicant/replicant-0.6.1.ebuild
 1408261314 ./dev-libs/replicant/replicant-0.6.4.ebuild
-1402210725 ./dev-libs/replicant/replicant-0.4.0.ebuild
-1408251010 ./dev-libs/replicant/replicant-0.6.3.ebuild
-1404301328 ./dev-libs/replicant/replicant-0.5.0.ebuild
-1407291032 ./dev-libs/replicant/replicant-0.6.2.ebuild
-1505281238 ./dev-libs/replicant/replicant-0.7.0.ebuild
-1312110744 ./dev-libs/replicant/replicant-0.3.1.ebuild
-1405221222 ./dev-libs/replicant/replicant-0.6.0.ebuild
+1506180544 ./dev-libs/replicant/replicant-0.7.1.ebuild
 1503010101 ./dev-libs/nettle/nettle-2.7.1-r2.ebuild
 1406100501 ./dev-libs/nettle/nettle-2.7.1.ebuild
 1503010034 ./dev-libs/nettle/nettle-2.7.1-r3.ebuild
@@ -10308,8 +10276,6 @@
 1312021129 ./dev-libs/xmlwrapp/xmlwrapp-0.6.3.ebuild
 1403191801 ./dev-libs/xmlwrapp/xmlwrapp-0.7.1.ebuild
 1312021301 ./dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild
-1407291110 ./dev-libs/hyperleveldb/hyperleveldb-1.2.0.ebuild
-1408251009 ./dev-libs/hyperleveldb/hyperleveldb-1.2.1.ebuild
 1409180714 ./dev-libs/hyperleveldb/hyperleveldb-1.2.2.ebuild
 1202292301 ./dev-libs/gf2x/gf2x-1.0-r1.ebuild
 1212280523 ./dev-libs/gf2x/gf2x-1.1.ebuild
@@ -10595,8 +10561,8 @@
 1412261313 ./dev-libs/libevent/libevent-9999.ebuild
 1501161131 ./dev-libs/libevent/libevent-2.0.22.ebuild
 1503201331 ./dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
+1506180551 ./dev-libs/libe/libe-0.10.1.ebuild
 1501130535 ./dev-libs/libe/libe-0.9.0.ebuild
-1505300231 ./dev-libs/libe/libe-0.10.0.ebuild
 1505132201 ./dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
 1412272311 ./dev-libs/gnulib/gnulib-2013.10.28.22.33.52.ebuild
 1411121431 ./dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -11349,11 +11315,12 @@
 1505241655 ./www-apache/mod_h2/mod_h2-0.6.0.ebuild
 1506010908 ./www-apache/mod_h2/mod_h2-0.6.1.ebuild
 1506111719 ./www-apache/mod_h2/mod_h2-0.6.5.ebuild
-1506101431 ./www-apache/mod_h2/mod_h2-9999.ebuild
+1506172101 ./www-apache/mod_h2/mod_h2-9999.ebuild
 1506101430 ./www-apache/mod_h2/mod_h2-0.6.4.ebuild
 1506011740 ./www-apache/mod_h2/mod_h2-0.6.3.ebuild
 1506121332 ./www-apache/mod_h2/mod_h2-0.6.6.ebuild
 1506011630 ./www-apache/mod_h2/mod_h2-0.6.2.ebuild
+1506172049 ./www-apache/mod_h2/mod_h2-0.7.0.ebuild
 1503270357 ./www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild
 1408110031 ./www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-1.0.ebuild
 1106051942 ./www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild
@@ -12811,7 +12778,6 @@
 1504081131 ./dev-python/inotifyx/inotifyx-0.2.0-r1.ebuild
 1506010743 ./dev-python/inotifyx/inotifyx-0.2.2.ebuild
 1506092201 ./dev-python/atpy/atpy-0.9.7.ebuild
-1503300017 ./dev-python/sip/sip-4.16.7.ebuild
 1504141601 ./dev-python/sip/sip-4.16.2.ebuild
 1506141639 ./dev-python/sip/sip-4.16.8.ebuild
 1504081131 ./dev-python/sip/sip-4.15.3.ebuild
@@ -12819,10 +12785,7 @@
 1506160054 ./dev-python/tzlocal/tzlocal-1.2.ebuild
 1503090301 ./dev-python/ioflo/ioflo-1.0.2.ebuild
 1505070003 ./dev-python/ioflo/ioflo-1.2.1.ebuild
-1504081131 ./dev-python/hgtools/hgtools-2.0.2-r1.ebuild
-1504081131 ./dev-python/hgtools/hgtools-4.0.ebuild
-1504081131 ./dev-python/hgtools/hgtools-3.0.2.ebuild
-1504081131 ./dev-python/hgtools/hgtools-2.0.2.ebuild
+1506171115 ./dev-python/hgtools/hgtools-6.3.ebuild
 1504081131 ./dev-python/hgtools/hgtools-6.0.ebuild
 1503090301 ./dev-python/futures/futures-2.2.0.ebuild
 1506161151 ./dev-python/futures/futures-3.0.2.ebuild
@@ -13001,7 +12964,7 @@
 1503090301 ./dev-python/git-python/git-python-0.3.6.ebuild
 1504081131 ./dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
 1202221331 ./dev-python/pycryptopp/pycryptopp-0.5.29.ebuild
-1504081131 ./dev-python/gevent-websocket/gevent-websocket-0.9.2.ebuild
+1506171017 ./dev-python/gevent-websocket/gevent-websocket-0.9.5.ebuild
 1504081131 ./dev-python/gevent-websocket/gevent-websocket-0.9.3.ebuild
 1503090301 ./dev-python/django-setuptest/django-setuptest-0.1.6.ebuild
 1504081131 ./dev-python/pywavelets/pywavelets-0.2.2-r1.ebuild
@@ -13172,6 +13135,7 @@
 1504081131 ./dev-python/llvmpy/llvmpy-0.12.5.ebuild
 1504081131 ./dev-python/llvmpy/llvmpy-0.12.2.ebuild
 1504081131 ./dev-python/llvmpy/llvmpy-0.12.7.ebuild
+1506171420 ./dev-python/alabaster/alabaster-0.7.5.ebuild
 1505261929 ./dev-python/alabaster/alabaster-0.7.4.ebuild
 1505101231 ./dev-python/alabaster/alabaster-0.7.2.ebuild
 1503181001 ./dev-python/alabaster/alabaster-0.6.3.ebuild
@@ -13315,8 +13279,7 @@
 1503090301 ./dev-python/librharris/librharris-0.1.14-r1.ebuild
 1504081131 ./dev-python/dingus/dingus-0.3.4-r1.ebuild
 1504081131 ./dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
-1504081131 ./dev-python/pastescript/pastescript-1.7.5-r2.ebuild
-1506161031 ./dev-python/pastescript/pastescript-2.0.2.ebuild
+1506171101 ./dev-python/pastescript/pastescript-2.0.2.ebuild
 1504081131 ./dev-python/sampy/sampy-1.2.1.ebuild
 1505151208 ./dev-python/ptpython/ptpython-0.10.ebuild
 1506031111 ./dev-python/ptpython/ptpython-0.11.ebuild
@@ -13494,10 +13457,11 @@
 1504081131 ./dev-python/pbkdf2/pbkdf2-1.3.ebuild
 1504081131 ./dev-python/pillow/pillow-2.5.3-r1.ebuild
 1506151131 ./dev-python/pillow/pillow-2.8.2.ebuild
-1506151131 ./dev-python/pillow/pillow-2.8.1.ebuild
+1506171201 ./dev-python/pillow/pillow-2.8.1.ebuild
 1506081001 ./dev-python/django-haystack/django-haystack-2.3.1.ebuild
 1506081001 ./dev-python/django-haystack/django-haystack-2.2.0.ebuild
 1504081131 ./dev-python/nltk/nltk-3.0.2.ebuild
+1506171006 ./dev-python/nltk/nltk-3.0.3.ebuild
 1504081131 ./dev-python/nltk/nltk-2.0.4.ebuild
 1503180531 ./dev-python/nltk/nltk-2.0_beta9.ebuild
 1504081131 ./dev-python/python-etcd/python-etcd-0.3.2.ebuild
@@ -13544,7 +13508,7 @@
 1504081131 ./dev-python/paste/paste-1.7.5.1-r1.ebuild
 1410160331 ./dev-python/paste/paste-1.7.5.1.ebuild
 1504081131 ./dev-python/paste/paste-1.7.5.1-r2.ebuild
-1506161031 ./dev-python/paste/paste-2.0.2.ebuild
+1506171101 ./dev-python/paste/paste-2.0.2.ebuild
 1504081131 ./dev-python/numdisplay/numdisplay-1.6.0-r1.ebuild
 1501060451 ./dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
 1502281001 ./dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild
@@ -14108,7 +14072,6 @@
 1503281001 ./dev-python/jsonpickle/jsonpickle-0.9.1.ebuild
 1505301101 ./dev-python/terminado/terminado-0.5.ebuild
 1506141731 ./dev-python/PyQt4/PyQt4-4.11.4.ebuild
-1505112101 ./dev-python/PyQt4/PyQt4-4.11.3.ebuild
 1504081131 ./dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild
 1504141601 ./dev-python/PyQt4/PyQt4-4.11.1.ebuild
 1504302331 ./dev-python/oslo-concurrency/oslo-concurrency-1.8.0.ebuild
@@ -14308,8 +14271,7 @@
 1504042331 ./dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
 1505070031 ./dev-python/raet/raet-0.6.1.ebuild
 1411130355 ./dev-python/raet/raet-0.3.8.ebuild
-1504081131 ./dev-python/pypam/pypam-0.5.0-r2.ebuild
-1506161031 ./dev-python/pypam/pypam-0.5.0-r3.ebuild
+1506171101 ./dev-python/pypam/pypam-0.5.0-r3.ebuild
 1504081131 ./dev-python/gevent-zeromq/gevent-zeromq-0.2.5-r1.ebuild
 1504081131 ./dev-python/testrepository/testrepository-0.0.17-r2.ebuild
 1504141601 ./dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -14517,12 +14479,7 @@
 1505052113 ./dev-python/setuptools/setuptools-15.2.ebuild
 1506020831 ./dev-python/setuptools/setuptools-12.0.1.ebuild
 1504042112 ./dev-python/setuptools/setuptools-15.0.ebuild
-1410301401 ./dev-python/bokeh/bokeh-0.5.0.ebuild
-1407071156 ./dev-python/bokeh/bokeh-0.4.4.ebuild
 1503090331 ./dev-python/bokeh/bokeh-0.7.1.ebuild
-1407171101 ./dev-python/bokeh/bokeh-0.4.ebuild
-1407171101 ./dev-python/bokeh/bokeh-0.4.1.ebuild
-1407171101 ./dev-python/bokeh/bokeh-0.4.2.ebuild
 1506071231 ./dev-python/rsa/rsa-3.1.4-r1.ebuild
 1501311237 ./dev-python/natsort/natsort-3.5.2.ebuild
 1504141601 ./dev-python/natsort/natsort-3.4.0.ebuild
@@ -14543,7 +14500,7 @@
 1504081131 ./dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
 1503031001 ./dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
 1501151401 ./dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild
-1506131431 ./dev-python/eyeD3/eyeD3-0.7.5.ebuild
+1506171201 ./dev-python/eyeD3/eyeD3-0.7.5.ebuild
 1408010851 ./dev-python/python-glanceclient/python-glanceclient-0.13.1.ebuild
 1506112011 ./dev-python/python-glanceclient/python-glanceclient-0.19.0.ebuild
 1411190134 ./dev-python/python-glanceclient/python-glanceclient-0.14.2.ebuild
@@ -14676,9 +14633,11 @@
 1504081131 ./dev-python/psutil/psutil-1.2.1.ebuild
 1501101026 ./dev-python/psutil/psutil-2.2.0.ebuild
 1412051331 ./dev-python/psutil/psutil-2.1.3.ebuild
+1506180743 ./dev-python/psutil/psutil-3.0.1.ebuild
 1502070550 ./dev-python/psutil/psutil-2.2.1.ebuild
 1504151145 ./dev-python/mistune/mistune-0.5.1.ebuild
 1502281444 ./dev-python/mistune/mistune-0.5.ebuild
+1506171418 ./dev-python/mistune/mistune-0.6.ebuild
 1504081131 ./dev-python/python-gtkmvc/python-gtkmvc-1.99.1.ebuild
 1504181601 ./dev-python/tdaemon/tdaemon-0.1.6.ebuild
 1503090301 ./dev-python/manuel/manuel-1.7.1.ebuild
@@ -14970,10 +14929,12 @@
 1506081236 ./dev-python/cmd2/cmd2-0.6.8.ebuild
 1503011724 ./dev-python/into/into-0.2.1.ebuild
 1503090301 ./dev-python/into/into-0.1.3.ebuild
+1506180522 ./dev-python/into/into-0.2.2.ebuild
 1504141601 ./dev-python/reportlab/reportlab-3.1.8-r2.ebuild
 1501021601 ./dev-python/reportlab/reportlab-3.1.8-r1.ebuild
 1506112231 ./dev-python/reportlab/reportlab-3.1.44-r1.ebuild
 1412120301 ./dev-python/reportlab/reportlab-2.6.ebuild
+1506171140 ./dev-python/flask-admin/flask-admin-1.2.0.ebuild
 1503090301 ./dev-python/flask-admin/flask-admin-1.0.6.ebuild
 1506141841 ./dev-python/flask-admin/flask-admin-1.1.0.ebuild
 1503090301 ./dev-python/irc/irc-11.0.1.ebuild
@@ -15005,6 +14966,7 @@
 1504081131 ./dev-python/sqlalchemy/sqlalchemy-0.8.1.ebuild
 1504081131 ./dev-python/sqlalchemy/sqlalchemy-0.8.3.ebuild
 1504081131 ./dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
+1506171036 ./dev-python/sqlalchemy/sqlalchemy-1.0.5.ebuild
 1506020831 ./dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
 1407291501 ./dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
 1504081131 ./dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -16803,7 +16765,7 @@
 1009171739 ./x11-base/nouveau-drm/nouveau-drm-20100811.ebuild
 1111011829 ./x11-base/nouveau-drm/nouveau-drm-20111101.ebuild
 1503312131 ./x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
-1506142301 ./x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+1506171201 ./x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
 1503312131 ./x11-base/xorg-server/xorg-server-1.17.1.ebuild
 1503312131 ./x11-base/xorg-server/xorg-server-1.17.1-r1.ebuild
 1503312131 ./x11-base/xorg-server/xorg-server-1.12.4-r4.ebuild
@@ -17587,8 +17549,8 @@
 1306151020 ./dev-lang/nwcc/nwcc-0.8.2.ebuild
 1506131152 ./dev-lang/swi-prolog/swi-prolog-7.3.1.ebuild
 1503021301 ./dev-lang/swi-prolog/swi-prolog-6.6.6.ebuild
-1504301608 ./dev-lang/swi-prolog/swi-prolog-7.1.37.ebuild
-1504301608 ./dev-lang/swi-prolog/swi-prolog-7.1.36.ebuild
+1506171727 ./dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
+1506171737 ./dev-lang/swi-prolog/swi-prolog-7.3.2.ebuild
 1505161747 ./dev-lang/swi-prolog/swi-prolog-7.3.0.ebuild
 1505240032 ./dev-lang/ekopath/ekopath-6.0.373_p20150519.ebuild
 1506061446 ./dev-lang/ekopath/ekopath-6.0.396_p20150605.ebuild
@@ -18031,7 +17993,8 @@
 1007130014 ./net-libs/libbt/libbt-1.05.ebuild
 1007130020 ./net-libs/libbt/libbt-1.06.ebuild
 1504082131 ./net-libs/dslib/dslib-3.0-r1.ebuild
-1505241655 ./net-libs/nghttp2/nghttp2-9999.ebuild
+1506172045 ./net-libs/nghttp2/nghttp2-1.0.2.ebuild
+1506172101 ./net-libs/nghttp2/nghttp2-9999.ebuild
 1506040731 ./net-libs/nghttp2/nghttp2-0.7.15.ebuild
 1506040731 ./net-libs/nghttp2/nghttp2-1.0.1.ebuild
 1403020232 ./net-libs/librouteros/librouteros-1.1.2.ebuild
@@ -18095,7 +18058,7 @@
 1410111631 ./net-libs/libsoup-gnome/libsoup-gnome-2.46.0.ebuild
 1503151631 ./net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild
 1502090031 ./net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
-1506130805 ./net-libs/libssh2/libssh2-1.6.0.ebuild
+1506172131 ./net-libs/libssh2/libssh2-1.6.0.ebuild
 1503301331 ./net-libs/libssh2/libssh2-1.5.0.ebuild
 1505271356 ./net-libs/libssh2/libssh2-9999.ebuild
 1502282301 ./net-libs/czmq/czmq-2.2.0-r2.ebuild
@@ -18202,6 +18165,7 @@
 1412151901 ./net-libs/gupnp-av/gupnp-av-0.12.6.ebuild
 1303141109 ./net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
 1412261201 ./net-libs/vanessa-socket/vanessa-socket-0.0.12.ebuild
+1506180709 ./net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
 1406230921 ./net-libs/qtweetlib/qtweetlib-9999.ebuild
 1406230921 ./net-libs/qtweetlib/qtweetlib-0.5.ebuild
 1504280901 ./net-libs/libpcap/libpcap-1.6.2-r1.ebuild
@@ -18314,10 +18278,11 @@
 1504101101 ./net-libs/gnutls/gnutls-3.3.12.ebuild
 1505161201 ./net-libs/gnutls/gnutls-2.12.23-r6.ebuild
 1505032208 ./net-libs/gnutls/gnutls-3.4.1.ebuild
-1506162357 ./net-libs/gnutls/gnutls-3.4.2.ebuild
 1504101131 ./net-libs/gnutls/gnutls-3.3.14.ebuild
+1506172142 ./net-libs/gnutls/gnutls-3.3.15-r1.ebuild
 1504271601 ./net-libs/gnutls/gnutls-3.3.10-r2.ebuild
-1505271601 ./net-libs/gnutls/gnutls-3.3.15.ebuild
+1506171201 ./net-libs/gnutls/gnutls-3.3.15.ebuild
+1506172142 ./net-libs/gnutls/gnutls-3.4.2-r1.ebuild
 1503081609 ./net-libs/socket_wrapper/socket_wrapper-1.1.3.ebuild
 1506150231 ./net-libs/qmf/qmf-4.0.3.ebuild
 1405201402 ./net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -19269,7 +19234,7 @@
 1408110101 ./dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.1.ebuild
 1502281731 ./dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2.ebuild
 1401262231 ./dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0.ebuild
-1506111031 ./dev-php/suhosin/suhosin-0.9.38.ebuild
+1506171201 ./dev-php/suhosin/suhosin-0.9.38.ebuild
 1502282331 ./dev-php/suhosin/suhosin-0.9.37.1.ebuild
 1505081201 ./dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.0.ebuild
 1408110131 ./dev-php/pecl-radius/pecl-radius-1.2.7.ebuild
@@ -19291,7 +19256,6 @@
 1408110101 ./dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild
 1408110101 ./dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
 1502170407 ./dev-php/pecl-drizzle/pecl-drizzle-0.4.2-r3.ebuild
-1408110101 ./dev-php/adodb/adodb-5.17-r1.ebuild
 1408110101 ./dev-php/adodb/adodb-5.18.ebuild
 1401042336 ./dev-php/pecl-yaml/pecl-yaml-1.1.1.ebuild
 1504290314 ./dev-php/pecl-yaml/pecl-yaml-1.1.1-r1.ebuild
@@ -19482,8 +19446,8 @@
 1503150508 ./dev-php/PHPonTrax/PHPonTrax-0.18.0.ebuild
 1410011651 ./dev-php/pecl-xrange/pecl-xrange-1.3.2-r1.ebuild
 1409300432 ./dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r1.ebuild
-1504142131 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild
-1410102101 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
+1506172131 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.9.5.ebuild
+1506172131 ./dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
 1408110101 ./dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5.ebuild
 1408110101 ./dev-php/PEAR-Text_Password/PEAR-Text_Password-1.1.1.ebuild
 1408110101 ./dev-php/Savant3-Plugin-Form/Savant3-Plugin-Form-0.2.1.ebuild
@@ -19859,6 +19823,7 @@
 1305050301 ./dev-util/wiggle/wiggle-0.9.ebuild
 1303030301 ./dev-util/wiggle/wiggle-0.8-r1.ebuild
 1501180416 ./dev-util/radare2/radare2-0.9.8.ebuild
+1506171106 ./dev-util/radare2/radare2-0.9.9.ebuild
 1501291433 ./dev-util/radare2/radare2-9999.ebuild
 1504082101 ./dev-util/geany-plugins/geany-plugins-1.24-r1.ebuild
 1401200031 ./dev-util/geany-plugins/geany-plugins-1.23.ebuild
@@ -20163,7 +20128,7 @@
 1306021301 ./dev-util/byacc/byacc-20130304.ebuild
 1205310701 ./dev-util/btyacc/btyacc-3.0-r2.ebuild
 1505271601 ./dev-util/automoc/automoc-0.9.88-r1.ebuild
-1504061746 ./dev-util/shellcheck/shellcheck-0.3.6.ebuild
+1506171231 ./dev-util/shellcheck/shellcheck-0.3.6.ebuild
 1502061810 ./dev-util/shellcheck/shellcheck-0.3.5-r1.ebuild
 1505211301 ./dev-util/netbeans/netbeans-8.0.2.ebuild
 1205061831 ./dev-util/argouml/argouml-0.34.ebuild
@@ -20370,6 +20335,7 @@
 1210150031 ./dev-util/cgdb/cgdb-0.6.6.ebuild
 1506011830 ./dev-util/android-studio/android-studio-1.2.1.1.141.1903250.ebuild
 1506091031 ./dev-util/android-studio/android-studio-1.2.0.12.141.1890965.ebuild
+1506171338 ./dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
 1110231904 ./dev-util/strace/strace-4.5.20-r2.ebuild
 1305022131 ./dev-util/strace/strace-4.7.ebuild
 1008302211 ./dev-util/strace/strace-4.5.19.ebuild
@@ -20400,7 +20366,7 @@
 1212170301 ./dev-util/cpuinfo-collection/cpuinfo-collection-20060720.ebuild
 1310100001 ./dev-util/cunit/cunit-2.1_p2.ebuild
 1305212131 ./dev-util/cunit/cunit-2.1-r1.ebuild
-1505152031 ./dev-util/cunit/cunit-2.1_p2-r1.ebuild
+1506172131 ./dev-util/cunit/cunit-2.1_p2-r1.ebuild
 1112211230 ./dev-util/intel2gas/intel2gas-1.3.3-r3.ebuild
 1205240020 ./dev-util/fatrace/fatrace-0.4.ebuild
 1504082101 ./dev-util/fatrace/fatrace-0.9.ebuild
@@ -20509,6 +20475,7 @@
 1506042201 ./app-office/libreoffice/libreoffice-4.4.3.2.ebuild
 1505232248 ./app-office/wps-office/wps-office-9.1.0.4953_alpha18.ebuild
 1505262339 ./app-office/wps-office/wps-office-9.1.0.4953_alpha18-r1.ebuild
+1506172158 ./app-office/wps-office/wps-office-9.1.0.4961_alpha18_p1.ebuild
 1505171208 ./app-office/gnumeric/gnumeric-1.12.22.ebuild
 1503151631 ./app-office/gnumeric/gnumeric-1.12.21.ebuild
 1405041631 ./app-office/grisbi/grisbi-1.0.0.ebuild
@@ -20649,6 +20616,7 @@
 1502151801 ./app-text/libwpd/libwpd-0.10.0-r1.ebuild
 1411211501 ./app-text/libwpd/libwpd-0.10.0.ebuild
 1502281701 ./app-text/wdiff/wdiff-1.2.2.ebuild
+1506171148 ./app-text/html-xml-utils/html-xml-utils-6.9.ebuild
 1501261331 ./app-text/html-xml-utils/html-xml-utils-6.8.ebuild
 1212082131 ./app-text/epubcheck/epubcheck-1.1.ebuild
 1203090131 ./app-text/cwtext/cwtext-0.96.ebuild
@@ -20779,7 +20747,7 @@
 1412280018 ./app-text/mythes/mythes-1.2.4.ebuild
 1212081631 ./app-text/mythes/mythes-1.2.3.ebuild
 1202250531 ./app-text/rpl/rpl-1.5.5.ebuild
-1505271631 ./app-text/t1utils/t1utils-1.39.ebuild
+1506171201 ./app-text/t1utils/t1utils-1.39.ebuild
 1502281631 ./app-text/t1utils/t1utils-1.38.ebuild
 1408102301 ./app-text/skribe/skribe-1.2l.ebuild
 1301160031 ./app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
@@ -20858,6 +20826,7 @@
 1204011931 ./app-text/gocr/gocr-0.49.ebuild
 1108221347 ./app-text/letterize/letterize-1.3.ebuild
 1501062300 ./app-text/restview/restview-2.2.1.ebuild
+1506180735 ./app-text/restview/restview-2.4.0.ebuild
 1502220301 ./app-text/restview/restview-2.3.0.ebuild
 1410270816 ./app-text/restview/restview-2.1.1.ebuild
 1412102214 ./app-text/restview/restview-2.2.0.ebuild
@@ -21008,6 +20977,7 @@
 1208271931 ./app-text/xmldiff/xmldiff-0.6.10.ebuild
 1501190219 ./app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
 1504081031 ./app-text/xlsx2csv/xlsx2csv-0.6.ebuild
+1506180731 ./app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
 1504081031 ./app-text/xlsx2csv/xlsx2csv-0.7.ebuild
 1303242001 ./app-text/yagf/yagf-0.9.2.ebuild
 1405081401 ./app-text/yagf/yagf-0.9.3.2.ebuild
@@ -21221,6 +21191,7 @@
 1505290831 ./net-mail/ripole/ripole-0.2.2.ebuild
 0812051946 ./net-mail/checkpw/checkpw-1.02.ebuild
 1408110101 ./net-mail/spamcup/spamcup-1.09.ebuild
+1506180745 ./net-mail/libpst/libpst-0.6.64.ebuild
 1305231006 ./net-mail/libpst/libpst-0.6.59.ebuild
 1401141756 ./net-mail/libpst/libpst-0.6.61.ebuild
 1306210722 ./net-mail/libpst/libpst-0.6.60.ebuild
@@ -21272,6 +21243,7 @@
 0504210130 ./net-mail/signify/signify-1.14.ebuild
 1402060038 ./net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
 1009120149 ./net-mail/mlmmj/mlmmj-1.2.17.1.ebuild
+1506180308 ./net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
 1307280208 ./net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
 1302022242 ./net-mail/qmail-lint/qmail-lint-0.55.ebuild
 1203091340 ./net-mail/peephole/peephole-1.5.ebuild
@@ -23920,7 +23892,7 @@
 1506072231 ./www-servers/apache/apache-2.4.12-r1.ebuild
 1503251701 ./www-servers/monkeyd/monkeyd-1.5.5.ebuild
 1408210531 ./www-servers/monkeyd/monkeyd-1.5.3.ebuild
-1503031418 ./www-servers/monkeyd/monkeyd-1.5.6.ebuild
+1506180401 ./www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
 1502281731 ./www-servers/lighttpd/lighttpd-1.4.35-r1.ebuild
 1411021401 ./www-servers/lighttpd/lighttpd-1.4.35.ebuild
 1502220011 ./www-servers/lighttpd/lighttpd-1.4.35-r2.ebuild
@@ -24004,8 +23976,7 @@
 1503131404 ./sci-chemistry/autodock/autodock-4.2.6.ebuild
 1009061644 ./sci-chemistry/elem/elem-1.0.3-r1.ebuild
 1009061644 ./sci-chemistry/elem/elem-1.0.3-r2.ebuild
-1503290101 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
-1505181001 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+1506171801 ./sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
 1505082031 ./sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
 1304231801 ./sci-chemistry/apbs/apbs-1.2.1b-r4.ebuild
 1408110031 ./sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r2.ebuild
@@ -26544,12 +26515,12 @@
 1410170001 ./dev-ruby/rcairo/rcairo-1.12.9.ebuild
 1506131331 ./dev-ruby/rcairo/rcairo-1.14.1.ebuild
 1506131302 ./dev-ruby/rcairo/rcairo-1.14.1-r1.ebuild
-1506170016 ./dev-ruby/rack/rack-1.4.6.ebuild
+1506171031 ./dev-ruby/rack/rack-1.4.6.ebuild
 1411122001 ./dev-ruby/rack/rack-1.4.5-r1.ebuild
 1506162259 ./dev-ruby/rack/rack-1.5.4-r1.ebuild
 1506162259 ./dev-ruby/rack/rack-1.6.2.ebuild
 1506170016 ./dev-ruby/rack/rack-1.4.6-r1.ebuild
-1506162259 ./dev-ruby/rack/rack-1.5.4.ebuild
+1506171031 ./dev-ruby/rack/rack-1.5.4.ebuild
 1411122001 ./dev-ruby/rack/rack-1.5.2-r1.ebuild
 1501281001 ./dev-ruby/metaclass/metaclass-0.0.4.ebuild
 1411031831 ./dev-ruby/metaclass/metaclass-0.0.1-r1.ebuild
@@ -27270,7 +27241,7 @@
 1408132301 ./dev-ruby/hiera/hiera-1.3.4-r1.ebuild
 1504111101 ./dev-ruby/hiera/hiera-2.0.0.ebuild
 1412221701 ./dev-ruby/hiera/hiera-1.3.4.ebuild
-1506111731 ./dev-ruby/bundler/bundler-1.7.13.ebuild
+1506172301 ./dev-ruby/bundler/bundler-1.7.13.ebuild
 1505311342 ./dev-ruby/bundler/bundler-1.9.9.ebuild
 1505311401 ./dev-ruby/bundler/bundler-1.7.3.ebuild
 1505112117 ./dev-ruby/bundler/bundler-1.8.9.ebuild
@@ -28460,6 +28431,7 @@
 1504082101 ./media-gfx/graphviz/graphviz-2.34.0.ebuild
 1504082101 ./media-gfx/graphviz/graphviz-2.36.0-r1.ebuild
 1309050925 ./media-gfx/potrace/potrace-1.11.ebuild
+1506172147 ./media-gfx/potrace/potrace-1.12.ebuild
 1212112150 ./media-gfx/potrace/potrace-1.10-r1.ebuild
 1411270803 ./media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.1.2.ebuild
 1501210129 ./media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.2.1.ebuild
@@ -28553,6 +28525,7 @@
 1204050733 ./media-gfx/nip2/nip2-7.26.4.ebuild
 1506042231 ./media-gfx/darktable/darktable-9999.ebuild
 1506042231 ./media-gfx/darktable/darktable-1.6.2.ebuild
+1506180108 ./media-gfx/darktable/darktable-1.6.7.ebuild
 1506042231 ./media-gfx/darktable/darktable-1.6.6.ebuild
 1506042231 ./media-gfx/darktable/darktable-1.6.1.ebuild
 1506042231 ./media-gfx/darktable/darktable-1.6.4.ebuild
@@ -28645,8 +28618,8 @@
 1405011645 ./media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
 1405011645 ./media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
 1305201241 ./media-tv/dvbtune/dvbtune-0.5-r1.ebuild
-1503212201 ./media-tv/freevo/freevo-1.9.0.ebuild
-1503212201 ./media-tv/freevo/freevo-1.9.0-r1.ebuild
+1506180531 ./media-tv/freevo/freevo-1.9.0.ebuild
+1506180531 ./media-tv/freevo/freevo-1.9.0-r1.ebuild
 1210161109 ./media-tv/tvheadend/tvheadend-2.12.ebuild
 1406220115 ./media-tv/tvheadend/tvheadend-3.2.ebuild
 1406230005 ./media-tv/tvheadend/tvheadend-9999.ebuild
@@ -29031,6 +29004,7 @@
 1407172001 ./net-analyzer/ssmping/ssmping-0.9.1.ebuild
 1302010308 ./net-analyzer/bwm-ng/bwm-ng-0.6-r1.ebuild
 1504230024 ./net-analyzer/icinga2/icinga2-2.3.4.ebuild
+1506172311 ./net-analyzer/icinga2/icinga2-2.3.5.ebuild
 1503272301 ./net-analyzer/icinga2/icinga2-9999.ebuild
 1503272247 ./net-analyzer/icinga2/icinga2-2.3.3.ebuild
 1503270931 ./net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
@@ -29045,7 +29019,7 @@
 1407180031 ./net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
 1503311101 ./net-analyzer/httping/httping-2.4.ebuild
 1506010901 ./net-analyzer/wireshark/wireshark-99999999.ebuild
-1506010731 ./net-analyzer/wireshark/wireshark-1.12.5.ebuild
+1506171201 ./net-analyzer/wireshark/wireshark-1.12.5.ebuild
 1505312109 ./net-analyzer/wireshark/wireshark-1.99.6.ebuild
 1504132031 ./net-analyzer/wireshark/wireshark-1.12.4.ebuild
 1407171101 ./net-analyzer/scanssh/scanssh-2.1.ebuild
@@ -29075,7 +29049,7 @@
 1411041231 ./net-analyzer/etherape/etherape-0.9.13.ebuild
 1501261331 ./net-analyzer/knocker/knocker-0.7.1-r3.ebuild
 1212012335 ./net-analyzer/knocker/knocker-0.7.1-r2.ebuild
-1412170201 ./net-analyzer/nagvis/nagvis-1.6.6.ebuild
+1506172331 ./net-analyzer/nagvis/nagvis-1.6.6.ebuild
 1502141046 ./net-analyzer/netselect/netselect-0.3-r4.ebuild
 1408110131 ./net-analyzer/netselect/netselect-0.3-r3.ebuild
 1411082307 ./net-analyzer/smokeping/smokeping-2.6.11.ebuild
@@ -29144,7 +29118,7 @@
 1504022131 ./net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
 1503251931 ./net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
 1407171101 ./net-analyzer/sancp/sancp-1.6.1-r4.ebuild
-0902232341 ./net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
+1506172301 ./net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
 1408021601 ./net-analyzer/nsat/nsat-1.5-r3.ebuild
 1410291231 ./net-analyzer/netperf/netperf-2.6.0-r1.ebuild
 1502221131 ./net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
@@ -29160,7 +29134,7 @@
 1407171101 ./net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
 1410272201 ./net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
 1408032301 ./net-analyzer/iftop/iftop-1.0_pre4.ebuild
-1506160801 ./net-analyzer/cacti/cacti-0.8.8d.ebuild
+1506171201 ./net-analyzer/cacti/cacti-0.8.8d.ebuild
 1407171101 ./net-analyzer/cacti/cacti-0.8.8b-r2.ebuild
 1205241145 ./net-analyzer/tcping/tcping-1.3.5.ebuild
 1407121829 ./net-analyzer/hunt/hunt-1.5-r2.ebuild
@@ -29945,7 +29919,7 @@
 1503170343 ./x11-misc/sxhkd/sxhkd-0.5.5.ebuild
 1412070831 ./x11-misc/sxhkd/sxhkd-0.5.3.ebuild
 1412070831 ./x11-misc/sxhkd/sxhkd-0.5.4.ebuild
-1505211931 ./x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+1506171201 ./x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
 1504080801 ./x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
 1301210525 ./x11-misc/x11vnc/x11vnc-0.9.13.ebuild
 1412202301 ./x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild
@@ -30280,6 +30254,7 @@
 1506100601 ./sys-fs/udev/udev-208-r1.ebuild
 1506100601 ./sys-fs/udev/udev-220-r1.ebuild
 1506100601 ./sys-fs/udev/udev-219.ebuild
+1506172330 ./sys-fs/udev/udev-220-r3.ebuild
 1506100601 ./sys-fs/udev/udev-216.ebuild
 1506100601 ./sys-fs/udev/udev-217.ebuild
 1506121731 ./sys-fs/udev/udev-220-r2.ebuild
@@ -30346,7 +30321,7 @@
 1301110913 ./sys-fs/mtools/mtools-4.0.15.ebuild
 1307041857 ./sys-fs/mtools/mtools-4.0.18.ebuild
 1012030607 ./sys-fs/mtools/mtools-4.0.13.ebuild
-1503252001 ./sys-fs/owfs/owfs-2.7_p21-r3.ebuild
+1506172246 ./sys-fs/owfs/owfs-2.7_p21-r4.ebuild
 1408110031 ./sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
 1412281331 ./sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
 1202162321 ./sys-fs/siefs/siefs-0.5-r2.ebuild
@@ -30425,6 +30400,7 @@
 1403160103 ./sys-fs/f2fs-tools/f2fs-tools-1.3.0.ebuild
 1412310532 ./sys-fs/yaffs2utils/yaffs2utils-0.2.9.ebuild
 1503080101 ./sys-fs/fuse/fuse-2.9.3.ebuild
+1506180717 ./sys-fs/fuse/fuse-2.9.4.ebuild
 1310102328 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.23.ebuild
 1210190916 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.21-r1.ebuild
 1403141407 ./sys-fs/reiserfsprogs/reiserfsprogs-3.6.24.ebuild
@@ -30519,6 +30495,7 @@
 1403042357 ./sys-fs/s3fs/s3fs-1.74.ebuild
 1408110031 ./sys-fs/avfs/avfs-1.0.1.ebuild
 1408311011 ./sys-fs/avfs/avfs-1.0.2.ebuild
+1506180724 ./sys-fs/avfs/avfs-1.0.3.ebuild
 0508180648 ./sys-fs/wpflash/wpflash-0.ebuild
 1410181831 ./sys-fs/ddrescue/ddrescue-1.18.1.ebuild
 1309191637 ./sys-fs/ddrescue/ddrescue-1.16.ebuild
@@ -30550,7 +30527,7 @@
 1504191801 ./sys-fs/btrfs-progs/btrfs-progs-3.19.1.ebuild
 1501011753 ./sys-fs/btrfs-progs/btrfs-progs-3.17.3.ebuild
 1503031331 ./sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild
-1504191801 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+1506171831 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
 1410051948 ./sys-fs/btrfs-progs/btrfs-progs-3.16.2.ebuild
 1505100223 ./sys-fs/btrfs-progs/btrfs-progs-4.0.ebuild
 1503271331 ./sys-fs/vhba/vhba-20140928.ebuild
@@ -30572,7 +30549,7 @@
 1505151831 ./sys-kernel/gentoo-sources/gentoo-sources-3.12.42.ebuild
 1506070100 ./sys-kernel/gentoo-sources/gentoo-sources-3.14.44.ebuild
 1505150201 ./sys-kernel/gentoo-sources/gentoo-sources-3.14.42.ebuild
-1506070119 ./sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
+1506172201 ./sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
 1505151831 ./sys-kernel/gentoo-sources/gentoo-sources-3.10.77.ebuild
 1505220342 ./sys-kernel/gentoo-sources/gentoo-sources-3.12.43.ebuild
 1505131945 ./sys-kernel/gentoo-sources/gentoo-sources-3.4.107.ebuild
@@ -31673,6 +31650,7 @@
 1401141758 ./sys-apps/moreutils/moreutils-0.50.ebuild
 1410080501 ./sys-apps/moreutils/moreutils-0.52.ebuild
 1411240310 ./sys-apps/moreutils/moreutils-0.53.ebuild
+1506180021 ./sys-apps/moreutils/moreutils-0.56.ebuild
 1412120207 ./sys-apps/moreutils/moreutils-0.54.ebuild
 1406091301 ./sys-apps/moreutils/moreutils-0.51.ebuild
 1501290940 ./sys-apps/moreutils/moreutils-0.55.ebuild
@@ -31764,7 +31742,7 @@
 1301280328 ./sys-apps/prctl/prctl-1.5.ebuild
 1312180904 ./sys-apps/entropy-server/entropy-server-254.ebuild
 1209291358 ./sys-apps/hdparm/hdparm-9.39.ebuild
-1506111731 ./sys-apps/hdparm/hdparm-9.45.ebuild
+1506172301 ./sys-apps/hdparm/hdparm-9.45.ebuild
 1506161032 ./sys-apps/hdparm/hdparm-9.47.ebuild
 1405311349 ./sys-apps/flashrom/flashrom-0.9.6.1.ebuild
 1504251431 ./sys-apps/flashrom/flashrom-9999.ebuild
@@ -31928,7 +31906,7 @@
 1401180815 ./mail-mta/ssmtp/ssmtp-2.64-r2.ebuild
 1303180001 ./mail-mta/esmtp/esmtp-1.2.ebuild
 1503021131 ./mail-mta/postfix/postfix-2.11.3.ebuild
-1506111731 ./mail-mta/postfix/postfix-3.0.1-r1.ebuild
+1506172301 ./mail-mta/postfix/postfix-3.0.1-r1.ebuild
 1505281131 ./mail-mta/postfix/postfix-3.1_pre20150523.ebuild
 1504131050 ./mail-mta/postfix/postfix-2.11.5.ebuild
 1502091939 ./mail-mta/postfix/postfix-2.11.4.ebuild
@@ -32063,9 +32041,8 @@
 1503311949 ./app-eselect/eselect-lapack/eselect-lapack-0.1.ebuild
 1503311947 ./app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
 1505031921 ./app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
-1503311953 ./app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
-1503311953 ./app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
-1503311953 ./app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
+1506171531 ./app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+1506171531 ./app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
 1503311953 ./app-eselect/eselect-package-manager/eselect-package-manager-20110108.ebuild
 1503311956 ./app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
 1503311957 ./app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
@@ -32076,7 +32053,7 @@
 1503311957 ./app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
 1503311957 ./app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild
 1503311957 ./app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild
-1506071231 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+1506172231 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
 1503311958 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild
 1503311958 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild
 1503311956 ./app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
@@ -32135,7 +32112,7 @@
 1411021201 ./net-dns/dnsmasq/dnsmasq-2.66.ebuild
 1504282116 ./net-dns/dnsmasq/dnsmasq-2.72-r1.ebuild
 1506160105 ./net-dns/dnsmasq/dnsmasq-2.73.ebuild
-1505051901 ./net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
+1506172231 ./net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
 1412041201 ./net-dns/dnsmasq/dnsmasq-2.72.ebuild
 1409151948 ./net-dns/knot/knot-1.5.3.ebuild
 1505151252 ./net-dns/knot/knot-1.6.3.ebuild
@@ -35123,8 +35100,7 @@
 1411220558 ./net-proxy/mitmproxy/mitmproxy-0.11.1.ebuild
 1501040751 ./net-proxy/mitmproxy/mitmproxy-0.11.3.ebuild
 1504082131 ./net-proxy/mitmproxy/mitmproxy-0.10.1.ebuild
-1505030617 ./net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
-1403050014 ./net-proxy/sshuttle/sshuttle-0.61-r1.ebuild
+1506180801 ./net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
 1212171332 ./net-proxy/squirm/squirm-1.26-r1.ebuild
 1303311426 ./net-proxy/wwwoffle/wwwoffle-2.9i.ebuild
 1501011504 ./net-proxy/obfsproxy/obfsproxy-0.2.13.ebuild
@@ -36065,6 +36041,7 @@
 1506091252 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0.ebuild
 1506071331 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
 1502090031 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.12.1-r1.ebuild
+1506180729 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
 1504081031 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.8.1.ebuild
 1306081731 ./app-accessibility/freetts/freetts-1.2.2.ebuild
 1203070201 ./app-accessibility/freetts/freetts-1.2.1-r2.ebuild
@@ -36846,7 +36823,7 @@
 1505281124 metadata/md5-cache/sci-astronomy/casacore-1.5.0-r1
 1506160039 metadata/md5-cache/sci-astronomy/cpl-6.4
 1506160039 metadata/md5-cache/sci-astronomy/cpl-6.4.2
-1506160039 metadata/md5-cache/sci-astronomy/gasgano-2.4.5
+1506171307 metadata/md5-cache/sci-astronomy/gasgano-2.4.5
 1505281124 metadata/md5-cache/sci-astronomy/wcslib-4.23
 1505281124 metadata/md5-cache/sci-astronomy/pyephem-3.7.5.1
 1505281124 metadata/md5-cache/sci-astronomy/wcslib-4.21
@@ -36877,7 +36854,7 @@
 1506071607 metadata/md5-cache/sci-astronomy/esorex-3.10-r2
 1506071607 metadata/md5-cache/sci-astronomy/erfa-1.0.1
 1506071607 metadata/md5-cache/sci-astronomy/esorex-3.10.2
-1506160039 metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
+1506171307 metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
 1506030736 metadata/md5-cache/app-cdr/xfburn-0.5.2
 1505281106 metadata/md5-cache/app-cdr/gcdemu-2.1.1
 1505281106 metadata/md5-cache/app-cdr/uif2iso-0.1.7c
@@ -36959,7 +36936,7 @@
 1211091733 metadata/md5-cache/app-cdr/cue2toc-0.4
 1505281106 metadata/md5-cache/app-cdr/cdlabelgen-4.0.0
 1505281106 metadata/md5-cache/app-cdr/cdrkit-1.1.11
-1506160036 metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
+1506171306 metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
 1505281106 metadata/md5-cache/app-cdr/gtkcdlabel-1.14-r1
 1505281106 metadata/md5-cache/app-cdr/cdck-0.7.0-r1
 1211091733 metadata/md5-cache/app-cdr/poweriso-1.3
@@ -37057,7 +37034,7 @@
 1506151736 metadata/md5-cache/kde-base/akregator-4.14.6
 1506151737 metadata/md5-cache/kde-base/kleopatra-4.4.11.1-r1
 1506151737 metadata/md5-cache/kde-base/ksystraycmd-4.11.14
-1506160039 metadata/md5-cache/kde-base/krossjava-4.14.3
+1506171307 metadata/md5-cache/kde-base/krossjava-4.14.3
 1506151737 metadata/md5-cache/kde-base/plasma-workspace-4.11.17
 1506151737 metadata/md5-cache/kde-base/libtaskmanager-4.11.14
 1506151737 metadata/md5-cache/kde-base/libkgreeter-4.11.20
@@ -37239,7 +37216,7 @@
 1505281109 metadata/md5-cache/dev-db/pgbouncer-1.5.4
 1506021106 metadata/md5-cache/dev-db/postgresql-9.2.10-r1
 1505281109 metadata/md5-cache/dev-db/spatialite-3.0.1
-1506160036 metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
+1506171306 metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
 1505281109 metadata/md5-cache/dev-db/pgpool2-3.3.3
 1506102136 metadata/md5-cache/dev-db/mariadb-10.0.16
 1505281109 metadata/md5-cache/dev-db/cppdb-0.3.1-r1
@@ -37255,7 +37232,7 @@
 1505281109 metadata/md5-cache/dev-db/pgpool2-3.3.2
 1505281109 metadata/md5-cache/dev-db/myodbc-5.2.7-r1
 1505281109 metadata/md5-cache/dev-db/SchemaSync-0.9.2
-1506160036 metadata/md5-cache/dev-db/octopus-3.0.1-r4
+1506171306 metadata/md5-cache/dev-db/octopus-3.0.1-r4
 1505281109 metadata/md5-cache/dev-db/pgtap-0.93.0
 1408110006 metadata/md5-cache/dev-db/freetds-0.64
 1505281109 metadata/md5-cache/dev-db/haildb-2.3.1
@@ -37274,7 +37251,7 @@
 1506101136 metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1
 1212031106 metadata/md5-cache/dev-db/m17n-db-1.5.5
 1506132236 metadata/md5-cache/dev-db/mytop-1.6-r4
-1505281109 metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10
+1506172336 metadata/md5-cache/dev-db/phpmyadmin-4.0.10.10
 1506160036 metadata/md5-cache/dev-db/mysql-cluster-7.2.19
 1506030736 metadata/md5-cache/dev-db/ctdb-1.0.114_p1
 1505281109 metadata/md5-cache/dev-db/tokumx-2.0.1
@@ -37297,15 +37274,15 @@
 1506021106 metadata/md5-cache/dev-db/postgresql-9999
 1505281109 metadata/md5-cache/dev-db/m17n-db-1.6.2-r1
 1506160036 metadata/md5-cache/dev-db/mysql-cluster-7.3.8
-1506160036 metadata/md5-cache/dev-db/apgdiff-1.4
-1506160036 metadata/md5-cache/dev-db/apgdiff-2.2.1
+1506171306 metadata/md5-cache/dev-db/apgdiff-1.4
+1506171306 metadata/md5-cache/dev-db/apgdiff-2.2.1
 1505281109 metadata/md5-cache/dev-db/slony1-2.2.3
 1505281109 metadata/md5-cache/dev-db/mysql-workbench-6.2.5
 1506030736 metadata/md5-cache/dev-db/virtuoso-odbc-6.1.8
 1505281109 metadata/md5-cache/dev-db/mysql++-3.1.0
 1506162106 metadata/md5-cache/dev-db/dbmodel-0.3
 1505281109 metadata/md5-cache/dev-db/lib_mysqludf_sys-0.0.3
-1506160036 metadata/md5-cache/dev-db/apgdiff-2.2.2
+1506171306 metadata/md5-cache/dev-db/apgdiff-2.2.2
 1506132236 metadata/md5-cache/dev-db/bucardo-5.3.1
 1505281109 metadata/md5-cache/dev-db/libzdb-2.11.2
 1506030736 metadata/md5-cache/dev-db/sqlite-3.8.10.1
@@ -37320,9 +37297,9 @@
 1506132236 metadata/md5-cache/dev-db/mtop-0.6.6-r3
 1506160406 metadata/md5-cache/dev-db/sqlitebrowser-3.5.1
 1505281109 metadata/md5-cache/dev-db/mongodb-2.6.9
-1506161206 metadata/md5-cache/dev-db/postgresql-9.2.12
+1506171207 metadata/md5-cache/dev-db/postgresql-9.2.12
 1504302006 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
-1506160036 metadata/md5-cache/dev-db/derby-10.10.1.1
+1506171306 metadata/md5-cache/dev-db/derby-10.10.1.1
 1505281109 metadata/md5-cache/dev-db/mysql-proxy-0.8.2
 1506030736 metadata/md5-cache/dev-db/libdbi-drivers-0.9.0
 1506160036 metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -37347,12 +37324,12 @@
 1212031206 metadata/md5-cache/dev-db/m17n-contrib-1.1.12
 1506021106 metadata/md5-cache/dev-db/postgresql-9.0.20
 1506021106 metadata/md5-cache/dev-db/postgresql-9.3.7
-1506160036 metadata/md5-cache/dev-db/hsqldb-1.8.1.3
+1506171306 metadata/md5-cache/dev-db/hsqldb-1.8.1.3
 1506030736 metadata/md5-cache/dev-db/ctdb-1.0.73
 1505281109 metadata/md5-cache/dev-db/mysql-proxy-0.8.0-r1
 1506021106 metadata/md5-cache/dev-db/postgresql-9.4.1
 1505281109 metadata/md5-cache/dev-db/xtrabackup-bin-2.2.3
-1505281109 metadata/md5-cache/dev-db/phpmyadmin-4.3.12
+1506172336 metadata/md5-cache/dev-db/phpmyadmin-4.3.12
 1505281109 metadata/md5-cache/dev-db/slony1-2.1.4
 1506071606 metadata/md5-cache/dev-db/unixODBC-2.3.2-r1
 1505281109 metadata/md5-cache/dev-db/odbtp-1.1.4
@@ -37376,37 +37353,37 @@
 1505281109 metadata/md5-cache/dev-db/mysql-udf-infusion-20110109
 1506021106 metadata/md5-cache/dev-db/postgresql-9.1.15
 1506071606 metadata/md5-cache/dev-db/pg_top-3.7.0
-1506161206 metadata/md5-cache/dev-db/postgresql-9.1.17
+1506171206 metadata/md5-cache/dev-db/postgresql-9.1.17
 1506132236 metadata/md5-cache/dev-db/bucardo-5.2.0
 1505281109 metadata/md5-cache/dev-db/mydumper-0.6.2
 1506030736 metadata/md5-cache/dev-db/libiodbc-3.52.8-r2
 1506021106 metadata/md5-cache/dev-db/postgresql-9.4.2
 1506132236 metadata/md5-cache/dev-db/maatkit-7540-r1
-1506160036 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
+1506171306 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
 1505281109 metadata/md5-cache/dev-db/lmdb-0.9.14
 1505281109 metadata/md5-cache/dev-db/tokumx-1.5.0-r1
 1506030736 metadata/md5-cache/dev-db/postgis-2.0.3
 1505281109 metadata/md5-cache/dev-db/couchdb-1.6.0
 1506030736 metadata/md5-cache/dev-db/lib_mysqludf_preg-1.0.1
-1505281109 metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3
+1506172336 metadata/md5-cache/dev-db/phpmyadmin-4.2.13.3
 1211091735 metadata/md5-cache/dev-db/mysqltuner-1.2.0
 1212031206 metadata/md5-cache/dev-db/m17n-contrib-1.1.7
 1506111836 metadata/md5-cache/dev-db/mysql++-3.2.1
-1505281109 metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1
+1506172336 metadata/md5-cache/dev-db/phpmyadmin-4.4.6.1
 1506030736 metadata/md5-cache/dev-db/postgis-2.1.6
 1506021106 metadata/md5-cache/dev-db/postgresql-9.1.16
-1506160036 metadata/md5-cache/dev-db/apgdiff-2.4
+1506171306 metadata/md5-cache/dev-db/apgdiff-2.4
 1506030736 metadata/md5-cache/dev-db/sqlite-3.8.10.2
 1506102136 metadata/md5-cache/dev-db/mariadb-galera-10.0.19
 1505281109 metadata/md5-cache/dev-db/lib_mysqludf_log-0.0.2
 1212031206 metadata/md5-cache/dev-db/m17n-contrib-1.1.13
-1506160036 metadata/md5-cache/dev-db/jxtray-0.5-r4
+1506171306 metadata/md5-cache/dev-db/jxtray-0.5-r4
 1506030736 metadata/md5-cache/dev-db/recutils-1.5
 1412281836 metadata/md5-cache/dev-db/pgmemcache-2.2.0
 1505281109 metadata/md5-cache/dev-db/mysql-workbench-6.0.9
 1505281109 metadata/md5-cache/dev-db/mongodb-2.6.10
 1211091736 metadata/md5-cache/dev-db/vbisam-2.0
-1506160036 metadata/md5-cache/dev-db/henplus-0.9.8-r1
+1506171306 metadata/md5-cache/dev-db/henplus-0.9.8-r1
 1505281109 metadata/md5-cache/dev-db/oracle-instantclient-basic-10.2.0.3-r1
 1212031106 metadata/md5-cache/dev-db/m17n-db-1.5.4
 1505281109 metadata/md5-cache/dev-db/lib_mysqludf_udf-0.0.3
@@ -37448,25 +37425,25 @@
 1212031106 metadata/md5-cache/dev-db/m17n-db-1.5.2
 1506030736 metadata/md5-cache/dev-db/ctdb-9999
 1505281109 metadata/md5-cache/dev-db/couchdb-1.5.1
-1506160036 metadata/md5-cache/dev-db/apgdiff-2.3
+1506171306 metadata/md5-cache/dev-db/apgdiff-2.3
 1506021106 metadata/md5-cache/dev-db/postgresql-9.2.10
 1506030736 metadata/md5-cache/dev-db/tokyocabinet-1.4.47
 1505281109 metadata/md5-cache/dev-db/tinycdb-0.77-r2
-1506160036 metadata/md5-cache/dev-db/db-je-3.3.75
+1506171306 metadata/md5-cache/dev-db/db-je-3.3.75
 1506030736 metadata/md5-cache/dev-db/redis-2.6.16
 1505281109 metadata/md5-cache/dev-db/haildb-2.2.0
 1505281109 metadata/md5-cache/dev-db/pgpool2-3.3.5
 1505281109 metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
 1506030736 metadata/md5-cache/dev-db/tokyocabinet-1.4.48
-1506161206 metadata/md5-cache/dev-db/postgresql-9.4.3
+1506171207 metadata/md5-cache/dev-db/postgresql-9.4.3
 1506021106 metadata/md5-cache/dev-db/postgresql-9.3.6
 1506030736 metadata/md5-cache/dev-db/redis-2.8.9
 1505281109 metadata/md5-cache/dev-db/ctdb-1.13
 1505281109 metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
 1506102136 metadata/md5-cache/dev-db/mariadb-10.0.19
 1505281109 metadata/md5-cache/dev-db/sqliteman-1.2.2-r1
-1506160036 metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
-1506160036 metadata/md5-cache/dev-db/henplus-0.9.8
+1506171306 metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
+1506171306 metadata/md5-cache/dev-db/henplus-0.9.8
 1506030736 metadata/md5-cache/dev-db/postgis-2.0.6
 1506071606 metadata/md5-cache/dev-db/mysql-super-smack-1.3-r3
 1506030736 metadata/md5-cache/dev-db/recutils-1.7
@@ -37475,7 +37452,7 @@
 1506030736 metadata/md5-cache/dev-db/lib_mysqludf_ta-0.1
 1506030736 metadata/md5-cache/dev-db/postgis-2.1.4
 1505281109 metadata/md5-cache/dev-db/soci-3.2.3
-1506160036 metadata/md5-cache/dev-db/octopus-3.0.1-r3
+1506171306 metadata/md5-cache/dev-db/octopus-3.0.1-r3
 1505281109 metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.2-r1
 1412281836 metadata/md5-cache/dev-db/pgmemcache-2.0.6
 1506132236 metadata/md5-cache/dev-db/pgbadger-6.4
@@ -37489,23 +37466,22 @@
 1506030736 metadata/md5-cache/dev-db/redis-2.8.11
 1506030736 metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1
 1505281109 metadata/md5-cache/dev-db/opendbx-1.4.5-r1
-1506030736 metadata/md5-cache/dev-db/hyperdex-1.7.0
 1505281109 metadata/md5-cache/dev-db/mongodb-2.4.13
 1505281109 metadata/md5-cache/dev-db/lib_mysqludf_stat-0.0.3
 1506160406 metadata/md5-cache/dev-db/sqlitebrowser-3.6.0
 1505281109 metadata/md5-cache/dev-db/psqlodbc-09.03.0210
 1506121736 metadata/md5-cache/dev-db/postgresql-9.3.9
 1505281109 metadata/md5-cache/dev-db/libzdb-2.12
-1506161206 metadata/md5-cache/dev-db/postgresql-9.0.21
+1506171206 metadata/md5-cache/dev-db/postgresql-9.0.21
 1506071606 metadata/md5-cache/dev-db/unixODBC-2.3.2-r2
 1506132236 metadata/md5-cache/dev-db/innotop-1.9.0-r1
-1506161206 metadata/md5-cache/dev-db/postgresql-9.3.8
+1506171207 metadata/md5-cache/dev-db/postgresql-9.3.8
 1506030736 metadata/md5-cache/dev-db/freetds-0.91-r1
 1505281109 metadata/md5-cache/dev-db/etcd-0.4.6
 1505281109 metadata/md5-cache/dev-db/flamerobin-0.9.2
 1505281109 metadata/md5-cache/dev-db/pgagent-3.3.0
 1505281109 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.1
-1505281109 metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1
+1506172336 metadata/md5-cache/dev-db/phpmyadmin-4.3.13.1
 1505281109 metadata/md5-cache/dev-db/pgpool2-3.2.3
 1505300406 metadata/md5-cache/dev-db/mysql-5.5.44
 1505281109 metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
@@ -37517,6 +37493,7 @@
 1506030736 metadata/md5-cache/dev-db/lib_mysqludf_xql-1.0.0
 1505281109 metadata/md5-cache/dev-db/opendbx-1.5.0-r1
 1505281109 metadata/md5-cache/dev-db/sqliteodbc-0.96
+1506180607 metadata/md5-cache/dev-db/hyperdex-1.7.1
 1505281109 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.3
 1505281109 metadata/md5-cache/dev-db/mysql-udf-base64-20010618
 1505281109 metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
@@ -37554,7 +37531,7 @@
 1506071606 metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r1
 1505281118 metadata/md5-cache/dev-vcs/git-bz-0.12.12.15
 1505281118 metadata/md5-cache/dev-vcs/git-annex-5.20141125
-1506160039 metadata/md5-cache/dev-vcs/statsvn-0.5.0
+1506171307 metadata/md5-cache/dev-vcs/statsvn-0.5.0
 1506030737 metadata/md5-cache/dev-vcs/cssc-1.4.0
 1506132237 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
 1506132237 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
@@ -37618,11 +37595,11 @@
 1505281118 metadata/md5-cache/dev-vcs/git-annex-5.20140927
 1307251206 metadata/md5-cache/dev-vcs/git-sh-1.3
 1505281118 metadata/md5-cache/dev-vcs/tortoisehg-3.3.2
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.11.10
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.11.10
 1505281118 metadata/md5-cache/dev-vcs/gitstats-0_pre131024
 1506132237 metadata/md5-cache/dev-vcs/git-2.3.6
 1505281118 metadata/md5-cache/dev-vcs/mercurial-9999
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.12.0
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.12.0
 1505281118 metadata/md5-cache/dev-vcs/github-pages-publish-0.1.2
 1505281118 metadata/md5-cache/dev-vcs/hgsubversion-1.7
 1505281118 metadata/md5-cache/dev-vcs/cvsd-1.0.8
@@ -37634,7 +37611,6 @@
 1506132237 metadata/md5-cache/dev-vcs/gitolite-3.6.1
 1505281118 metadata/md5-cache/dev-vcs/cvs2svn-1.5.1
 1505281118 metadata/md5-cache/dev-vcs/cvsd-1.0.16
-1506132237 metadata/md5-cache/dev-vcs/git-2.4.2
 1505281118 metadata/md5-cache/dev-vcs/cvs-1.12.12-r7
 1505281118 metadata/md5-cache/dev-vcs/hgview-1.8.0
 1506142306 metadata/md5-cache/dev-vcs/tig-2.0.3
@@ -37672,7 +37648,7 @@
 1409101036 metadata/md5-cache/dev-vcs/vcsh-1.20140508-r2
 1505281118 metadata/md5-cache/dev-vcs/git-bz-9999
 1506162106 metadata/md5-cache/dev-vcs/svn2git-1.0.5
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.12.1
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.12.1
 1506151736 metadata/md5-cache/dev-vcs/kdesvn-1.6.0-r1
 1505281118 metadata/md5-cache/dev-vcs/cvsd-1.0.7
 1506162106 metadata/md5-cache/dev-vcs/svn2git-1.0.10
@@ -37699,7 +37675,7 @@
 1505281118 metadata/md5-cache/dev-vcs/git-mailz-0.14
 1505281118 metadata/md5-cache/dev-vcs/gitg-0.2.7
 1505281118 metadata/md5-cache/dev-vcs/hgsubversion-1.6.1
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.12.3
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.12.3
 1506132237 metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
 1505281118 metadata/md5-cache/dev-vcs/git-pimp-0.8
 1506022006 metadata/md5-cache/dev-vcs/hg-git-0.8.0
@@ -37716,7 +37692,7 @@
 1505281118 metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
 1506162106 metadata/md5-cache/dev-vcs/svn2git-1.0.2.1
 1505281118 metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r2
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.11.8
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.11.8
 1506132237 metadata/md5-cache/dev-vcs/git-9999-r2
 1505281118 metadata/md5-cache/dev-vcs/topgit-0.9
 1505281118 metadata/md5-cache/dev-vcs/cvs-1.12.13-r2
@@ -37730,7 +37706,7 @@
 1506132237 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
 1505281118 metadata/md5-cache/dev-vcs/rsvndump-0.6
 1506041806 metadata/md5-cache/dev-vcs/mercurial-3.4.1
-1506160039 metadata/md5-cache/dev-vcs/statcvs-0.5.0
+1506171307 metadata/md5-cache/dev-vcs/statcvs-0.5.0
 1505281118 metadata/md5-cache/dev-vcs/rcs-5.9.2
 1505281118 metadata/md5-cache/dev-vcs/git-bzr-ng-0_pre20120822
 1505281118 metadata/md5-cache/dev-vcs/darcs-2.8.5-r3
@@ -37754,12 +37730,13 @@
 1505281118 metadata/md5-cache/dev-vcs/gitinspector-0.3.1
 1506160039 metadata/md5-cache/dev-vcs/subversion-1.7.20
 1505281118 metadata/md5-cache/dev-vcs/hgsubversion-1.8
+1506171606 metadata/md5-cache/dev-vcs/git-2.4.4
 1505281118 metadata/md5-cache/dev-vcs/hg-fast-export-20140706
 1211091741 metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
 1506091036 metadata/md5-cache/dev-vcs/tortoisehg-3.4.1
 1506132237 metadata/md5-cache/dev-vcs/git-1.8.5.6
 1411120306 metadata/md5-cache/dev-vcs/vcsh-1.20141026
-1506160039 metadata/md5-cache/dev-vcs/bfg-1.11.7
+1506171307 metadata/md5-cache/dev-vcs/bfg-1.11.7
 1505281118 metadata/md5-cache/dev-vcs/colorsvn-0.3.2-r2
 1506151736 metadata/md5-cache/kde-apps/kfourinline-4.14.3
 1506151736 metadata/md5-cache/kde-apps/pairs-4.14.3
@@ -37804,7 +37781,7 @@
 1506151736 metadata/md5-cache/kde-apps/kppp-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kdontchangethehostname-4.14.3
 1506151736 metadata/md5-cache/kde-apps/filelight-4.14.3
-1506151736 metadata/md5-cache/kde-apps/konqueror-4.14.3
+1506171606 metadata/md5-cache/kde-apps/konqueror-4.14.3
 1506042206 metadata/md5-cache/kde-apps/kdewebdev-meta-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kanagram-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kstars-4.14.3
@@ -37840,7 +37817,7 @@
 1506151736 metadata/md5-cache/kde-apps/kmines-4.14.3
 1506151736 metadata/md5-cache/kde-apps/amor-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kalgebra-4.14.3
-1506151736 metadata/md5-cache/kde-apps/kolourpaint-4.14.3
+1506171638 metadata/md5-cache/kde-apps/kolourpaint-4.14.3
 1506151736 metadata/md5-cache/kde-apps/krdc-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kwordquiz-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kpasswdserver-4.14.3
@@ -37907,7 +37884,7 @@
 1506042206 metadata/md5-cache/kde-apps/kdeaccessibility-meta-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kdegraphics-mobipocket-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kfind-4.14.3
-1506151736 metadata/md5-cache/kde-apps/gwenview-4.14.3
+1506171638 metadata/md5-cache/kde-apps/gwenview-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kuiserver-4.14.3
 1506151736 metadata/md5-cache/kde-apps/picmi-4.14.3
 1506151736 metadata/md5-cache/kde-apps/kdebase-data-4.14.3-r1
@@ -38085,7 +38062,7 @@
 1408110036 metadata/md5-cache/dev-embedded/scratchbox-toolchain-cs2009q1-eglibc2_8-1.0.17
 1505281109 metadata/md5-cache/dev-embedded/lpc21isp-1.85
 1505281109 metadata/md5-cache/dev-embedded/scratchbox-1.0.19
-1506160036 metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
+1506171306 metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
 1211091736 metadata/md5-cache/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
 1312152306 metadata/md5-cache/dev-embedded/gputils-1.2.0
 1505281109 metadata/md5-cache/dev-embedded/avr-libc-1.6.4
@@ -39240,6 +39217,7 @@
 1505281123 metadata/md5-cache/net-misc/dropbox-2.10.41-r1
 1505281123 metadata/md5-cache/net-misc/fmirror-0.8.4-r2
 1506030738 metadata/md5-cache/net-misc/capi4hylafax-01.03.00.99.300.9
+1506172106 metadata/md5-cache/net-misc/curl-7.43.0
 1506021106 metadata/md5-cache/net-misc/openvswitch-1.11.0
 1408110107 metadata/md5-cache/net-misc/puf-1.0.0
 1506030738 metadata/md5-cache/net-misc/openssh-6.8_p1-r1
@@ -39287,6 +39265,7 @@
 1505281123 metadata/md5-cache/net-misc/aggregate-1.6
 1505311736 metadata/md5-cache/net-misc/geoipupdate-2.2.1
 1505281123 metadata/md5-cache/net-misc/rsync-3.0.9-r3
+1506171436 metadata/md5-cache/net-misc/stunnel-5.19
 1506071607 metadata/md5-cache/net-misc/directvnc-0.7.6-r1
 1506030738 metadata/md5-cache/net-misc/tlsdate-0.0.11
 1505281123 metadata/md5-cache/net-misc/mdidentd-1.04c
@@ -39298,7 +39277,7 @@
 1505281123 metadata/md5-cache/net-misc/ip-sentinel-0.12
 1211091748 metadata/md5-cache/net-misc/proxyper-341a
 1506021106 metadata/md5-cache/net-misc/r8168-8.039.00
-1506160039 metadata/md5-cache/net-misc/yajhfc-0.5.7
+1506171307 metadata/md5-cache/net-misc/yajhfc-0.5.7
 1506030738 metadata/md5-cache/net-misc/mico-2.3.13-r7
 1505281123 metadata/md5-cache/net-misc/networkmanager-pptp-1.0.2
 1505281123 metadata/md5-cache/net-misc/libreswan-3.9
@@ -39453,7 +39432,7 @@
 1505281123 metadata/md5-cache/net-misc/sgopherd-13.01
 1304171206 metadata/md5-cache/net-misc/shmux-1.0.1
 1505281123 metadata/md5-cache/net-misc/rabbitmq-server-3.2.4
-1506160039 metadata/md5-cache/net-misc/mindterm-3.4
+1506171307 metadata/md5-cache/net-misc/mindterm-3.4
 1303272036 metadata/md5-cache/net-misc/autossh-1.4c
 1506030738 metadata/md5-cache/net-misc/tlsdate-0.0.6
 1505281123 metadata/md5-cache/net-misc/suite3270-3.3.14_p7
@@ -39566,7 +39545,7 @@
 1506131237 metadata/md5-cache/net-misc/guacamole-server-0.9.7
 1407182006 metadata/md5-cache/net-misc/httptype-1.3.9-r1
 1505281123 metadata/md5-cache/net-misc/suite3270-3.3.15_p7
-1506160039 metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
+1506171307 metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
 1505281123 metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r1
 1506030739 metadata/md5-cache/net-misc/ytalk-3.3.0
 1505281123 metadata/md5-cache/net-misc/dahdi-tools-2.6.2
@@ -39679,7 +39658,6 @@
 1407111256 metadata/md5-cache/net-misc/ipv6calc-0.95.0
 1505281123 metadata/md5-cache/net-misc/apt-cacher-ng-0.8.2
 1505281123 metadata/md5-cache/net-misc/vrrpd-1.9
-1505281123 metadata/md5-cache/net-misc/stunnel-5.08
 1505281123 metadata/md5-cache/net-misc/dhcpcd-6.4.3
 1505281123 metadata/md5-cache/net-misc/sendfile-2.1b-r1
 1506030738 metadata/md5-cache/net-misc/openssh-6.8_p1-r2
@@ -39763,7 +39741,6 @@
 1505281123 metadata/md5-cache/net-misc/pytvshows-0.2-r2
 1505281123 metadata/md5-cache/net-misc/suite3270-3.3.9_p12
 1211091748 metadata/md5-cache/net-misc/netdate-1.2
-1505281123 metadata/md5-cache/net-misc/stunnel-5.16-r1
 1506030738 metadata/md5-cache/net-misc/packETH-1.7.3
 1505281123 metadata/md5-cache/net-misc/grdesktop-0.23-r1
 1505281123 metadata/md5-cache/net-misc/hylafaxplus-5.5.4-r1
@@ -39775,7 +39752,7 @@
 1506021106 metadata/md5-cache/net-misc/htbinit-0.8.5-r6
 1505281123 metadata/md5-cache/net-misc/dhcpcd-6.6.7
 1505281123 metadata/md5-cache/net-misc/badvpn-1.999.128
-1506160039 metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
+1506171307 metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
 1505281123 metadata/md5-cache/net-misc/suite3270-3.3.12_p12
 1506030738 metadata/md5-cache/net-misc/nx-3.5.0.28
 1505281123 metadata/md5-cache/net-misc/badvpn-1.999.127
@@ -39812,8 +39789,8 @@
 1506030739 metadata/md5-cache/www-misc/fcgiwrap-9999
 1505281128 metadata/md5-cache/www-misc/urlwatch-1.18
 1506030739 metadata/md5-cache/www-misc/gurlchecker-0.13.1-r1
-1506132238 metadata/md5-cache/www-misc/zoneminder-1.27.0
-1506132238 metadata/md5-cache/www-misc/zoneminder-1.28.0
+1506172337 metadata/md5-cache/www-misc/zoneminder-1.27.0
+1506172337 metadata/md5-cache/www-misc/zoneminder-1.28.0
 1505281128 metadata/md5-cache/www-misc/urlwatch-1.17
 1505281128 metadata/md5-cache/www-misc/bookmarksync-0.3.4-r2
 1506030739 metadata/md5-cache/www-misc/htdig-3.2.0_beta6-r3
@@ -39828,7 +39805,7 @@
 1505281128 metadata/md5-cache/www-misc/surl-0.7.1.1
 1506030739 metadata/md5-cache/www-misc/fcgiwrap-1.1.0-r1
 1506132036 metadata/md5-cache/www-misc/monitorix-3.5.1
-1506132238 metadata/md5-cache/www-misc/zoneminder-1.28.1
+1506172337 metadata/md5-cache/www-misc/zoneminder-1.28.1
 1506071607 metadata/md5-cache/www-misc/mergelog-4.5-r2
 1505281118 metadata/md5-cache/games-kids/pytraffic-2.5.4-r1
 1505281118 metadata/md5-cache/games-kids/tuxtype-1.8.1
@@ -39940,8 +39917,8 @@
 1505281108 metadata/md5-cache/app-shells/autojump-21.3.0-r1
 1505281123 metadata/md5-cache/net-nds/led-1.111
 1506030739 metadata/md5-cache/net-nds/openldap-2.4.40
-1506160039 metadata/md5-cache/net-nds/jxplorer-3.3.1
-1506160039 metadata/md5-cache/net-nds/jxplorer-3.2
+1506171307 metadata/md5-cache/net-nds/jxplorer-3.3.1
+1506171307 metadata/md5-cache/net-nds/jxplorer-3.2
 1506030739 metadata/md5-cache/net-nds/rpcbind-9999
 1506030739 metadata/md5-cache/net-nds/389-admin-1.1.31
 1506030739 metadata/md5-cache/net-nds/389-ds-base-1.3.0.2-r1
@@ -39970,14 +39947,14 @@
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-mail-2.6.12-r1
 1505281123 metadata/md5-cache/net-nds/rpcbind-0.2.3
 1505281123 metadata/md5-cache/net-nds/rpcbind-0.2.2-r1
-1505281123 metadata/md5-cache/net-nds/phpldapadmin-1.2.3
+1506172337 metadata/md5-cache/net-nds/phpldapadmin-1.2.3
 1505281123 metadata/md5-cache/net-nds/portmap-6.0
 1505281123 metadata/md5-cache/net-nds/gosa-plugin-systems-2.6.10
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-mail-2.6.12
 1506030739 metadata/md5-cache/net-nds/ypserv-2.26
 1506030739 metadata/md5-cache/net-nds/openldap-2.3.43-r4
 1505281123 metadata/md5-cache/net-nds/ypbind-1.37.2
-1506160039 metadata/md5-cache/net-nds/jxplorer-3.2-r2
+1506171307 metadata/md5-cache/net-nds/jxplorer-3.2-r2
 1505281123 metadata/md5-cache/net-nds/lat-1.2.3
 1506030739 metadata/md5-cache/net-nds/openldap-2.3.43-r3
 1506030739 metadata/md5-cache/net-nds/openldap-2.4.40-r2
@@ -39988,7 +39965,7 @@
 1505281123 metadata/md5-cache/net-nds/nsscache-0.23
 1505281123 metadata/md5-cache/net-nds/gosa-plugin-systems-2.6.11
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-samba-2.6.11
-1505281123 metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
+1506172337 metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-samba-2.6.10
 1506132237 metadata/md5-cache/net-nds/shelldap-1.3.0
 1505281123 metadata/md5-cache/net-nds/gosa-core-2.6.12
@@ -40122,7 +40099,7 @@
 1505281121 metadata/md5-cache/media-sound/smixer-1.0.4
 1506030738 metadata/md5-cache/media-sound/rezound-0.12.3_beta-r2
 1505281121 metadata/md5-cache/media-sound/schismtracker-20120105
-1506160039 metadata/md5-cache/media-sound/entagged-tageditor-0.35
+1506171307 metadata/md5-cache/media-sound/entagged-tageditor-0.35
 1506030738 metadata/md5-cache/media-sound/easytag-2.1.8
 1505281121 metadata/md5-cache/media-sound/audacious-3.3.4
 1505281121 metadata/md5-cache/media-sound/qarecord-0.5.0
@@ -40162,7 +40139,7 @@
 1506150836 metadata/md5-cache/media-sound/ncmpc-0.24-r1
 1505281121 metadata/md5-cache/media-sound/alsa-utils-1.0.28
 1506030738 metadata/md5-cache/media-sound/alsa-tools-1.0.27-r1
-1506160039 metadata/md5-cache/media-sound/protux-0.50.100
+1506171307 metadata/md5-cache/media-sound/protux-0.50.100
 1506030738 metadata/md5-cache/media-sound/pragha-1.3.1-r1
 1506162106 metadata/md5-cache/media-sound/qtractor-0.6.5
 1505281121 metadata/md5-cache/media-sound/gmusicbrowser-9999
@@ -40528,7 +40505,7 @@
 1506030738 metadata/md5-cache/media-sound/normalize-0.7.7-r1
 1505281121 metadata/md5-cache/media-sound/mcdp-0.4a
 1506162106 metadata/md5-cache/media-sound/murmur-1.2.8
-1506160039 metadata/md5-cache/media-sound/jtagger-1.0-r1
+1506171307 metadata/md5-cache/media-sound/jtagger-1.0-r1
 1506030738 metadata/md5-cache/media-sound/milkytracker-0.90.86
 1505281121 metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
 1506162106 metadata/md5-cache/media-sound/quimup-1.3.1
@@ -40991,7 +40968,6 @@
 1506071607 metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.8-r1
 1506021107 metadata/md5-cache/x11-drivers/radeon-ucode-20140823
 1506030740 metadata/md5-cache/x11-drivers/xf86-video-suncg6-1.1.1
-1506021107 metadata/md5-cache/x11-drivers/nvidia-drivers-352.09
 1506071607 metadata/md5-cache/x11-drivers/xf86-video-intel-2.21.15
 1506071607 metadata/md5-cache/x11-drivers/xf86-video-apm-1.2.5
 1506071608 metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.4
@@ -41089,6 +41065,7 @@
 1506071607 metadata/md5-cache/x11-drivers/xf86-input-mutouch-1.3.0
 1506071607 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.916
 1506071607 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.7.3
+1506180806 metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
 1506071607 metadata/md5-cache/x11-drivers/xf86-input-tslib-0.0.6-r3
 1506071608 metadata/md5-cache/x11-drivers/xf86-video-tseng-1.2.5
 1506071607 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.0
@@ -41252,7 +41229,7 @@
 1506030736 metadata/md5-cache/app-arch/pax-3.4.12.16-r1
 1505290836 metadata/md5-cache/app-arch/lrzip-0.621
 1505281106 metadata/md5-cache/app-arch/unzip-6.0-r1
-1506161206 metadata/md5-cache/app-arch/p7zip-9.20.1-r5
+1506180806 metadata/md5-cache/app-arch/p7zip-9.20.1-r5
 1505281106 metadata/md5-cache/app-arch/bsdsfv-1.18-r1
 1505281106 metadata/md5-cache/app-arch/plzip-1.3
 1505281106 metadata/md5-cache/app-arch/deb2targz-1-r2
@@ -41372,7 +41349,7 @@
 1506071607 metadata/md5-cache/net-im/gajim-0.16.1-r2
 1505281122 metadata/md5-cache/net-im/indicator-messages-0.6.0-r1
 1505281122 metadata/md5-cache/net-im/librvp-0.9.6
-1506160039 metadata/md5-cache/net-im/openfire-3.10.0
+1506171307 metadata/md5-cache/net-im/openfire-3.10.0
 1505281122 metadata/md5-cache/net-im/err-1.7.1
 1505281122 metadata/md5-cache/net-im/librvp-0.9.7
 1505281122 metadata/md5-cache/net-im/jabberd2-2.3.1-r1
@@ -41401,7 +41378,7 @@
 1405210707 metadata/md5-cache/net-im/ysm-2.9.9.1
 1505281122 metadata/md5-cache/net-im/cpop-0.0.4-r1
 1505281122 metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r4
-1506160039 metadata/md5-cache/net-im/kouchat-1.1.0
+1506171307 metadata/md5-cache/net-im/kouchat-1.1.0
 1506151737 metadata/md5-cache/net-im/ktp-call-ui-0.9.0
 1408060136 metadata/md5-cache/net-im/gg-transport-2.2.4
 1506162106 metadata/md5-cache/net-im/qtwitter-0.10.0-r1
@@ -41462,20 +41439,20 @@
 1506030737 metadata/md5-cache/games-mud/crystal-0.2.4
 1505281118 metadata/md5-cache/games-mud/tkmoo-0.3.32
 1505281123 metadata/md5-cache/net-p2p/bittornado-0.3.18-r2
-1506160039 metadata/md5-cache/net-p2p/frostwire-4.20.9
+1506171307 metadata/md5-cache/net-p2p/frostwire-4.20.9
 1505281123 metadata/md5-cache/net-p2p/deluge-1.3.11
 1505281123 metadata/md5-cache/net-p2p/datacoin-hp-9999
 1503220106 metadata/md5-cache/net-p2p/bitflu-1.50
 1506030739 metadata/md5-cache/net-p2p/ncdc-9999
 1505281124 metadata/md5-cache/net-p2p/saku-3.11.0-r1
-1506160039 metadata/md5-cache/net-p2p/freenet-0.7.5_p1467
+1506171307 metadata/md5-cache/net-p2p/freenet-0.7.5_p1467
 1506030739 metadata/md5-cache/net-p2p/bitcoind-0.10.0-r1
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-0.9.4
 1505281124 metadata/md5-cache/net-p2p/transmission-remote-cli-1.7.0
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-0.9.3-r1
 1505281124 metadata/md5-cache/net-p2p/tribler-6.0.3
 1506162107 metadata/md5-cache/net-p2p/retroshare-0.6.0_rc1
-1506160039 metadata/md5-cache/net-p2p/phex-3.2.0.102-r1
+1506171307 metadata/md5-cache/net-p2p/phex-3.2.0.102-r1
 1506162107 metadata/md5-cache/net-p2p/ppcoin-qt-0.4.0
 1505281124 metadata/md5-cache/net-p2p/gift-ares-0.3.0-r1
 1506162107 metadata/md5-cache/net-p2p/retroshare-0.5.5c
@@ -41487,21 +41464,21 @@
 1211091748 metadata/md5-cache/net-p2p/microdc-0.11.0
 1505281124 metadata/md5-cache/net-p2p/gnut-0.4.28-r1
 1505281123 metadata/md5-cache/net-p2p/eiskaltdcpp-2.2.9
-1506160039 metadata/md5-cache/net-p2p/i2p-0.9.18
+1506171307 metadata/md5-cache/net-p2p/i2p-0.9.18
 1505281124 metadata/md5-cache/net-p2p/multibit-0.5.18
 1506030739 metadata/md5-cache/net-p2p/mldonkey-3.1.3
 1506030739 metadata/md5-cache/net-p2p/bitcoin-cli-9999
 1505281123 metadata/md5-cache/net-p2p/deluge-9999
 1505281124 metadata/md5-cache/net-p2p/mktorrent-1.0-r1
-1506160039 metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+1506171307 metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
 1211091748 metadata/md5-cache/net-p2p/btpd-0.15
 1505281124 metadata/md5-cache/net-p2p/tvrss-1.8_beta
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-0.10.0-r1
 1506162107 metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.2
-1506160039 metadata/md5-cache/net-p2p/yaggui-0.9.2
+1506171307 metadata/md5-cache/net-p2p/yaggui-0.9.2
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-9999
 1211091748 metadata/md5-cache/net-p2p/smet2html-0.1
-1506160039 metadata/md5-cache/net-p2p/vuze-5.3.0.0
+1506171307 metadata/md5-cache/net-p2p/vuze-5.3.0.0
 1506030739 metadata/md5-cache/net-p2p/mldonkey-3.1.5
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-0.10.2
 1506030739 metadata/md5-cache/net-p2p/bitcoind-9999
@@ -41524,7 +41501,7 @@
 1503212336 metadata/md5-cache/net-p2p/soulseek-qt-20131106-r1
 1505281124 metadata/md5-cache/net-p2p/primecoind-0.1.2-r1
 1505281124 metadata/md5-cache/net-p2p/litecoind-0.8.7.4
-1506160039 metadata/md5-cache/net-p2p/vuze-5.6.0.0
+1506171307 metadata/md5-cache/net-p2p/vuze-5.6.0.0
 1506162107 metadata/md5-cache/net-p2p/bitcoin-qt-0.8.6-r1
 1505281124 metadata/md5-cache/net-p2p/tribler-6.3.3-r1
 1505281124 metadata/md5-cache/net-p2p/litecoind-0.8.7.2
@@ -41538,7 +41515,7 @@
 1505281124 metadata/md5-cache/net-p2p/pybitmessage-0.4.2
 1211091748 metadata/md5-cache/net-p2p/wire-1.0.2
 1505281124 metadata/md5-cache/net-p2p/torrentinfo-1.8.6
-1506160039 metadata/md5-cache/net-p2p/freenet-0.7.5_p1466
+1506171307 metadata/md5-cache/net-p2p/freenet-0.7.5_p1466
 1506162107 metadata/md5-cache/net-p2p/litecoin-qt-0.8.7.1
 1506030739 metadata/md5-cache/net-p2p/microdc2-0.15.6-r2
 1505281124 metadata/md5-cache/net-p2p/imule-2.3.2.3-r1
@@ -41561,7 +41538,7 @@
 1505281124 metadata/md5-cache/net-p2p/ppcoind-0.4.0
 1506162107 metadata/md5-cache/net-p2p/qbittorrent-3.1.9.2-r1
 1506030739 metadata/md5-cache/net-p2p/hx-0.4.11
-1506160039 metadata/md5-cache/net-p2p/myster-8.0-r1
+1506171307 metadata/md5-cache/net-p2p/myster-8.0-r1
 1505281124 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.0
 1505281124 metadata/md5-cache/net-p2p/gift-gnutella-0.0.11
 1505281123 metadata/md5-cache/net-p2p/fms-0.3.75
@@ -41605,7 +41582,7 @@
 1506030739 metadata/md5-cache/sys-cluster/cluster-glue-1.0.9-r1
 1506021107 metadata/md5-cache/sys-cluster/neutron-2014.2.3
 1505281127 metadata/md5-cache/sys-cluster/maui-3.3.1-r3
-1506160039 metadata/md5-cache/sys-cluster/projections-6.2.1
+1506171307 metadata/md5-cache/sys-cluster/projections-6.2.1
 1506030739 metadata/md5-cache/sys-cluster/ceph-0.93
 1505281127 metadata/md5-cache/sys-cluster/openmpi-1.8.5
 1505281127 metadata/md5-cache/sys-cluster/drbd-8.3.15
@@ -41614,8 +41591,10 @@
 1506030739 metadata/md5-cache/sys-cluster/ampi-0_pre20140616
 1506030739 metadata/md5-cache/sys-cluster/glusterfs-3.1.2
 1506021107 metadata/md5-cache/sys-cluster/ipvsadm-1.26-r2
+1506180106 metadata/md5-cache/sys-cluster/cinder-2015.1.0-r1
 1506030739 metadata/md5-cache/sys-cluster/maui-3.3
 1505281127 metadata/md5-cache/sys-cluster/cman-lib-2.03.09
+1506180106 metadata/md5-cache/sys-cluster/cinder-2014.2.3-r1
 1506021107 metadata/md5-cache/sys-cluster/libcman-3.2.0
 1506021107 metadata/md5-cache/sys-cluster/nova-2014.2.9999
 1505281127 metadata/md5-cache/sys-cluster/drbd-8.4.2
@@ -41645,7 +41624,6 @@
 1506071607 metadata/md5-cache/sys-cluster/libquo-1.2
 1506030739 metadata/md5-cache/sys-cluster/cluster-glue-1.0.10
 1505281127 metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
-1506021107 metadata/md5-cache/sys-cluster/nova-2015.1.0-r2
 1506030739 metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4
 1506021107 metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
 1211091751 metadata/md5-cache/sys-cluster/native-mpi-0
@@ -41668,9 +41646,9 @@
 1505281127 metadata/md5-cache/sys-cluster/libdlm-3.2.0
 1506030739 metadata/md5-cache/sys-cluster/corosync-2.3.4-r1
 1506030739 metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2
-1506021107 metadata/md5-cache/sys-cluster/cinder-2015.1.0
 1505281127 metadata/md5-cache/sys-cluster/drbd-8.4.0
 1506021107 metadata/md5-cache/sys-cluster/torque-4.1.7
+1506180036 metadata/md5-cache/sys-cluster/nova-2015.1.0-r3
 1505281127 metadata/md5-cache/sys-cluster/charm-6.5.1-r3
 1506151336 metadata/md5-cache/sys-cluster/vzctl-4.9.2
 1211091751 metadata/md5-cache/sys-cluster/xgridagent-1.0
@@ -41704,10 +41682,10 @@
 1506071607 metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
 1211091751 metadata/md5-cache/sys-cluster/onesis-2.0.2
 1506030739 metadata/md5-cache/sys-cluster/knem-9999
-1506021107 metadata/md5-cache/sys-cluster/nova-2015.1.9999
+1506180037 metadata/md5-cache/sys-cluster/nova-2015.1.9999
 1506021107 metadata/md5-cache/sys-cluster/ipvsadm-1.27
 1506021107 metadata/md5-cache/sys-cluster/neutron-2014.2.9999
-1506160039 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
+1506171307 metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
 1505281127 metadata/md5-cache/sys-cluster/ccs-2.03.09
 1506021107 metadata/md5-cache/sys-cluster/nova-2014.2.3
 1504181536 metadata/md5-cache/sys-cluster/poolmon-0.5
@@ -41726,15 +41704,15 @@
 1506071607 metadata/md5-cache/sys-cluster/crmsh-2.1.1
 1408110037 metadata/md5-cache/sys-cluster/lspbs-1.1-r1
 1506030739 metadata/md5-cache/sys-cluster/glusterfs-3.2.7
-1506021107 metadata/md5-cache/sys-cluster/swift-2.2.2-r1
+1506180037 metadata/md5-cache/sys-cluster/swift-2.2.2-r1
 1506030739 metadata/md5-cache/sys-cluster/keepalived-1.2.7-r2
 1506030739 metadata/md5-cache/sys-cluster/keepalived-1.2.9
 1505281127 metadata/md5-cache/sys-cluster/drbd-8.4.3
-1506021107 metadata/md5-cache/sys-cluster/swift-2.3.0
+1506180037 metadata/md5-cache/sys-cluster/swift-2.3.0
 1505281127 metadata/md5-cache/sys-cluster/rgmanager-2.03.09-r1
 1506030739 metadata/md5-cache/sys-cluster/corosync-1.3.0
 1505281127 metadata/md5-cache/sys-cluster/ganglia-3.6.0-r1
-1506021107 metadata/md5-cache/sys-cluster/cinder-2015.1.9999
+1506180036 metadata/md5-cache/sys-cluster/cinder-2015.1.9999
 1506021107 metadata/md5-cache/sys-cluster/libcman-3.1.5
 1506021107 metadata/md5-cache/sys-cluster/cinder-2014.2.2
 1505281127 metadata/md5-cache/sys-cluster/drbd-8.3.13
@@ -42004,124 +41982,124 @@
 1505281112 metadata/md5-cache/dev-ml/variantslib-109.15.02
 1506162106 metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20130904-r4
 1506170106 metadata/md5-cache/dev-qt/qthelp-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qtpositioning-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtopengl-5.4.2
 1506170106 metadata/md5-cache/dev-qt/pixeltool-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtcore-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtserialport-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtopengl-4.8.5
+1506171906 metadata/md5-cache/dev-qt/qtscript-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtscript-4.8.5
 1506170106 metadata/md5-cache/dev-qt/qdbusviewer-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtx11extras-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qdoc-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtquickcontrols-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtconcurrent-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtwebsockets-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtprintsupport-5.4.1
 1506162106 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20130904
 1506170106 metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qtquick1-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qtdiag-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qtwebsockets-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtdbus-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qttest-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtpaths-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qthelp-5.4.2
 1505281115 metadata/md5-cache/dev-qt/qdbusviewer-4.8.5
 1505281116 metadata/md5-cache/dev-qt/qtgui-4.8.5-r4
 1506170106 metadata/md5-cache/dev-qt/qtdemo-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtimageformats-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtgraphicaleffects-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtsvg-4.8.6-r1
 1506170106 metadata/md5-cache/dev-qt/qtopengl-4.8.6-r1
 1505281115 metadata/md5-cache/dev-qt/pixeltool-4.8.5
 1505281116 metadata/md5-cache/dev-qt/qtopenvg-4.8.5
+1506171906 metadata/md5-cache/dev-qt/qtdeclarative-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtsvg-4.8.5
 1506170106 metadata/md5-cache/dev-qt/assistant-4.8.6-r1
+1506171906 metadata/md5-cache/dev-qt/linguist-tools-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qtgui-5.4.1-r2
+1506171906 metadata/md5-cache/dev-qt/qtconcurrent-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qttranslations-5.4.2
+1506171906 metadata/md5-cache/dev-qt/pixeltool-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtmultimedia-4.8.6-r1
 1506170106 metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qdbus-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qttranslations-4.8.6-r1
 1505281116 metadata/md5-cache/dev-qt/qtsql-4.8.5
+1506171906 metadata/md5-cache/dev-qt/qtpositioning-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.5
 1506170106 metadata/md5-cache/dev-qt/designer-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qtsvg-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtsensors-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtimageformats-5.4.2
 1505281115 metadata/md5-cache/dev-qt/designer-4.8.5
 1505281115 metadata/md5-cache/dev-qt/qt3support-4.8.5
-1506092336 metadata/md5-cache/dev-qt/designer-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtsql-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qttranslations-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtmultimedia-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtopengl-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qtnetwork-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qttest-4.8.6-r1
 1506170106 metadata/md5-cache/dev-qt/qtscript-4.8.6-r2
 1506162106 metadata/md5-cache/dev-qt/qtchooser-0_p20150102
 1504012206 metadata/md5-cache/dev-qt/qt-meta-4.8.5
-1506092336 metadata/md5-cache/dev-qt/qtwidgets-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qdbusviewer-5.4.1
-1505281115 metadata/md5-cache/dev-qt/qt-docs-5.4.1_p0
+1506171906 metadata/md5-cache/dev-qt/qtx11extras-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qt3support-4.8.7
 1506170106 metadata/md5-cache/dev-qt/qtwebkit-4.8.7
+1506171906 metadata/md5-cache/dev-qt/assistant-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtwebkit-4.8.5
 1506170106 metadata/md5-cache/dev-qt/qtwebkit-4.8.6-r1
+1506171906 metadata/md5-cache/dev-qt/designer-5.4.2
 1506162106 metadata/md5-cache/dev-qt/qt-mobility-1.2.2_p20130703-r1
 1506170106 metadata/md5-cache/dev-qt/qtopenvg-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtquick1-5.4.1-r1
 1506170106 metadata/md5-cache/dev-qt/qtopenvg-4.8.7
-1506092336 metadata/md5-cache/dev-qt/pixeltool-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtwidgets-5.4.2
 1505281115 metadata/md5-cache/dev-qt/qtdeclarative-4.8.5
-1506092336 metadata/md5-cache/dev-qt/qtdbus-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtwayland-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtprintsupport-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qtwebkit-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qtmultimedia-4.8.5
 1505281115 metadata/md5-cache/dev-qt/assistant-4.8.5
-1506092336 metadata/md5-cache/dev-qt/qtmultimedia-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtdiag-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qtdeclarative-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtdeclarative-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtquickcontrols-5.4.2
 1505281115 metadata/md5-cache/dev-qt/qtdbus-4.8.5
-1506092336 metadata/md5-cache/dev-qt/qthelp-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtxml-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtdemo-4.8.7
-1506092336 metadata/md5-cache/dev-qt/assistant-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtcore-5.4.2
 1505281115 metadata/md5-cache/dev-qt/qtdemo-4.8.5-r1
-1506092336 metadata/md5-cache/dev-qt/qtnetwork-5.4.1
-1506092336 metadata/md5-cache/dev-qt/qtxml-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qttest-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qttranslations-4.8.7
 1506170106 metadata/md5-cache/dev-qt/linguist-4.8.6-r1
 1506170106 metadata/md5-cache/dev-qt/qthelp-4.8.6-r3
-1506092336 metadata/md5-cache/dev-qt/qtwebkit-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
 1506162106 metadata/md5-cache/dev-qt/qt-creator-3.4.1
 1506170106 metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.6-r1
 1505281116 metadata/md5-cache/dev-qt/qthelp-4.8.5-r2
-1506092336 metadata/md5-cache/dev-qt/linguist-tools-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtsql-5.4.2
 1506042236 metadata/md5-cache/dev-qt/qtphonon-4.8.5
 1505281115 metadata/md5-cache/dev-qt/linguist-4.8.5
 1506170106 metadata/md5-cache/dev-qt/qtgui-4.8.6-r4
 1506162106 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20130904-r2
-1506092336 metadata/md5-cache/dev-qt/linguist-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qtdbus-4.8.6-r1
 1506162106 metadata/md5-cache/dev-qt/qt-creator-3.2.2
+1506171906 metadata/md5-cache/dev-qt/linguist-5.4.2
 1506170106 metadata/md5-cache/dev-qt/pixeltool-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qdbus-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qttest-4.8.7
 1506170106 metadata/md5-cache/dev-qt/qtbearer-4.8.6-r1
+1506171906 metadata/md5-cache/dev-qt/qtwayland-5.4.2
 1506170106 metadata/md5-cache/dev-qt/designer-4.8.6-r1
 1505281115 metadata/md5-cache/dev-qt/qtbearer-4.8.5
-1506092336 metadata/md5-cache/dev-qt/qtscript-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qdbusviewer-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qtgui-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtsvg-4.8.7
 1505281115 metadata/md5-cache/dev-qt/qtcore-4.8.5-r2
 1506170106 metadata/md5-cache/dev-qt/qtbearer-4.8.7
-1506092336 metadata/md5-cache/dev-qt/qtopengl-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qtcore-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qdoc-5.4.2
 1505281116 metadata/md5-cache/dev-qt/qttest-4.8.5
 1506170106 metadata/md5-cache/dev-qt/qtphonon-4.8.7
+1506171707 metadata/md5-cache/dev-qt/qt-docs-5.4.2_p0
 1506170106 metadata/md5-cache/dev-qt/linguist-4.8.7
 1506162106 metadata/md5-cache/dev-qt/qt-creator-2.8.1
 1506170106 metadata/md5-cache/dev-qt/qt3support-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtsql-5.4.1
 1506170106 metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
 1506170106 metadata/md5-cache/dev-qt/qtcore-4.8.6-r2
 1506170106 metadata/md5-cache/dev-qt/qtgui-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qtpaths-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtsql-4.8.6-r1
-1506092336 metadata/md5-cache/dev-qt/qtserialport-5.4.1
+1506171906 metadata/md5-cache/dev-qt/qtsensors-5.4.2
+1506171906 metadata/md5-cache/dev-qt/qtdbus-5.4.2
 1506162106 metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20130904-r1
 1506170106 metadata/md5-cache/dev-qt/assistant-4.8.7
+1506171906 metadata/md5-cache/dev-qt/qtsvg-5.4.2
 1506170106 metadata/md5-cache/dev-qt/qtscript-4.8.7
 1505281124 metadata/md5-cache/sci-geosciences/gpsd-3.6
 1408110037 metadata/md5-cache/sci-geosciences/harmonics-dwf-free-noncomm-20111230-r1
@@ -42129,7 +42107,7 @@
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-plugin-weather_routing-1.2
 1506091736 metadata/md5-cache/sci-geosciences/geocode-glib-3.16.2
 1506132238 metadata/md5-cache/sci-geosciences/mapserver-6.0.1-r3
-1506160039 metadata/md5-cache/sci-geosciences/josm-5485
+1506171307 metadata/md5-cache/sci-geosciences/josm-5485
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-3.2.2
 1505281124 metadata/md5-cache/sci-geosciences/qgis-1.7.0
 1506030739 metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
@@ -42138,7 +42116,7 @@
 1505281124 metadata/md5-cache/sci-geosciences/qlandkartegt-1.8.0
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-3.0.2
 1309021236 metadata/md5-cache/sci-geosciences/tcd-utils-20120115
-1506160039 metadata/md5-cache/sci-geosciences/josm-7347
+1506171307 metadata/md5-cache/sci-geosciences/josm-7347
 1505281124 metadata/md5-cache/sci-geosciences/congen-1.6.1_p2
 1408110037 metadata/md5-cache/sci-geosciences/mtkbabel-0.8.2
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-plugin-objsearch-0.5.1
@@ -42146,8 +42124,8 @@
 1505281124 metadata/md5-cache/sci-geosciences/gpsd-3.13
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-plugin-weatherfax-1.3
 1505281124 metadata/md5-cache/sci-geosciences/qlandkartegt-garmindev-0.3.4
-1506160039 metadata/md5-cache/sci-geosciences/josm-5608
-1506160039 metadata/md5-cache/sci-geosciences/josm-6060
+1506171307 metadata/md5-cache/sci-geosciences/josm-5608
+1506171307 metadata/md5-cache/sci-geosciences/josm-6060
 1505281124 metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.6-r2
 1506132237 metadata/md5-cache/sci-geosciences/mapserver-6.0.1-r2
 1506030739 metadata/md5-cache/sci-geosciences/gpsd-2.95-r1
@@ -42174,13 +42152,14 @@
 1505281124 metadata/md5-cache/sci-geosciences/libtcd-2.2.5_p2
 1403102136 metadata/md5-cache/sci-geosciences/mapnik-world-boundaries-20090514
 1506071607 metadata/md5-cache/sci-geosciences/gmt-4.5.9
-1506160039 metadata/md5-cache/sci-geosciences/mkgmap-1995
+1506171307 metadata/md5-cache/sci-geosciences/mkgmap-1995
 1505281124 metadata/md5-cache/sci-geosciences/mapnik-2.0.2
 1506162107 metadata/md5-cache/sci-geosciences/gpsbabel-1.4.3
 1505281124 metadata/md5-cache/sci-geosciences/mapnik-2.2.0
 1506030739 metadata/md5-cache/sci-geosciences/grass-6.4.2
+1506180806 metadata/md5-cache/sci-geosciences/osm2pgsql-0.87.1
 1506030739 metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
-1506160039 metadata/md5-cache/sci-geosciences/bt747-2.0.3
+1506171307 metadata/md5-cache/sci-geosciences/bt747-2.0.3
 1505281124 metadata/md5-cache/sci-geosciences/foxtrotgps-1.1.0
 1505281124 metadata/md5-cache/sci-geosciences/tappy-0.9.0
 1506030739 metadata/md5-cache/sci-geosciences/osm2pgsql-0.86.0
@@ -42189,7 +42168,7 @@
 1505281124 metadata/md5-cache/sci-geosciences/qlandkartegt-1.7.7
 1505281124 metadata/md5-cache/sci-geosciences/swmm-5.0.022
 1505281124 metadata/md5-cache/sci-geosciences/qgis-1.8.0
-1506160039 metadata/md5-cache/sci-geosciences/osmosis-0.35.1
+1506171307 metadata/md5-cache/sci-geosciences/osmosis-0.35.1
 1506030739 metadata/md5-cache/sci-geosciences/gmt-4.5.6
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-plugin-logbookkonni-1.2012
 1506072106 metadata/md5-cache/sci-geosciences/gpsd-3.15
@@ -42212,7 +42191,7 @@
 1506162107 metadata/md5-cache/sci-geosciences/gebabbel-0.4
 1505281124 metadata/md5-cache/sci-geosciences/gpsd-3.7
 1505281124 metadata/md5-cache/sci-geosciences/gnome-maps-3.14.2
-1506160039 metadata/md5-cache/sci-geosciences/josm-9999
+1506171307 metadata/md5-cache/sci-geosciences/josm-9999
 1505281124 metadata/md5-cache/sci-geosciences/seawater-3.3.2
 1505281124 metadata/md5-cache/sci-geosciences/viking-1.6-r2
 1505281124 metadata/md5-cache/sci-geosciences/opencpn-plugin-wmm-1.0
@@ -42686,7 +42665,7 @@
 1506030739 metadata/md5-cache/sci-visualization/opendx-4.4.4-r4
 1506071607 metadata/md5-cache/sci-visualization/fityk-1.2.1
 1506030739 metadata/md5-cache/sci-visualization/xgraph-12.1-r3
-1506160039 metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
+1506171307 metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
 1505281125 metadata/md5-cache/sci-visualization/pyxplot-0.9.2
 1505281125 metadata/md5-cache/sci-visualization/paraview-4.1.0-r2
 1505281125 metadata/md5-cache/sci-visualization/gri-2.12.19
@@ -42708,7 +42687,7 @@
 1506071607 metadata/md5-cache/sci-visualization/fityk-1.2.9
 1505281125 metadata/md5-cache/sci-visualization/fig2sxd-0.21
 1506030739 metadata/md5-cache/sci-visualization/ggobi-2.1.9-r1
-1505281125 metadata/md5-cache/sci-visualization/veusz-1.23
+1506172137 metadata/md5-cache/sci-visualization/veusz-1.23
 1505281125 metadata/md5-cache/sci-visualization/xds-viewer-0.6
 1505281125 metadata/md5-cache/sci-visualization/grace-5.1.22-r2
 1506071607 metadata/md5-cache/sci-visualization/quickplot-0.10.8
@@ -42793,17 +42772,17 @@
 1505281118 metadata/md5-cache/games-strategy/gwp-0.4.0-r3
 1505281118 metadata/md5-cache/games-strategy/dunelegacy-0.96.3
 1506090036 metadata/md5-cache/games-strategy/lightyears-1.4-r1
-1506160039 metadata/md5-cache/games-strategy/triplea-1.7.0.3
+1506171307 metadata/md5-cache/games-strategy/triplea-1.7.0.3
 1505281118 metadata/md5-cache/games-strategy/netpanzer-0.8.2
 1505281118 metadata/md5-cache/games-strategy/ufo-ai-2.4
 1505281118 metadata/md5-cache/games-strategy/freeorion-0.4.5_pre
 1505281118 metadata/md5-cache/games-strategy/glob2-0.9.4.4-r1
 1506020006 metadata/md5-cache/games-strategy/majesty-demo-1.0.0
-1506160039 metadata/md5-cache/games-strategy/freecol-0.10.7
+1506171307 metadata/md5-cache/games-strategy/freecol-0.10.7
 1505281118 metadata/md5-cache/games-strategy/netherearth-0.52
 1505281118 metadata/md5-cache/games-strategy/wargus-2.2.7
 1505281118 metadata/md5-cache/games-strategy/outerspace-0.5.68
-1506160039 metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12
+1506171307 metadata/md5-cache/games-strategy/revenge-of-the-titans-1.80.12
 1505281118 metadata/md5-cache/games-strategy/smac-6.0a
 1506020006 metadata/md5-cache/games-strategy/coldwar-demo-1-r2
 1506051136 metadata/md5-cache/games-strategy/seven-kingdoms-2.14.5
@@ -42819,7 +42798,7 @@
 1505281118 metadata/md5-cache/games-strategy/dopewars-1.5.12-r2
 1506020006 metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
 1505281118 metadata/md5-cache/games-strategy/crimson-0.5.3
-1506160039 metadata/md5-cache/games-strategy/triplea-1.8.0.5
+1506171307 metadata/md5-cache/games-strategy/triplea-1.8.0.5
 1506162106 metadata/md5-cache/games-strategy/attal-0.10.1
 1505281118 metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
 1505281118 metadata/md5-cache/games-strategy/xbattle-5.4.1
@@ -42978,7 +42957,7 @@
 1505281106 metadata/md5-cache/app-admin/syslog-ng-3.4.8
 1505281106 metadata/md5-cache/app-admin/packagekit-gtk-0.7.4
 1505281106 metadata/md5-cache/app-admin/stow-2.2.0-r2
-1506160036 metadata/md5-cache/app-admin/389-console-1.1.7-r1
+1506171306 metadata/md5-cache/app-admin/389-console-1.1.7-r1
 1301140236 metadata/md5-cache/app-admin/hwreport-0.11.0
 1504302306 metadata/md5-cache/app-admin/restart_services-0.11.0
 1506132236 metadata/md5-cache/app-admin/rex-0.56.1
@@ -42994,7 +42973,7 @@
 1506071606 metadata/md5-cache/app-admin/testdisk-7.0
 1506030736 metadata/md5-cache/app-admin/eselect-9999
 1505281106 metadata/md5-cache/app-admin/keepassx-2.0_alpha6
-1506160036 metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+1506171306 metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
 1408101436 metadata/md5-cache/app-admin/hardening-check-2.5
 1501091836 metadata/md5-cache/app-admin/sagan-rules-20140617
 1505281106 metadata/md5-cache/app-admin/salt-2014.7.4
@@ -43049,7 +43028,7 @@
 1312241706 metadata/md5-cache/app-admin/lsyncd-2.1.5
 1506071606 metadata/md5-cache/app-admin/augeas-1.1.0
 1505281106 metadata/md5-cache/app-admin/sulfur-1.0_rc104-r1
-1506160036 metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+1506171306 metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
 1506160036 metadata/md5-cache/app-admin/setools-3.3.8-r5
 1505281106 metadata/md5-cache/app-admin/fetchlog-1.4
 1408032306 metadata/md5-cache/app-admin/emacs-updater-1.14
@@ -43221,7 +43200,7 @@
 1506030736 metadata/md5-cache/app-admin/logmon-0.4.4-r1
 1506030736 metadata/md5-cache/app-admin/geolizer-2.01.10_p20070115-r1
 1505281106 metadata/md5-cache/app-admin/sysklogd-1.5.1
-1506160036 metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
+1506171306 metadata/md5-cache/app-admin/ec2-api-tools-1.6.7.2-r4
 1505281106 metadata/md5-cache/app-admin/eclean-kernel-0.4.1
 1506071606 metadata/md5-cache/app-admin/ulogd-2.0.5
 1506030736 metadata/md5-cache/app-admin/tripwire-2.4.2.2-r3
@@ -43292,7 +43271,7 @@
 1505281106 metadata/md5-cache/app-admin/usermin-1.600
 1505281106 metadata/md5-cache/app-admin/drush-6.5.0
 1506030736 metadata/md5-cache/app-admin/tripwire-2.4.2.2
-1506111736 metadata/md5-cache/app-admin/logrotate-3.8.9-r1
+1506172206 metadata/md5-cache/app-admin/logrotate-3.8.9-r1
 1503201936 metadata/md5-cache/app-admin/logstash-forwarder-0.4.0
 1505281106 metadata/md5-cache/app-admin/haskell-updater-1.2.1
 1506050106 metadata/md5-cache/app-admin/salt-2015.5.2
@@ -43320,1195 +43299,1172 @@
 1505281106 metadata/md5-cache/app-admin/keepass-2.29
 1408100606 metadata/md5-cache/app-admin/logcheck-1.3.15-r1
 1505281106 metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
-1506161206 metadata/md5-cache/dev-java/antlr-4.4
-1506160037 metadata/md5-cache/dev-java/junrar-0.6
-1506160037 metadata/md5-cache/dev-java/joda-time-2.7
-1506160037 metadata/md5-cache/dev-java/netty-transport-4.0.19
-1506160037 metadata/md5-cache/dev-java/ws-commons-util-1.0.1
-1506162237 metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
-1506160037 metadata/md5-cache/dev-java/proguard-5.2.1
-1506160037 metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
-1506160037 metadata/md5-cache/dev-java/rome-0.9
-1506160036 metadata/md5-cache/dev-java/echo2-2.1.1
-1506160037 metadata/md5-cache/dev-java/pat-1.5.3
-1506160036 metadata/md5-cache/dev-java/ant-antlr-1.8.4
-1506160036 metadata/md5-cache/dev-java/ant-antlr-1.9.1
-1506160036 metadata/md5-cache/dev-java/apt-mirror-1.0
-1506160037 metadata/md5-cache/dev-java/oracle-javamail-1.5.2
-1506160036 metadata/md5-cache/dev-java/ant-junit4-1.9.2
-1506160037 metadata/md5-cache/dev-java/hessian-3.1.6
-1506160037 metadata/md5-cache/dev-java/slf4j-simple-1.7.5
-1506160036 metadata/md5-cache/dev-java/bcprov-1.40-r1
-1506160036 metadata/md5-cache/dev-java/bytecode-20081007
-1506160037 metadata/md5-cache/dev-java/jsr67-1.3
-1506160037 metadata/md5-cache/dev-java/telnetd-2.0
-1506160037 metadata/md5-cache/dev-java/guava-07
-1506160037 metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
-1506160037 metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
-1506160037 metadata/md5-cache/dev-java/jcommon-1.0.23
-1506160036 metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4
-1506160037 metadata/md5-cache/dev-java/java-dep-check-0.3
-1506160037 metadata/md5-cache/dev-java/jsoup-1.8.1
-1506160037 metadata/md5-cache/dev-java/jdom-1.0_beta10-r6
-1506160037 metadata/md5-cache/dev-java/icu4j-52.1
-1506160037 metadata/md5-cache/dev-java/lucene-2.4.1
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-2.0.2
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.2
-1506160037 metadata/md5-cache/dev-java/joda-time-1.6
-1506160037 metadata/md5-cache/dev-java/glassfish-deployment-api-1.2
-1506160036 metadata/md5-cache/dev-java/commons-pool-1.6
-1506160037 metadata/md5-cache/dev-java/jflex-1.6.0
-1506160037 metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
-1506160037 metadata/md5-cache/dev-java/swt-4.2-r1
-1506160036 metadata/md5-cache/dev-java/ant-junit-1.9.2
-1506160037 metadata/md5-cache/dev-java/log4j-1.2.17
-1506160037 metadata/md5-cache/dev-java/junitperf-1.9.1-r1
-1506160037 metadata/md5-cache/dev-java/snakeyaml-1.11
-1506160037 metadata/md5-cache/dev-java/swt-3.5.2
-1506160037 metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
-1506160037 metadata/md5-cache/dev-java/jcs-2.0
-1506160037 metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
-1506160036 metadata/md5-cache/dev-java/bcprov-1.38-r2
-1506160036 metadata/md5-cache/dev-java/boilerpipe-1.2.0
-1506160036 metadata/md5-cache/dev-java/colt-1.2.0-r2
-1506160037 metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1
-1506160037 metadata/md5-cache/dev-java/istack-commons-soimp-2.22
-1506160036 metadata/md5-cache/dev-java/aspectwerkz-2.0
-1506160036 metadata/md5-cache/dev-java/ant-commons-net-1.8.4
-1506160037 metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
-1506160037 metadata/md5-cache/dev-java/mx4j-3.0.2-r1
-1506160037 metadata/md5-cache/dev-java/jta-1.1
-1506160037 metadata/md5-cache/dev-java/helpgui-1.1-r2
-1506160037 metadata/md5-cache/dev-java/tomcat-native-1.1.33
-1506160037 metadata/md5-cache/dev-java/jempbox-1.7.1
-1506160037 metadata/md5-cache/dev-java/swt-3.7.2-r1
-1506160037 metadata/md5-cache/dev-java/trove-2.1.0
-1506160036 metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1
-1506160037 metadata/md5-cache/dev-java/jpf-1.5.1
-1506160037 metadata/md5-cache/dev-java/jacl-1.4.1
-1506160036 metadata/md5-cache/dev-java/felix-shell-1.4.3
-1506160036 metadata/md5-cache/dev-java/ant-junit4-1.8.2
-1506161236 metadata/md5-cache/dev-java/jdom-2.0.6
-1506160036 metadata/md5-cache/dev-java/ant-owanttask-1.3.2
-1506160036 metadata/md5-cache/dev-java/commons-net-3.2
-1506160037 metadata/md5-cache/dev-java/jnr-posix-3.0.0
-1506160037 metadata/md5-cache/dev-java/logback-1.0.13
-1506160037 metadata/md5-cache/dev-java/iso-relax-20050331-r1
-1506160037 metadata/md5-cache/dev-java/xalan-serializer-2.7.1
-1506160037 metadata/md5-cache/dev-java/slf4j-nop-1.6.6
-1506160036 metadata/md5-cache/dev-java/commons-logging-1.2
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.3.3
-1506160037 metadata/md5-cache/dev-java/hamcrest-core-1.3
-1506160037 metadata/md5-cache/dev-java/mg4j-0.9.1-r2
-1506160037 metadata/md5-cache/dev-java/velocity-1.6.3
-1506160037 metadata/md5-cache/dev-java/spring-expression-3.2.4
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-1.0.10
-1506160037 metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1
-1506160037 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
-1506160037 metadata/md5-cache/dev-java/javolution-6.0.0
-1506160037 metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
-1506160037 metadata/md5-cache/dev-java/lucene-2.2.0-r1
-1506160037 metadata/md5-cache/dev-java/guava-17.0
-1506160037 metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
+1506171306 metadata/md5-cache/dev-java/antlr-4.4
+1506171307 metadata/md5-cache/dev-java/junrar-0.6
+1506171307 metadata/md5-cache/dev-java/joda-time-2.7
+1506171307 metadata/md5-cache/dev-java/netty-transport-4.0.19
+1506171307 metadata/md5-cache/dev-java/ws-commons-util-1.0.1
+1506171306 metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
+1506171307 metadata/md5-cache/dev-java/proguard-5.2.1
+1506171307 metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
+1506171307 metadata/md5-cache/dev-java/rome-0.9
+1506171306 metadata/md5-cache/dev-java/echo2-2.1.1
+1506171307 metadata/md5-cache/dev-java/pat-1.5.3
+1506171306 metadata/md5-cache/dev-java/ant-antlr-1.8.4
+1506171306 metadata/md5-cache/dev-java/ant-antlr-1.9.1
+1506171306 metadata/md5-cache/dev-java/apt-mirror-1.0
+1506171307 metadata/md5-cache/dev-java/oracle-javamail-1.5.2
+1506171306 metadata/md5-cache/dev-java/ant-junit4-1.9.2
+1506171306 metadata/md5-cache/dev-java/hessian-3.1.6
+1506171307 metadata/md5-cache/dev-java/slf4j-simple-1.7.5
+1506171306 metadata/md5-cache/dev-java/bcprov-1.40-r1
+1506171306 metadata/md5-cache/dev-java/bytecode-20081007
+1506171307 metadata/md5-cache/dev-java/jsr67-1.3
+1506171307 metadata/md5-cache/dev-java/telnetd-2.0
+1506171306 metadata/md5-cache/dev-java/guava-07
+1506171307 metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5
+1506171307 metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
+1506171307 metadata/md5-cache/dev-java/jcommon-1.0.23
+1506171306 metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.4
+1506171306 metadata/md5-cache/dev-java/java-dep-check-0.3
+1506171307 metadata/md5-cache/dev-java/jsoup-1.8.1
+1506171307 metadata/md5-cache/dev-java/jdom-1.0_beta10-r6
+1506171306 metadata/md5-cache/dev-java/icu4j-52.1
+1506171307 metadata/md5-cache/dev-java/lucene-2.4.1
+1506172007 metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+1506171307 metadata/md5-cache/dev-java/joda-time-1.6
+1506171306 metadata/md5-cache/dev-java/glassfish-deployment-api-1.2
+1506171306 metadata/md5-cache/dev-java/commons-pool-1.6
+1506171307 metadata/md5-cache/dev-java/jflex-1.6.0
+1506171307 metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
+1506171307 metadata/md5-cache/dev-java/swt-4.2-r1
+1506171306 metadata/md5-cache/dev-java/ant-junit-1.9.2
+1506171307 metadata/md5-cache/dev-java/log4j-1.2.17
+1506171307 metadata/md5-cache/dev-java/junitperf-1.9.1-r1
+1506171307 metadata/md5-cache/dev-java/snakeyaml-1.11
+1506171307 metadata/md5-cache/dev-java/swt-3.5.2
+1506171307 metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
+1506171307 metadata/md5-cache/dev-java/jcs-2.0
+1506171307 metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
+1506171306 metadata/md5-cache/dev-java/bcprov-1.38-r2
+1506171306 metadata/md5-cache/dev-java/boilerpipe-1.2.0
+1506171306 metadata/md5-cache/dev-java/colt-1.2.0-r2
+1506171306 metadata/md5-cache/dev-java/ical4j-1.0_beta2-r1
+1506171306 metadata/md5-cache/dev-java/istack-commons-soimp-2.22
+1506171306 metadata/md5-cache/dev-java/aspectwerkz-2.0
+1506171306 metadata/md5-cache/dev-java/ant-commons-net-1.8.4
+1506171306 metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
+1506171307 metadata/md5-cache/dev-java/mx4j-3.0.2-r1
+1506171307 metadata/md5-cache/dev-java/jta-1.1
+1506171306 metadata/md5-cache/dev-java/helpgui-1.1-r2
+1506171307 metadata/md5-cache/dev-java/tomcat-native-1.1.33
+1506171307 metadata/md5-cache/dev-java/jempbox-1.7.1
+1506171307 metadata/md5-cache/dev-java/swt-3.7.2-r1
+1506171307 metadata/md5-cache/dev-java/trove-2.1.0
+1506171306 metadata/md5-cache/dev-java/ant-apache-bsf-1.9.1
+1506171307 metadata/md5-cache/dev-java/jpf-1.5.1
+1506171306 metadata/md5-cache/dev-java/jacl-1.4.1
+1506171306 metadata/md5-cache/dev-java/felix-shell-1.4.3
+1506171306 metadata/md5-cache/dev-java/ant-junit4-1.8.2
+1506171307 metadata/md5-cache/dev-java/jdom-2.0.6
+1506171306 metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+1506171306 metadata/md5-cache/dev-java/commons-net-3.2
+1506171307 metadata/md5-cache/dev-java/logback-1.0.13
+1506171306 metadata/md5-cache/dev-java/iso-relax-20050331-r1
+1506171307 metadata/md5-cache/dev-java/xalan-serializer-2.7.1
+1506171307 metadata/md5-cache/dev-java/slf4j-nop-1.6.6
+1506171306 metadata/md5-cache/dev-java/commons-logging-1.2
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.3.3
+1506171306 metadata/md5-cache/dev-java/hamcrest-core-1.3
+1506171307 metadata/md5-cache/dev-java/mg4j-0.9.1-r2
+1506171307 metadata/md5-cache/dev-java/velocity-1.6.3
+1506171307 metadata/md5-cache/dev-java/spring-expression-3.2.4
+1506172007 metadata/md5-cache/dev-java/jnr-ffi-1.0.10
+1506171306 metadata/md5-cache/dev-java/jax-ws-tools-2.0.1-r1
+1506171307 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
+1506171306 metadata/md5-cache/dev-java/javolution-6.0.0
+1506171306 metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
+1506171307 metadata/md5-cache/dev-java/lucene-2.2.0-r1
+1506171306 metadata/md5-cache/dev-java/guava-17.0
+1506171307 metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
 1506030736 metadata/md5-cache/dev-java/jamvm-1.5.4-r2
-1506160037 metadata/md5-cache/dev-java/poi-3.2
-1506160037 metadata/md5-cache/dev-java/jcodings-1.0.11
-1506160037 metadata/md5-cache/dev-java/jflex-1.5.0
-1506160036 metadata/md5-cache/dev-java/ant-commons-net-1.8.2
-1506160037 metadata/md5-cache/dev-java/jettison-1.0
-1506160037 metadata/md5-cache/dev-java/httpcomponents-core-4.2.4
+1506171307 metadata/md5-cache/dev-java/poi-3.2
+1506171307 metadata/md5-cache/dev-java/jcodings-1.0.11
+1506171307 metadata/md5-cache/dev-java/jflex-1.5.0
+1506171306 metadata/md5-cache/dev-java/ant-commons-net-1.8.2
+1506171307 metadata/md5-cache/dev-java/jettison-1.0
+1506171306 metadata/md5-cache/dev-java/httpcomponents-core-4.2.4
 1506142236 metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
-1506160037 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
-1506160036 metadata/md5-cache/dev-java/ant-trax-1.9.1
-1506160037 metadata/md5-cache/dev-java/snappy-1.1.0.1
-1506160037 metadata/md5-cache/dev-java/pdf-renderer-1.0.5
-1506160036 metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1
-1506160037 metadata/md5-cache/dev-java/mx4j-core-3.0.1
-1506160036 metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
-1506160036 metadata/md5-cache/dev-java/dtdparser-1.21-r1
-1506160037 metadata/md5-cache/dev-java/jffi-1.0.11
-1506160037 metadata/md5-cache/dev-java/tclib-1.1
-1506160037 metadata/md5-cache/dev-java/lucene-2.1.0-r2
-1506160037 metadata/md5-cache/dev-java/httpcomponents-core-4.3
-1506160036 metadata/md5-cache/dev-java/dynalang-0.4
-1506160037 metadata/md5-cache/dev-java/netty-codec-4.0.21
-1506160037 metadata/md5-cache/dev-java/microba-0.4.4
-1506160037 metadata/md5-cache/dev-java/struts-core-2.3.15.2
-1506160037 metadata/md5-cache/dev-java/netty-handler-4.0.19
-1506160036 metadata/md5-cache/dev-java/ant-apache-oro-1.9.1
-1506160037 metadata/md5-cache/dev-java/mockobjects-0.09-r4
-1506160036 metadata/md5-cache/dev-java/colt-1.2.0-r1
-1506160036 metadata/md5-cache/dev-java/charva-1.1.4-r1
-1506160036 metadata/md5-cache/dev-java/commons-beanutils-1.8.3
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.1.2
-1506160037 metadata/md5-cache/dev-java/osgi-core-api-5.0.0
-1506160037 metadata/md5-cache/dev-java/lucene-1.4.3-r3
-1506160037 metadata/md5-cache/dev-java/netty-common-4.0.19
-1506160037 metadata/md5-cache/dev-java/osgi-core-api-4.3
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
-1506160037 metadata/md5-cache/dev-java/icedtea-6.1.13.5
-1506160037 metadata/md5-cache/dev-java/jzlib-1.1.3
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.5
-1506160037 metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1
-1506160037 metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
-1506160037 metadata/md5-cache/dev-java/itext-2.1.5-r2
-1506160037 metadata/md5-cache/dev-java/jaxr-1.0.6
-1506160037 metadata/md5-cache/dev-java/fscript-1.17-r1
-1506160036 metadata/md5-cache/dev-java/ant-junit-1.8.4
-1506160036 metadata/md5-cache/dev-java/ant-commons-logging-1.8.2
-1506160037 metadata/md5-cache/dev-java/neuroph-2.3
-1506160037 metadata/md5-cache/dev-java/proguard-4.8
-1506160037 metadata/md5-cache/dev-java/jcifs-1.3.17-r1
-1506170607 metadata/md5-cache/dev-java/dom4j-1.6.1-r5
-1506160037 metadata/md5-cache/dev-java/jopt-simple-4.4
-1506160037 metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
-1506160037 metadata/md5-cache/dev-java/icedtea-6.1.13.7
-1506160036 metadata/md5-cache/dev-java/blowfishj-2.14-r2
-1506160037 metadata/md5-cache/dev-java/jna-3.4.0
-1506160037 metadata/md5-cache/dev-java/shared-objects-1.4-r3
-1506160036 metadata/md5-cache/dev-java/ant-swing-1.8.2
-1506160037 metadata/md5-cache/dev-java/lucene-2.3.2-r2
-1506160037 metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.0-r2
-1506160037 metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
-1506160036 metadata/md5-cache/dev-java/dom4j-1.6.1-r4
-1506160036 metadata/md5-cache/dev-java/commons-jexl-2.1.1
-1506160037 metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
+1506171306 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
+1506171306 metadata/md5-cache/dev-java/ant-trax-1.9.1
+1506171307 metadata/md5-cache/dev-java/snappy-1.1.0.1
+1506171307 metadata/md5-cache/dev-java/pdf-renderer-1.0.5
+1506171306 metadata/md5-cache/dev-java/exolabtools-1.0_p20050205-r1
+1506171307 metadata/md5-cache/dev-java/mx4j-core-3.0.1
+1506171306 metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
+1506171306 metadata/md5-cache/dev-java/dtdparser-1.21-r1
+1506171307 metadata/md5-cache/dev-java/jffi-1.0.11
+1506171307 metadata/md5-cache/dev-java/tclib-1.1
+1506171307 metadata/md5-cache/dev-java/lucene-2.1.0-r2
+1506171306 metadata/md5-cache/dev-java/httpcomponents-core-4.3
+1506171306 metadata/md5-cache/dev-java/dynalang-0.4
+1506171307 metadata/md5-cache/dev-java/netty-codec-4.0.21
+1506171307 metadata/md5-cache/dev-java/microba-0.4.4
+1506171307 metadata/md5-cache/dev-java/struts-core-2.3.15.2
+1506171307 metadata/md5-cache/dev-java/netty-handler-4.0.19
+1506171306 metadata/md5-cache/dev-java/ant-apache-oro-1.9.1
+1506171307 metadata/md5-cache/dev-java/mockobjects-0.09-r4
+1506171306 metadata/md5-cache/dev-java/colt-1.2.0-r1
+1506171306 metadata/md5-cache/dev-java/charva-1.1.4-r1
+1506171306 metadata/md5-cache/dev-java/commons-beanutils-1.8.3
+1506171307 metadata/md5-cache/dev-java/osgi-core-api-5.0.0
+1506171307 metadata/md5-cache/dev-java/lucene-1.4.3-r3
+1506171307 metadata/md5-cache/dev-java/netty-common-4.0.19
+1506171307 metadata/md5-cache/dev-java/osgi-core-api-4.3
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
+1506171306 metadata/md5-cache/dev-java/icedtea-6.1.13.5
+1506171307 metadata/md5-cache/dev-java/jzlib-1.1.3
+1506171307 metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta10-r1
+1506171306 metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
+1506171306 metadata/md5-cache/dev-java/itext-2.1.5-r2
+1506171307 metadata/md5-cache/dev-java/jaxr-1.0.6
+1506171306 metadata/md5-cache/dev-java/fscript-1.17-r1
+1506171306 metadata/md5-cache/dev-java/ant-junit-1.8.4
+1506171306 metadata/md5-cache/dev-java/ant-commons-logging-1.8.2
+1506171307 metadata/md5-cache/dev-java/neuroph-2.3
+1506171307 metadata/md5-cache/dev-java/proguard-4.8
+1506171307 metadata/md5-cache/dev-java/jcifs-1.3.17-r1
+1506171306 metadata/md5-cache/dev-java/dom4j-1.6.1-r5
+1506171307 metadata/md5-cache/dev-java/jopt-simple-4.4
+1506171307 metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+1506171306 metadata/md5-cache/dev-java/icedtea-6.1.13.7
+1506171306 metadata/md5-cache/dev-java/blowfishj-2.14-r2
+1506171307 metadata/md5-cache/dev-java/jna-3.4.0
+1506171307 metadata/md5-cache/dev-java/shared-objects-1.4-r3
+1506171306 metadata/md5-cache/dev-java/ant-swing-1.8.2
+1506171307 metadata/md5-cache/dev-java/lucene-2.3.2-r2
+1506171307 metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.0-r2
+1506171307 metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
+1506171306 metadata/md5-cache/dev-java/dom4j-1.6.1-r4
+1506171306 metadata/md5-cache/dev-java/commons-jexl-2.1.1
+1506171307 metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
 1505281110 metadata/md5-cache/dev-java/ant-1.8.4
-1506160036 metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
-1506160036 metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
-1506160036 metadata/md5-cache/dev-java/eclipse-ecj-4.4.1
-1506160037 metadata/md5-cache/dev-java/jibx-1.1.5-r1
-1506160037 metadata/md5-cache/dev-java/groovy-1.7.5
-1506160037 metadata/md5-cache/dev-java/joda-time-2.2
-1506160037 metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
-1506160037 metadata/md5-cache/dev-java/xz-java-1.4
-1506160037 metadata/md5-cache/dev-java/guava-13.0.1
-1506160037 metadata/md5-cache/dev-java/jython-2.5.3-r3
-1506160036 metadata/md5-cache/dev-java/ant-jdepend-1.9.1
-1506160036 metadata/md5-cache/dev-java/cldc-api-1.1-r1
-1506160036 metadata/md5-cache/dev-java/aspectj-1.7.4
-1506160037 metadata/md5-cache/dev-java/groovy-1.7.10
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.1.1
-1506160037 metadata/md5-cache/dev-java/jscience-1.0.4-r1
-1506160036 metadata/md5-cache/dev-java/bcel-6.0_rc3
-1506160036 metadata/md5-cache/dev-java/db4o-jdk5-7.4
-1506160037 metadata/md5-cache/dev-java/sbt-0.13.8
-1506160036 metadata/md5-cache/dev-java/ant-junit4-1.9.1
-1506160037 metadata/md5-cache/dev-java/xjavac-20110814
-1506160036 metadata/md5-cache/dev-java/fontbox-1.7.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
-1506160037 metadata/md5-cache/dev-java/jffi-1.2.7-r2
-1506160037 metadata/md5-cache/dev-java/helpgui-1.1-r1
-1506160037 metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
-1506160036 metadata/md5-cache/dev-java/ant-testutil-1.8.2
+1506171306 metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
+1506171306 metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+1506171306 metadata/md5-cache/dev-java/eclipse-ecj-4.4.1
+1506171307 metadata/md5-cache/dev-java/jibx-1.1.5-r1
+1506171306 metadata/md5-cache/dev-java/groovy-1.7.5
+1506171307 metadata/md5-cache/dev-java/joda-time-2.2
+1506171307 metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
+1506171307 metadata/md5-cache/dev-java/xz-java-1.4
+1506171306 metadata/md5-cache/dev-java/guava-13.0.1
+1506171307 metadata/md5-cache/dev-java/jython-2.5.3-r3
+1506171306 metadata/md5-cache/dev-java/ant-jdepend-1.9.1
+1506171306 metadata/md5-cache/dev-java/cldc-api-1.1-r1
+1506171306 metadata/md5-cache/dev-java/aspectj-1.7.4
+1506171306 metadata/md5-cache/dev-java/groovy-1.7.10
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.1.1
+1506171307 metadata/md5-cache/dev-java/jscience-1.0.4-r1
+1506171306 metadata/md5-cache/dev-java/bcel-6.0_rc3
+1506171306 metadata/md5-cache/dev-java/db4o-jdk5-7.4
+1506171307 metadata/md5-cache/dev-java/sbt-0.13.8
+1506171306 metadata/md5-cache/dev-java/ant-junit4-1.9.1
+1506171307 metadata/md5-cache/dev-java/xjavac-20110814
+1506171306 metadata/md5-cache/dev-java/fontbox-1.7.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+1506171307 metadata/md5-cache/dev-java/jffi-1.2.7-r2
+1506171306 metadata/md5-cache/dev-java/helpgui-1.1-r1
+1506171307 metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
+1506171306 metadata/md5-cache/dev-java/ant-testutil-1.8.2
 1505281111 metadata/md5-cache/dev-java/java-sdk-docs-1.6.0.30
-1506160036 metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
-1506160036 metadata/md5-cache/dev-java/commons-configuration-1.6-r1
-1506160036 metadata/md5-cache/dev-java/excalibur-logger-2.1-r2
-1506160037 metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
-1506160037 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2
-1506160037 metadata/md5-cache/dev-java/swingx-1.6.4
-1506160036 metadata/md5-cache/dev-java/commons-jelly-1.0-r5
-1506160037 metadata/md5-cache/dev-java/jade-3.3-r1
-1506160036 metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
-1506160037 metadata/md5-cache/dev-java/joda-time-2.3
-1506160037 metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
-1506160037 metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
-1506160037 metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
-1506160037 metadata/md5-cache/dev-java/lucene-2.4.1-r1
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-3.1.11
-1506160036 metadata/md5-cache/dev-java/fastutil-4.3.1-r1
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.14
-1506160037 metadata/md5-cache/dev-java/netty-buffer-4.0.19
-1506160037 metadata/md5-cache/dev-java/openspml-0.5
-1506160037 metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.6.0
-1506160036 metadata/md5-cache/dev-java/css-validator-20120222
-1506160037 metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
-1506160037 metadata/md5-cache/dev-java/jnr-posix-1.1.4
-1506160037 metadata/md5-cache/dev-java/jaxb-2.1.2-r1
+1506171306 metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+1506171306 metadata/md5-cache/dev-java/commons-configuration-1.6-r1
+1506171306 metadata/md5-cache/dev-java/excalibur-logger-2.1-r2
+1506171307 metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r2
+1506171307 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r2
+1506171307 metadata/md5-cache/dev-java/swingx-1.6.4
+1506171306 metadata/md5-cache/dev-java/commons-jelly-1.0-r5
+1506171306 metadata/md5-cache/dev-java/jade-3.3-r1
+1506171306 metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+1506171307 metadata/md5-cache/dev-java/joda-time-2.3
+1506171307 metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
+1506171307 metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+1506171306 metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
+1506171307 metadata/md5-cache/dev-java/lucene-2.4.1-r1
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-3.1.11
+1506171306 metadata/md5-cache/dev-java/fastutil-4.3.1-r1
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.14
+1506171307 metadata/md5-cache/dev-java/netty-buffer-4.0.19
+1506171307 metadata/md5-cache/dev-java/openspml-0.5
+1506171307 metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
+1506171307 metadata/md5-cache/dev-java/jnr-ffi-0.6.0
+1506171306 metadata/md5-cache/dev-java/css-validator-20120222
+1506171307 metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
+1506171306 metadata/md5-cache/dev-java/jaxb-2.1.2-r1
 1505281111 metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.45
-1506160037 metadata/md5-cache/dev-java/lucene-2.9.1-r1
-1506160036 metadata/md5-cache/dev-java/dbunit-2.4.5
-1506160037 metadata/md5-cache/dev-java/jarjar-0.9
+1506171307 metadata/md5-cache/dev-java/lucene-2.9.1-r1
+1506171306 metadata/md5-cache/dev-java/dbunit-2.4.5
+1506171306 metadata/md5-cache/dev-java/jarjar-0.9
 1505281110 metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p1
 1505281111 metadata/md5-cache/dev-java/soylatte-jdk-bin-1.0.3
-1506160037 metadata/md5-cache/dev-java/stax2-api-4.0.0
-1506160037 metadata/md5-cache/dev-java/jbitcollider-core-0.8
-1506160037 metadata/md5-cache/dev-java/hessian-4.0.3
-1506160037 metadata/md5-cache/dev-java/ical4j-1.0.5
-1506160037 metadata/md5-cache/dev-java/netbeans-extide-8.0.2
-1506160037 metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+1506171307 metadata/md5-cache/dev-java/stax2-api-4.0.0
+1506171307 metadata/md5-cache/dev-java/jbitcollider-core-0.8
+1506171306 metadata/md5-cache/dev-java/hessian-4.0.3
+1506171306 metadata/md5-cache/dev-java/ical4j-1.0.5
+1506171307 metadata/md5-cache/dev-java/netbeans-extide-8.0.2
+1506171307 metadata/md5-cache/dev-java/xml-commons-external-1.3.04
 1506131507 metadata/md5-cache/dev-java/icedtea-bin-6.1.13.7
-1506160037 metadata/md5-cache/dev-java/libg-2.1.0-r1
-1506160037 metadata/md5-cache/dev-java/servletapi-2.4-r5
-1506160036 metadata/md5-cache/dev-java/annogen-0.1.0
-1506160036 metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
-1506160036 metadata/md5-cache/dev-java/felix-utils-1.2.0
-1506160037 metadata/md5-cache/dev-java/neuroph-2.2
-1506160037 metadata/md5-cache/dev-java/joni-1.1.4
-1506160037 metadata/md5-cache/dev-java/jebl-2013.02.18
-1506160037 metadata/md5-cache/dev-java/lucene-2.4.0
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.15
-1506160037 metadata/md5-cache/dev-java/jdbc-mysql-5.1.23
-1506160037 metadata/md5-cache/dev-java/lucene-2.1.0-r1
-1506160036 metadata/md5-cache/dev-java/commons-configuration-1.6
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.2.3
-1506160037 metadata/md5-cache/dev-java/sun-jacc-api-20070102
-1506160037 metadata/md5-cache/dev-java/spin-1.5-r1
-1506160037 metadata/md5-cache/dev-java/jisp-2.5.1-r2
-1506160037 metadata/md5-cache/dev-java/servletapi-2.2-r3
-1506160037 metadata/md5-cache/dev-java/metainf-services-1.5
-1506160037 metadata/md5-cache/dev-java/portletapi-1.0
-1506160037 metadata/md5-cache/dev-java/svgsalamander-0.0-r1
-1506160037 metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4
-1506160037 metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
-1506160037 metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
-1506160037 metadata/md5-cache/dev-java/netty-common-4.0.21
-1506160037 metadata/md5-cache/dev-java/freemarker-2.3.13
-1506160037 metadata/md5-cache/dev-java/swt-4.2
-1506160037 metadata/md5-cache/dev-java/jansi-1.11-r1
-1506160036 metadata/md5-cache/dev-java/ant-jsch-1.8.4
-1506160036 metadata/md5-cache/dev-java/ant-swing-1.8.4
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
-1506160036 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
-1506160036 metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2
-1506160037 metadata/md5-cache/dev-java/mina-core-1.1.7
-1506160037 metadata/md5-cache/dev-java/kryo-2.22
-1506160036 metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1
-1506160037 metadata/md5-cache/dev-java/smack-2.2.1
-1506160037 metadata/md5-cache/dev-java/kxml-2.3.0
-1506160037 metadata/md5-cache/dev-java/toolbar-1.1.0-r1
-1506160037 metadata/md5-cache/dev-java/jdepend-2.9-r5
-1506160036 metadata/md5-cache/dev-java/bcprov-1.49-r2
-1506160037 metadata/md5-cache/dev-java/icedtea-sound-1.0.1
-1506160036 metadata/md5-cache/dev-java/constantine-0.6
-1506160037 metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1
-1506160036 metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
-1506160037 metadata/md5-cache/dev-java/jisp-2.5.1-r3
-1506160036 metadata/md5-cache/dev-java/classmate-0.9.0
-1506160037 metadata/md5-cache/dev-java/log4j-1.2.16
-1506160036 metadata/md5-cache/dev-java/dtdparser-1.21-r2
-1506160037 metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
-1506160036 metadata/md5-cache/dev-java/freehep-swing-2.0.3
-1506160037 metadata/md5-cache/dev-java/jython-2.2.1-r1
-1506160037 metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1
-1506160037 metadata/md5-cache/dev-java/xml-commons-resolver-1.2
-1506160037 metadata/md5-cache/dev-java/lucene-2.9.4
-1506160037 metadata/md5-cache/dev-java/jffi-1.2.6
-1506161036 metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
-1506160036 metadata/md5-cache/dev-java/absolutelayout-6.7_beta
-1506160036 metadata/md5-cache/dev-java/ant-antlr-1.9.2
-1506160037 metadata/md5-cache/dev-java/jaxen-1.1.1
-1506160037 metadata/md5-cache/dev-java/netbeans-php-8.0.2
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
-1506160037 metadata/md5-cache/dev-java/java-gnome-4.0.20
-1506160037 metadata/md5-cache/dev-java/jaxme-0.5.2-r1
-1506160036 metadata/md5-cache/dev-java/c3p0-0.9.1.2
-1506160036 metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
-1506160037 metadata/md5-cache/dev-java/texhyphj-1.1
-1506160037 metadata/md5-cache/dev-java/groovy-1.8.5
-1506160037 metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
-1506160037 metadata/md5-cache/dev-java/rhino-1.7.2-r2
-1506160036 metadata/md5-cache/dev-java/easymock-3.3.1
-1506160037 metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
-1506160036 metadata/md5-cache/dev-java/commons-codec-1.7
-1506160037 metadata/md5-cache/dev-java/java-gnome-4.0.19
-1506160037 metadata/md5-cache/dev-java/gnu-jaf-1.1.1
-1506160037 metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2
-1506160036 metadata/md5-cache/dev-java/ant-owanttask-1.1-r12
-1506160037 metadata/md5-cache/dev-java/jss-4.3
-1506160036 metadata/md5-cache/dev-java/ant-core-1.7.1-r5
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.1
-1506160036 metadata/md5-cache/dev-java/cal10n-0.8.1
-1506160037 metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7
-1506160037 metadata/md5-cache/dev-java/jldap-20060300
-1506160037 metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.5.10
-1506160037 metadata/md5-cache/dev-java/jackson-annotations-2.5.1
-1506160036 metadata/md5-cache/dev-java/ant-javamail-1.9.2
-1506160036 metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
-1506160036 metadata/md5-cache/dev-java/ant-ivy-2.0.0
-1506160037 metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
-1506160036 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1
-1506160036 metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4
-1506160036 metadata/md5-cache/dev-java/ant-jmf-1.8.2
-1506160037 metadata/md5-cache/dev-java/spring-instrument-3.2.4
-1506160036 metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
-1506160036 metadata/md5-cache/dev-java/freehep-sio-2.0
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
-1506160037 metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
-1506160036 metadata/md5-cache/dev-java/bcmail-1.50
+1506171307 metadata/md5-cache/dev-java/libg-2.1.0-r1
+1506171307 metadata/md5-cache/dev-java/servletapi-2.4-r5
+1506171306 metadata/md5-cache/dev-java/annogen-0.1.0
+1506171306 metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+1506171306 metadata/md5-cache/dev-java/felix-utils-1.2.0
+1506171307 metadata/md5-cache/dev-java/neuroph-2.2
+1506171307 metadata/md5-cache/dev-java/joni-1.1.4
+1506171307 metadata/md5-cache/dev-java/jebl-2013.02.18
+1506171307 metadata/md5-cache/dev-java/lucene-2.4.0
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.15
+1506171307 metadata/md5-cache/dev-java/jdbc-mysql-5.1.23
+1506171307 metadata/md5-cache/dev-java/lucene-2.1.0-r1
+1506171306 metadata/md5-cache/dev-java/commons-configuration-1.6
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.2.3
+1506171307 metadata/md5-cache/dev-java/sun-jacc-api-20070102
+1506171307 metadata/md5-cache/dev-java/spin-1.5-r1
+1506171307 metadata/md5-cache/dev-java/jisp-2.5.1-r2
+1506171307 metadata/md5-cache/dev-java/servletapi-2.2-r3
+1506171307 metadata/md5-cache/dev-java/metainf-services-1.5
+1506171307 metadata/md5-cache/dev-java/portletapi-1.0
+1506171307 metadata/md5-cache/dev-java/svgsalamander-0.0-r1
+1506171307 metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r4
+1506171306 metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+1506171307 metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
+1506171307 metadata/md5-cache/dev-java/netty-common-4.0.21
+1506171306 metadata/md5-cache/dev-java/freemarker-2.3.13
+1506171307 metadata/md5-cache/dev-java/swt-4.2
+1506171306 metadata/md5-cache/dev-java/jansi-1.11-r1
+1506171306 metadata/md5-cache/dev-java/ant-jsch-1.8.4
+1506171306 metadata/md5-cache/dev-java/ant-swing-1.8.4
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
+1506171306 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+1506171306 metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.2
+1506171307 metadata/md5-cache/dev-java/mina-core-1.1.7
+1506171307 metadata/md5-cache/dev-java/kryo-2.22
+1506171306 metadata/md5-cache/dev-java/ant-apache-log4j-1.9.1
+1506171307 metadata/md5-cache/dev-java/smack-2.2.1
+1506171307 metadata/md5-cache/dev-java/kxml-2.3.0
+1506171307 metadata/md5-cache/dev-java/toolbar-1.1.0-r1
+1506171307 metadata/md5-cache/dev-java/jdepend-2.9-r5
+1506171306 metadata/md5-cache/dev-java/bcprov-1.49-r2
+1506171306 metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+1506171306 metadata/md5-cache/dev-java/constantine-0.6
+1506171306 metadata/md5-cache/dev-java/jax-rpc-1.1.3.01-r1
+1506171306 metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
+1506171307 metadata/md5-cache/dev-java/jisp-2.5.1-r3
+1506171306 metadata/md5-cache/dev-java/classmate-0.9.0
+1506171307 metadata/md5-cache/dev-java/log4j-1.2.16
+1506171306 metadata/md5-cache/dev-java/dtdparser-1.21-r2
+1506171307 metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
+1506171306 metadata/md5-cache/dev-java/freehep-swing-2.0.3
+1506171307 metadata/md5-cache/dev-java/jython-2.2.1-r1
+1506171307 metadata/md5-cache/dev-java/jibx-tools-1.1.5-r1
+1506171307 metadata/md5-cache/dev-java/xml-commons-resolver-1.2
+1506171307 metadata/md5-cache/dev-java/lucene-2.9.4
+1506171307 metadata/md5-cache/dev-java/jffi-1.2.6
+1506171306 metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+1506171306 metadata/md5-cache/dev-java/absolutelayout-6.7_beta
+1506171306 metadata/md5-cache/dev-java/ant-antlr-1.9.2
+1506171306 metadata/md5-cache/dev-java/jaxen-1.1.1
+1506171307 metadata/md5-cache/dev-java/netbeans-php-8.0.2
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
+1506171306 metadata/md5-cache/dev-java/java-gnome-4.0.20
+1506171306 metadata/md5-cache/dev-java/jaxme-0.5.2-r1
+1506171306 metadata/md5-cache/dev-java/c3p0-0.9.1.2
+1506171306 metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+1506171307 metadata/md5-cache/dev-java/texhyphj-1.1
+1506171306 metadata/md5-cache/dev-java/groovy-1.8.5
+1506171307 metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+1506171307 metadata/md5-cache/dev-java/rhino-1.7.2-r2
+1506171306 metadata/md5-cache/dev-java/easymock-3.3.1
+1506171307 metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
+1506171306 metadata/md5-cache/dev-java/commons-codec-1.7
+1506171306 metadata/md5-cache/dev-java/java-gnome-4.0.19
+1506171306 metadata/md5-cache/dev-java/gnu-jaf-1.1.1
+1506171307 metadata/md5-cache/dev-java/metadata-extractor-2.2.2-r2
+1506171306 metadata/md5-cache/dev-java/ant-owanttask-1.1-r12
+1506171307 metadata/md5-cache/dev-java/jss-4.3
+1506171306 metadata/md5-cache/dev-java/ant-core-1.7.1-r5
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.1
+1506171306 metadata/md5-cache/dev-java/cal10n-0.8.1
+1506171307 metadata/md5-cache/dev-java/jdbc-jaybird-2.2.7
+1506171307 metadata/md5-cache/dev-java/jldap-20060300
+1506171307 metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
+1506171307 metadata/md5-cache/dev-java/jnr-ffi-0.5.10
+1506171306 metadata/md5-cache/dev-java/jackson-annotations-2.5.1
+1506171306 metadata/md5-cache/dev-java/ant-javamail-1.9.2
+1506171306 metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+1506171306 metadata/md5-cache/dev-java/ant-ivy-2.0.0
+1506171307 metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
+1506171306 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.1
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-8.4_p701-r1
+1506171306 metadata/md5-cache/dev-java/ant-apache-resolver-1.8.4
+1506171306 metadata/md5-cache/dev-java/ant-jmf-1.8.2
+1506171307 metadata/md5-cache/dev-java/spring-instrument-3.2.4
+1506171306 metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.23
+1506171306 metadata/md5-cache/dev-java/freehep-sio-2.0
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44
+1506171306 metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
+1506171306 metadata/md5-cache/dev-java/bcmail-1.50
 1505281111 metadata/md5-cache/dev-java/sun-jre-bin-1.6.0.45
-1506160037 metadata/md5-cache/dev-java/jsr250-1.0-r1
-1506160037 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
-1506160036 metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
-1506160037 metadata/md5-cache/dev-java/jfreesvg-2.1
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
-1506160037 metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
-1506160037 metadata/md5-cache/dev-java/jansi-1.11
-1506160036 metadata/md5-cache/dev-java/cssparser-0.9.14
-1506160037 metadata/md5-cache/dev-java/validation-api-1.0.0
+1506171307 metadata/md5-cache/dev-java/jsr250-1.0-r1
+1506171307 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
+1506171306 metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
+1506171307 metadata/md5-cache/dev-java/jfreesvg-2.1
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
+1506171307 metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
+1506171306 metadata/md5-cache/dev-java/jansi-1.11
+1506171306 metadata/md5-cache/dev-java/cssparser-0.9.14
+1506171307 metadata/md5-cache/dev-java/validation-api-1.0.0
 1505281110 metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2
-1506160036 metadata/md5-cache/dev-java/ant-jsch-1.8.2
-1506160037 metadata/md5-cache/dev-java/javacc-4.0-r4
-1506160036 metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
-1506160037 metadata/md5-cache/dev-java/jzlib-1.1.1
-1506160037 metadata/md5-cache/dev-java/hamcrest-integration-1.3
-1506160037 metadata/md5-cache/dev-java/istack-commons-tools-2.22
-1506160036 metadata/md5-cache/dev-java/commons-lang-2.6
-1506160037 metadata/md5-cache/dev-java/jgoodies-common-1.2.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2
-1506160037 metadata/md5-cache/dev-java/iso-relax-20050331-r2
+1506171306 metadata/md5-cache/dev-java/ant-jsch-1.8.2
+1506171306 metadata/md5-cache/dev-java/javacc-4.0-r4
+1506171306 metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
+1506171307 metadata/md5-cache/dev-java/jzlib-1.1.1
+1506171306 metadata/md5-cache/dev-java/hamcrest-integration-1.3
+1506171306 metadata/md5-cache/dev-java/istack-commons-tools-2.22
+1506171306 metadata/md5-cache/dev-java/commons-lang-2.6
+1506171307 metadata/md5-cache/dev-java/jgoodies-common-1.2.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-bsf-1.8.2
+1506171306 metadata/md5-cache/dev-java/iso-relax-20050331-r2
 1505281110 metadata/md5-cache/dev-java/gcj-jdk-4.7.3-r1
-1506160037 metadata/md5-cache/dev-java/velocity-1.7
+1506171307 metadata/md5-cache/dev-java/velocity-1.7
 1505281110 metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2-r1
-1506160037 metadata/md5-cache/dev-java/jss-4.2.5
-1506160036 metadata/md5-cache/dev-java/dnsjava-2.1.6
-1506160037 metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
-1506160037 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
-1506160037 metadata/md5-cache/dev-java/stax-ex-1.0-r3
-1506160037 metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1
-1506160036 metadata/md5-cache/dev-java/cpptasks-1.0_beta5
-1506160036 metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
-1506160037 metadata/md5-cache/dev-java/juel-2.1.0
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
-1506160036 metadata/md5-cache/dev-java/ecj-gcj-4.4.2
-1506160037 metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
-1506160037 metadata/md5-cache/dev-java/simplyhtml-0.13.1
-1506160037 metadata/md5-cache/dev-java/mx4j-3.0.2
-1506160037 metadata/md5-cache/dev-java/struts-plugins-2.3.15.2
-1506160037 metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
-1506160037 metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2
-1506160036 metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
-1506160036 metadata/md5-cache/dev-java/burlap-3.0.8-r3
-1506160037 metadata/md5-cache/dev-java/jchardet-1.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
-1506160037 metadata/md5-cache/dev-java/lucene-1.9.1
-1506160037 metadata/md5-cache/dev-java/jopt-simple-4.5
-1506160037 metadata/md5-cache/dev-java/jffi-1.0.0
-1506160036 metadata/md5-cache/dev-java/easymock-3.2-r1
-1506160037 metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
-1506160037 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
-1506160037 metadata/md5-cache/dev-java/jruby-1.7.12
-1506160037 metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
-1506160037 metadata/md5-cache/dev-java/wstx-3.2.8
-1506161036 metadata/md5-cache/dev-java/batik-1.8
-1506160037 metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
-1506160037 metadata/md5-cache/dev-java/hibernate-3.1.3-r4
-1506160037 metadata/md5-cache/dev-java/jnr-x86asm-1.0.1
-1506160037 metadata/md5-cache/dev-java/stringtemplate-3.2.1
-1506160037 metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
-1506160037 metadata/md5-cache/dev-java/jython-2.7.0
-1506160037 metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1
-1506160037 metadata/md5-cache/dev-java/hamcrest-generator-1.2
-1506160037 metadata/md5-cache/dev-java/mx4j-3.0.1-r4
-1506160036 metadata/md5-cache/dev-java/ecs-1.4.2-r2
-1506160037 metadata/md5-cache/dev-java/jsr250-1.0
-1506160037 metadata/md5-cache/dev-java/idm-console-framework-1.1.7
-1506160037 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
-1506160037 metadata/md5-cache/dev-java/sac-1.3-r1
-1506160037 metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
-1506160036 metadata/md5-cache/dev-java/ant-jsch-1.9.2
-1506160037 metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
-1506161236 metadata/md5-cache/dev-java/jdom-1.1.3
-1506160037 metadata/md5-cache/dev-java/jffi-1.2.5
-1506160036 metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
-1506160037 metadata/md5-cache/dev-java/jrexx-1.1.1-r1
-1506160037 metadata/md5-cache/dev-java/jvyamlb-0.2.5
-1506160037 metadata/md5-cache/dev-java/javassist-3.4
-1506160037 metadata/md5-cache/dev-java/sat4j-core-2.2.0
-1506160037 metadata/md5-cache/dev-java/jlex-1.2.6-r1
-1506160037 metadata/md5-cache/dev-java/jupidator-0.6.0
+1506171307 metadata/md5-cache/dev-java/jss-4.2.5
+1506171306 metadata/md5-cache/dev-java/dnsjava-2.1.6
+1506171307 metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
+1506171307 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
+1506171307 metadata/md5-cache/dev-java/stax-ex-1.0-r3
+1506171306 metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r1
+1506171306 metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+1506171306 metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
+1506171307 metadata/md5-cache/dev-java/juel-2.1.0
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.22
+1506171306 metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+1506171306 metadata/md5-cache/dev-java/httpcomponents-client-4.3.1-r1
+1506171307 metadata/md5-cache/dev-java/simplyhtml-0.13.1
+1506171307 metadata/md5-cache/dev-java/mx4j-3.0.2
+1506171307 metadata/md5-cache/dev-java/struts-plugins-2.3.15.2
+1506171406 metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
+1506171307 metadata/md5-cache/dev-java/jdom-jaxen-1.0_beta9-r2
+1506171306 metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
+1506171306 metadata/md5-cache/dev-java/burlap-3.0.8-r3
+1506171307 metadata/md5-cache/dev-java/jchardet-1.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-bcel-1.8.2
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
+1506171307 metadata/md5-cache/dev-java/lucene-1.9.1
+1506171307 metadata/md5-cache/dev-java/jopt-simple-4.5
+1506171307 metadata/md5-cache/dev-java/jffi-1.0.0
+1506171306 metadata/md5-cache/dev-java/easymock-3.2-r1
+1506171306 metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
+1506171307 metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
+1506171307 metadata/md5-cache/dev-java/jruby-1.7.12
+1506171307 metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
+1506171307 metadata/md5-cache/dev-java/wstx-3.2.8
+1506171306 metadata/md5-cache/dev-java/batik-1.8
+1506171306 metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+1506171306 metadata/md5-cache/dev-java/hibernate-3.1.3-r4
+1506171307 metadata/md5-cache/dev-java/jnr-x86asm-1.0.1
+1506171307 metadata/md5-cache/dev-java/stringtemplate-3.2.1
+1506171307 metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+1506171307 metadata/md5-cache/dev-java/jython-2.7.0
+1506171307 metadata/md5-cache/dev-java/mx4j-core-3.0.2-r1
+1506171306 metadata/md5-cache/dev-java/hamcrest-generator-1.2
+1506171307 metadata/md5-cache/dev-java/mx4j-3.0.1-r4
+1506171306 metadata/md5-cache/dev-java/ecs-1.4.2-r2
+1506171307 metadata/md5-cache/dev-java/jsr250-1.0
+1506171306 metadata/md5-cache/dev-java/idm-console-framework-1.1.7
+1506171306 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
+1506171307 metadata/md5-cache/dev-java/sac-1.3-r1
+1506171307 metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
+1506171306 metadata/md5-cache/dev-java/ant-jsch-1.9.2
+1506171307 metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
+1506171307 metadata/md5-cache/dev-java/jdom-1.1.3
+1506171307 metadata/md5-cache/dev-java/jffi-1.2.5
+1506171306 metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
+1506171307 metadata/md5-cache/dev-java/jrexx-1.1.1-r1
+1506171307 metadata/md5-cache/dev-java/jvyamlb-0.2.5
+1506171306 metadata/md5-cache/dev-java/javassist-3.4
+1506171307 metadata/md5-cache/dev-java/sat4j-core-2.2.0
+1506171307 metadata/md5-cache/dev-java/jlex-1.2.6-r1
+1506171307 metadata/md5-cache/dev-java/jupidator-0.6.0
 1505281110 metadata/md5-cache/dev-java/gcj-jdk-4.7.4
-1506160037 metadata/md5-cache/dev-java/spring-beans-3.2.4
-1506160036 metadata/md5-cache/dev-java/appframework-1.03-r3
-1506160037 metadata/md5-cache/dev-java/rundoc-0.11
-1506160037 metadata/md5-cache/dev-java/nekohtml-1.9.18
-1506160037 metadata/md5-cache/dev-java/xalan-2.7.1
-1506160037 metadata/md5-cache/dev-java/hibernate-annotations-3.2.0
-1506160036 metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
-1506160037 metadata/md5-cache/dev-java/jcalendar-1.4
-1506160036 metadata/md5-cache/dev-java/cglib-3.1
-1506160037 metadata/md5-cache/dev-java/oscache-2.0.2-r3
-1506160037 metadata/md5-cache/dev-java/jansi-1.1
-1506160036 metadata/md5-cache/dev-java/fastutil-5.1.3
-1506160037 metadata/md5-cache/dev-java/tomcat-native-1.1.32
-1506160037 metadata/md5-cache/dev-java/jnr-posix-3.0.1
-1506160037 metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
-1506160037 metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
-1506160037 metadata/md5-cache/dev-java/slf4j-nop-1.5.11
-1506160036 metadata/md5-cache/dev-java/commons-dbcp-2.1
-1506160036 metadata/md5-cache/dev-java/bytelist-1.0.10
-1506160037 metadata/md5-cache/dev-java/jvmstat-3.0
-1506160036 metadata/md5-cache/dev-java/ehcache-1.1-r2
-1506160037 metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
-1506161236 metadata/md5-cache/dev-java/slf4j-api-1.7.7
-1506160037 metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
-1506160036 metadata/md5-cache/dev-java/ant-core-1.9.1
-1506160036 metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
-1506160036 metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
-1506160036 metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
-1506160036 metadata/md5-cache/dev-java/ant-jmf-1.8.4
-1506160037 metadata/md5-cache/dev-java/jnr-enxio-0.4
-1506160037 metadata/md5-cache/dev-java/jmock-2.6.1
-1506160036 metadata/md5-cache/dev-java/ant-core-1.9.2
-1506160037 metadata/md5-cache/dev-java/jgraph-5.12.0.4
-1506160036 metadata/md5-cache/dev-java/commons-transaction-1.2
-1506160036 metadata/md5-cache/dev-java/ant-swing-1.9.2
-1506160037 metadata/md5-cache/dev-java/jdynamite-1.2
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.0.1
-1506160037 metadata/md5-cache/dev-java/jcip-annotations-1.0.1
-1506160036 metadata/md5-cache/dev-java/ehcache-1.1-r1
-1506160037 metadata/md5-cache/dev-java/msv-20050627-r3
-1506160037 metadata/md5-cache/dev-java/jsch-0.1.52
-1506160036 metadata/md5-cache/dev-java/cssparser-0.9.15
-1506160037 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
-1506160037 metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
-1506160037 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
-1506160037 metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
-1506160036 metadata/md5-cache/dev-java/biojava-1.7
-1506160036 metadata/md5-cache/dev-java/ant-testutil-1.9.2
-1506160037 metadata/md5-cache/dev-java/guava-18.0
-1506160036 metadata/md5-cache/dev-java/commons-daemon-1.0.15
-1506160037 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6
-1506160036 metadata/md5-cache/dev-java/ant-jsch-1.9.1
+1506171307 metadata/md5-cache/dev-java/spring-beans-3.2.4
+1506171306 metadata/md5-cache/dev-java/appframework-1.03-r3
+1506171307 metadata/md5-cache/dev-java/rundoc-0.11
+1506171307 metadata/md5-cache/dev-java/nekohtml-1.9.18
+1506171307 metadata/md5-cache/dev-java/xalan-2.7.1
+1506171306 metadata/md5-cache/dev-java/hibernate-annotations-3.2.0
+1506171306 metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
+1506171307 metadata/md5-cache/dev-java/jcalendar-1.4
+1506171306 metadata/md5-cache/dev-java/cglib-3.1
+1506171307 metadata/md5-cache/dev-java/oscache-2.0.2-r3
+1506171306 metadata/md5-cache/dev-java/jansi-1.1
+1506171306 metadata/md5-cache/dev-java/fastutil-5.1.3
+1506171307 metadata/md5-cache/dev-java/tomcat-native-1.1.32
+1506171307 metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
+1506171306 metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
+1506171307 metadata/md5-cache/dev-java/slf4j-nop-1.5.11
+1506171306 metadata/md5-cache/dev-java/commons-dbcp-2.1
+1506171306 metadata/md5-cache/dev-java/bytelist-1.0.10
+1506171307 metadata/md5-cache/dev-java/jvmstat-3.0
+1506171306 metadata/md5-cache/dev-java/ehcache-1.1-r2
+1506171307 metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
+1506171307 metadata/md5-cache/dev-java/slf4j-api-1.7.7
+1506171307 metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
+1506171306 metadata/md5-cache/dev-java/ant-core-1.9.1
+1506171306 metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
+1506171306 metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
+1506171306 metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
+1506171306 metadata/md5-cache/dev-java/ant-jmf-1.8.4
+1506171307 metadata/md5-cache/dev-java/jmock-2.6.1
+1506171306 metadata/md5-cache/dev-java/ant-core-1.9.2
+1506171307 metadata/md5-cache/dev-java/jgraph-5.12.0.4
+1506171306 metadata/md5-cache/dev-java/commons-transaction-1.2
+1506171306 metadata/md5-cache/dev-java/ant-swing-1.9.2
+1506171307 metadata/md5-cache/dev-java/jdynamite-1.2
+1506171307 metadata/md5-cache/dev-java/jnr-netdb-1.0.1
+1506171307 metadata/md5-cache/dev-java/jcip-annotations-1.0.1
+1506171306 metadata/md5-cache/dev-java/ehcache-1.1-r1
+1506171307 metadata/md5-cache/dev-java/msv-20050627-r3
+1506171307 metadata/md5-cache/dev-java/jsch-0.1.52
+1506171306 metadata/md5-cache/dev-java/cssparser-0.9.15
+1506171307 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.6
+1506171307 metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+1506171307 metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
+1506171307 metadata/md5-cache/dev-java/slf4j-api-1.7.5-r1
+1506171306 metadata/md5-cache/dev-java/biojava-1.7
+1506171306 metadata/md5-cache/dev-java/ant-testutil-1.9.2
+1506171306 metadata/md5-cache/dev-java/guava-18.0
+1506171306 metadata/md5-cache/dev-java/commons-daemon-1.0.15
+1506171307 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.6
+1506171306 metadata/md5-cache/dev-java/ant-jsch-1.9.1
 1505281111 metadata/md5-cache/dev-java/soylatte-jdk-bin-7
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.1.0
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.1.0
 1506131507 metadata/md5-cache/dev-java/icedtea-bin-7.2.5.5
-1506160037 metadata/md5-cache/dev-java/jrobin-1.6.0-r1
-1506160037 metadata/md5-cache/dev-java/swidgets-0.1.1-r1
-1506160036 metadata/md5-cache/dev-java/cglib-3.0
-1506160037 metadata/md5-cache/dev-java/jid3-0.46-r2
-1506160036 metadata/md5-cache/dev-java/emma-2.0.5312-r2
-1506160037 metadata/md5-cache/dev-java/groovy-1.6.8
-1506160037 metadata/md5-cache/dev-java/istack-commons-tools-20090620
-1506160037 metadata/md5-cache/dev-java/pdfbox-1.8.8
-1506160037 metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
-1506160037 metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
-1506160037 metadata/md5-cache/dev-java/jclasslib-3.0-r1
-1506160036 metadata/md5-cache/dev-java/asm-1.4.3-r3
-1506160037 metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
-1506160036 metadata/md5-cache/dev-java/biojava-1.6
-1506160037 metadata/md5-cache/dev-java/jlex-1.2.6-r2
-1506160037 metadata/md5-cache/dev-java/hawtjni-runtime-1.10
-1506160036 metadata/md5-cache/dev-java/ant-core-1.7.1-r4
-1506160037 metadata/md5-cache/dev-java/jsr305-1.0-r1
-1506160037 metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
-1506160037 metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
-1506160037 metadata/md5-cache/dev-java/netbeans-harness-8.0.2
-1506160037 metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
-1506160036 metadata/md5-cache/dev-java/commons-io-2.0.1
-1506160037 metadata/md5-cache/dev-java/jsr181-1.0
-1506160036 metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
-1506160037 metadata/md5-cache/dev-java/mimepull-1.8
-1506160036 metadata/md5-cache/dev-java/commons-el-1.0-r3
-1506160036 metadata/md5-cache/dev-java/commons-compress-1.8.1
-1506160037 metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
-1506160037 metadata/md5-cache/dev-java/proguard-4.5
-1506160037 metadata/md5-cache/dev-java/lzma-4.63
-1506160037 metadata/md5-cache/dev-java/jdbc-mysql-5.1.18
-1506160036 metadata/md5-cache/dev-java/antenna-1.0.2-r1
-1506160036 metadata/md5-cache/dev-java/ant-nodeps-1.9.2
-1506160037 metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
-1506160036 metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1
-1506160037 metadata/md5-cache/dev-java/jcmdline-1.0.2-r1
-1506160037 metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
-1506160037 metadata/md5-cache/dev-java/jnr-posix-2.3.0
-1506160037 metadata/md5-cache/dev-java/jnlp-api-6.0.18
-1506160037 metadata/md5-cache/dev-java/lucene-2.3.1
-1506160037 metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
-1506160037 metadata/md5-cache/dev-java/guava-15.0
-1506160037 metadata/md5-cache/dev-java/jarjar-1.4
-1506160037 metadata/md5-cache/dev-java/qdox-1.12-r1
-1506160037 metadata/md5-cache/dev-java/xp-0.5-r1
-1506160037 metadata/md5-cache/dev-java/jsap-2.1
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
-1506160037 metadata/md5-cache/dev-java/jexcelapi-2.6.8
-1506160036 metadata/md5-cache/dev-java/freehep-misc-deps-0.1
-1506160036 metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
-1506160037 metadata/md5-cache/dev-java/guice-2.0-r1
-1506160036 metadata/md5-cache/dev-java/commons-attributes-2.2-r2
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.6
-1506160037 metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2
-1506160037 metadata/md5-cache/dev-java/jacl-1.3.3
-1506160037 metadata/md5-cache/dev-java/saaj-1.3.19-r1
-1506160037 metadata/md5-cache/dev-java/rxtx-2.2_pre2
-1506160037 metadata/md5-cache/dev-java/sablecc-3.7
-1506160036 metadata/md5-cache/dev-java/ant-javamail-1.8.4
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
-1506160037 metadata/md5-cache/dev-java/istack-commons-runtime-2.22
-1506160037 metadata/md5-cache/dev-java/jdom-1.0_beta10-r4
-1506160037 metadata/md5-cache/dev-java/jdbc-informix-3.00.3
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1
-1506160037 metadata/md5-cache/dev-java/icu4j-49.1
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
-1506160037 metadata/md5-cache/dev-java/jax-rpc-1.1.3.01
-1506160037 metadata/md5-cache/dev-java/poi-3.0.2-r1
-1506160036 metadata/md5-cache/dev-java/ant-junit4-1.8.4
-1506160036 metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1
-1506160037 metadata/md5-cache/dev-java/struts-1.2.9-r3
-1506160037 metadata/md5-cache/dev-java/guice-3.0-r1
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.4
-1506160036 metadata/md5-cache/dev-java/browserlauncher2-1.3
-1506160037 metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
-1506160037 metadata/md5-cache/dev-java/tapestry-3.0.4-r1
-1506160037 metadata/md5-cache/dev-java/minlog-1.2
-1506160037 metadata/md5-cache/dev-java/proguard-4.7
-1506160036 metadata/md5-cache/dev-java/ant-ivy-2.3.0
-1506160037 metadata/md5-cache/dev-java/picocontainer-1.1-r1
-1506160037 metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
-1506160037 metadata/md5-cache/dev-java/javacc-5.0-r1
-1506160037 metadata/md5-cache/dev-java/rngom-20051226
-1506160037 metadata/md5-cache/dev-java/prefuse-20071021_beta
-1506160036 metadata/md5-cache/dev-java/ant-apache-oro-1.8.4
-1506160037 metadata/md5-cache/dev-java/xmlunit-1.3
-1506160036 metadata/md5-cache/dev-java/commons-daemon-1.0.7
-1506160036 metadata/md5-cache/dev-java/ehcache-1.2.4-r3
-1506160037 metadata/md5-cache/dev-java/jaxen-1.1.4
-1506160037 metadata/md5-cache/dev-java/neuroph-2.4
-1506160037 metadata/md5-cache/dev-java/mojarra-2.2.9
-1506160037 metadata/md5-cache/dev-java/swt-3.7.1
-1506160036 metadata/md5-cache/dev-java/commons-daemon-1.0.9
-1506160037 metadata/md5-cache/dev-java/jnr-unixsocket-0.3
-1506160037 metadata/md5-cache/dev-java/libmso-0.1
-1506160036 metadata/md5-cache/dev-java/antlr-2.7.7-r2
-1506160037 metadata/md5-cache/dev-java/jung-1.7.6
-1506160037 metadata/md5-cache/dev-java/qdox-1.6.3
-1506160037 metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.5.14
-1506160037 metadata/md5-cache/dev-java/mojarra-1.2.15-r2
-1506160037 metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
-1506160037 metadata/md5-cache/dev-java/jdom-1.0-r4
+1506171307 metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+1506171307 metadata/md5-cache/dev-java/swidgets-0.1.1-r1
+1506171306 metadata/md5-cache/dev-java/cglib-3.0
+1506171307 metadata/md5-cache/dev-java/jid3-0.46-r2
+1506171306 metadata/md5-cache/dev-java/emma-2.0.5312-r2
+1506171306 metadata/md5-cache/dev-java/groovy-1.6.8
+1506171306 metadata/md5-cache/dev-java/istack-commons-tools-20090620
+1506171307 metadata/md5-cache/dev-java/pdfbox-1.8.8
+1506171306 metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
+1506171307 metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
+1506171307 metadata/md5-cache/dev-java/jclasslib-3.0-r1
+1506171306 metadata/md5-cache/dev-java/asm-1.4.3-r3
+1506171306 metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
+1506171306 metadata/md5-cache/dev-java/biojava-1.6
+1506171307 metadata/md5-cache/dev-java/jlex-1.2.6-r2
+1506171306 metadata/md5-cache/dev-java/hawtjni-runtime-1.10
+1506171306 metadata/md5-cache/dev-java/ant-core-1.7.1-r4
+1506171307 metadata/md5-cache/dev-java/jsr305-1.0-r1
+1506171307 metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
+1506171306 metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+1506171307 metadata/md5-cache/dev-java/netbeans-harness-8.0.2
+1506171307 metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+1506171306 metadata/md5-cache/dev-java/commons-io-2.0.1
+1506171307 metadata/md5-cache/dev-java/jsr181-1.0
+1506171306 metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+1506171307 metadata/md5-cache/dev-java/mimepull-1.8
+1506171306 metadata/md5-cache/dev-java/commons-el-1.0-r3
+1506171306 metadata/md5-cache/dev-java/commons-compress-1.8.1
+1506171307 metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
+1506171307 metadata/md5-cache/dev-java/proguard-4.5
+1506171307 metadata/md5-cache/dev-java/lzma-4.63
+1506171307 metadata/md5-cache/dev-java/jdbc-mysql-5.1.18
+1506171306 metadata/md5-cache/dev-java/antenna-1.0.2-r1
+1506171306 metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+1506171307 metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
+1506171306 metadata/md5-cache/dev-java/ant-apache-resolver-1.9.1
+1506171307 metadata/md5-cache/dev-java/jcmdline-1.0.2-r1
+1506171307 metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
+1506171307 metadata/md5-cache/dev-java/jnlp-api-6.0.18
+1506171307 metadata/md5-cache/dev-java/lucene-2.3.1
+1506171307 metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22
+1506171306 metadata/md5-cache/dev-java/guava-15.0
+1506171306 metadata/md5-cache/dev-java/jarjar-1.4
+1506171307 metadata/md5-cache/dev-java/qdox-1.12-r1
+1506171307 metadata/md5-cache/dev-java/xp-0.5-r1
+1506171307 metadata/md5-cache/dev-java/jsap-2.1
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
+1506171307 metadata/md5-cache/dev-java/jexcelapi-2.6.8
+1506171306 metadata/md5-cache/dev-java/freehep-misc-deps-0.1
+1506171306 metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
+1506171306 metadata/md5-cache/dev-java/guice-2.0-r1
+1506171306 metadata/md5-cache/dev-java/commons-attributes-2.2-r2
+1506171307 metadata/md5-cache/dev-java/jnr-constants-0.8.6
+1506171306 metadata/md5-cache/dev-java/jakarta-jstl-1.1.2-r2
+1506171306 metadata/md5-cache/dev-java/jacl-1.3.3
+1506171307 metadata/md5-cache/dev-java/saaj-1.3.19-r1
+1506171307 metadata/md5-cache/dev-java/rxtx-2.2_pre2
+1506171307 metadata/md5-cache/dev-java/sablecc-3.7
+1506171306 metadata/md5-cache/dev-java/ant-javamail-1.8.4
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
+1506171306 metadata/md5-cache/dev-java/istack-commons-runtime-2.22
+1506171307 metadata/md5-cache/dev-java/jdom-1.0_beta10-r4
+1506171307 metadata/md5-cache/dev-java/jdbc-informix-3.00.3
+1506171306 metadata/md5-cache/dev-java/icu4j-49.1
+1506171307 metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
+1506171306 metadata/md5-cache/dev-java/jax-rpc-1.1.3.01
+1506171307 metadata/md5-cache/dev-java/poi-3.0.2-r1
+1506171306 metadata/md5-cache/dev-java/ant-junit4-1.8.4
+1506171306 metadata/md5-cache/dev-java/ant-eclipse-ecj-3.7.1
+1506171307 metadata/md5-cache/dev-java/struts-1.2.9-r3
+1506171306 metadata/md5-cache/dev-java/guice-3.0-r1
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.4
+1506171306 metadata/md5-cache/dev-java/browserlauncher2-1.3
+1506171307 metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+1506171307 metadata/md5-cache/dev-java/tapestry-3.0.4-r1
+1506171307 metadata/md5-cache/dev-java/minlog-1.2
+1506171307 metadata/md5-cache/dev-java/proguard-4.7
+1506171306 metadata/md5-cache/dev-java/ant-ivy-2.3.0
+1506171307 metadata/md5-cache/dev-java/picocontainer-1.1-r1
+1506171306 metadata/md5-cache/dev-java/gjdoc-0.7.9-r2
+1506171306 metadata/md5-cache/dev-java/javacc-5.0-r1
+1506171307 metadata/md5-cache/dev-java/rngom-20051226
+1506171307 metadata/md5-cache/dev-java/prefuse-20071021_beta
+1506171306 metadata/md5-cache/dev-java/ant-apache-oro-1.8.4
+1506171307 metadata/md5-cache/dev-java/xmlunit-1.3
+1506171306 metadata/md5-cache/dev-java/commons-daemon-1.0.7
+1506171306 metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+1506171306 metadata/md5-cache/dev-java/jaxen-1.1.4
+1506171307 metadata/md5-cache/dev-java/neuroph-2.4
+1506171307 metadata/md5-cache/dev-java/mojarra-2.2.9
+1506171307 metadata/md5-cache/dev-java/swt-3.7.1
+1506171306 metadata/md5-cache/dev-java/commons-daemon-1.0.9
+1506171307 metadata/md5-cache/dev-java/libmso-0.1
+1506171306 metadata/md5-cache/dev-java/antlr-2.7.7-r2
+1506171307 metadata/md5-cache/dev-java/jung-1.7.6
+1506171307 metadata/md5-cache/dev-java/qdox-1.6.3
+1506171306 metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.5.14
+1506171307 metadata/md5-cache/dev-java/mojarra-1.2.15-r2
+1506171306 metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
+1506171307 metadata/md5-cache/dev-java/jdom-1.0-r4
 1505281110 metadata/md5-cache/dev-java/hp-jdk-bin-1.6.0.05
-1506160037 metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.2.5
-1506160037 metadata/md5-cache/dev-java/wstx-3.2.9
-1506160037 metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
-1506160036 metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1
-1506160036 metadata/md5-cache/dev-java/freehep-io-2.0.2
-1506160037 metadata/md5-cache/dev-java/jna-3.4.0-r1
-1506160036 metadata/md5-cache/dev-java/flyingsaucer-7-r2
-1506160037 metadata/md5-cache/dev-java/jansi-native-1.5
-1506160037 metadata/md5-cache/dev-java/struts-xwork-2.3.15.2
-1506160037 metadata/md5-cache/dev-java/lucene-3.0.3
-1506160037 metadata/md5-cache/dev-java/pdf-renderer-0.9.1
-1506160037 metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1
-1506160036 metadata/md5-cache/dev-java/ant-jai-1.8.4
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.4
+1506171306 metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.2.5
+1506171307 metadata/md5-cache/dev-java/wstx-3.2.9
+1506171307 metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
+1506171306 metadata/md5-cache/dev-java/commons-httpclient-2.0.2-r1
+1506171306 metadata/md5-cache/dev-java/freehep-io-2.0.2
+1506171307 metadata/md5-cache/dev-java/jna-3.4.0-r1
+1506171306 metadata/md5-cache/dev-java/flyingsaucer-7-r2
+1506171306 metadata/md5-cache/dev-java/jansi-native-1.5
+1506171307 metadata/md5-cache/dev-java/struts-xwork-2.3.15.2
+1506171307 metadata/md5-cache/dev-java/lucene-3.0.3
+1506171307 metadata/md5-cache/dev-java/pdf-renderer-0.9.1
+1506171307 metadata/md5-cache/dev-java/mx4j-tools-3.0.2-r1
+1506171306 metadata/md5-cache/dev-java/ant-jai-1.8.4
 1505281110 metadata/md5-cache/dev-java/ant-1.9.2
-1506160036 metadata/md5-cache/dev-java/commons-primitives-1.0-r2
-1506160037 metadata/md5-cache/dev-java/nailgun-0.7.1-r1
-1506160037 metadata/md5-cache/dev-java/jinput-2.0.6-r1
-1506160036 metadata/md5-cache/dev-java/commons-math-3.2
-1506160037 metadata/md5-cache/dev-java/struts-2.3.15.2
-1506160037 metadata/md5-cache/dev-java/stax-ex-1.0
-1506160037 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
-1506160037 metadata/md5-cache/dev-java/icu4j-3.8.1-r1
-1506160036 metadata/md5-cache/dev-java/bcprov-1.50
+1506171306 metadata/md5-cache/dev-java/commons-primitives-1.0-r2
+1506171307 metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+1506171307 metadata/md5-cache/dev-java/jinput-2.0.6-r1
+1506171306 metadata/md5-cache/dev-java/commons-math-3.2
+1506171307 metadata/md5-cache/dev-java/struts-2.3.15.2
+1506171307 metadata/md5-cache/dev-java/stax-ex-1.0
+1506171307 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+1506171306 metadata/md5-cache/dev-java/icu4j-3.8.1-r1
+1506171306 metadata/md5-cache/dev-java/bcprov-1.50
 1212080306 metadata/md5-cache/dev-java/maven-bin-1.1-r1
-1506160037 metadata/md5-cache/dev-java/jnr-posix-2.5.0
-1506160036 metadata/md5-cache/dev-java/ant-nodeps-1.8.2
-1506160037 metadata/md5-cache/dev-java/xmlrpc-3.1.3
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1
-1506160037 metadata/md5-cache/dev-java/slf4j-api-1.7.6
-1506160036 metadata/md5-cache/dev-java/bcel-5.2-r2
-1506160037 metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.5.25
-1506160036 metadata/md5-cache/dev-java/ant-jai-1.8.2
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
-1506160036 metadata/md5-cache/dev-java/edtftpj-2.0.4
-1506160037 metadata/md5-cache/dev-java/snakeyaml-1.9
-1506160037 metadata/md5-cache/dev-java/guava-14.0.1
-1506160037 metadata/md5-cache/dev-java/objenesis-1.3
-1506160037 metadata/md5-cache/dev-java/jaffl-0.5.11
-1506160036 metadata/md5-cache/dev-java/beansbinding-1.2.1
-1506160037 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
-1506160036 metadata/md5-cache/dev-java/ant-jmf-1.9.1
+1506171306 metadata/md5-cache/dev-java/ant-nodeps-1.8.2
+1506171307 metadata/md5-cache/dev-java/xmlrpc-3.1.3
+1506171307 metadata/md5-cache/dev-java/slf4j-api-1.7.6
+1506171306 metadata/md5-cache/dev-java/bcel-5.2-r2
+1506171307 metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.5.25
+1506171306 metadata/md5-cache/dev-java/ant-jai-1.8.2
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+1506171306 metadata/md5-cache/dev-java/edtftpj-2.0.4
+1506171307 metadata/md5-cache/dev-java/snakeyaml-1.9
+1506171306 metadata/md5-cache/dev-java/guava-14.0.1
+1506171307 metadata/md5-cache/dev-java/objenesis-1.3
+1506171306 metadata/md5-cache/dev-java/jaffl-0.5.11
+1506171306 metadata/md5-cache/dev-java/beansbinding-1.2.1
+1506171307 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+1506171306 metadata/md5-cache/dev-java/ant-jmf-1.9.1
 1505281110 metadata/md5-cache/dev-java/byaccj-1.15-r1
-1506160037 metadata/md5-cache/dev-java/itext-5.5.4
-1506160036 metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
-1506160037 metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5
-1506160037 metadata/md5-cache/dev-java/xdoclet-1.2.3
-1506160037 metadata/md5-cache/dev-java/zeus-jscl-1.08
-1506160036 metadata/md5-cache/dev-java/fastutil-4.4.2-r1
-1506160037 metadata/md5-cache/dev-java/snip-0.11
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.7.7
-1506160036 metadata/md5-cache/dev-java/asm-3.3.1
-1506160037 metadata/md5-cache/dev-java/nachocalendar-0.23
-1506160037 metadata/md5-cache/dev-java/netbeans-ide-8.0.2
-1506160037 metadata/md5-cache/dev-java/sun-jimi-1.0-r3
+1506171306 metadata/md5-cache/dev-java/itext-5.5.4
+1506171306 metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
+1506171307 metadata/md5-cache/dev-java/milton-mail-api-2.5.1.5
+1506171307 metadata/md5-cache/dev-java/xdoclet-1.2.3
+1506171307 metadata/md5-cache/dev-java/zeus-jscl-1.08
+1506171306 metadata/md5-cache/dev-java/fastutil-4.4.2-r1
+1506171307 metadata/md5-cache/dev-java/snip-0.11
+1506171306 metadata/md5-cache/dev-java/asm-3.3.1
+1506171307 metadata/md5-cache/dev-java/nachocalendar-0.23
+1506171307 metadata/md5-cache/dev-java/netbeans-ide-8.0.2
+1506171307 metadata/md5-cache/dev-java/sun-jimi-1.0-r3
 1505281111 metadata/md5-cache/dev-java/sun-jdk-1.6.0.45
-1506160037 metadata/md5-cache/dev-java/netbeans-platform-8.0.2
-1506160037 metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
-1506160036 metadata/md5-cache/dev-java/commons-grant-1.0
+1506171307 metadata/md5-cache/dev-java/netbeans-platform-8.0.2
+1506171307 metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+1506171306 metadata/md5-cache/dev-java/commons-grant-1.0
 1505281111 metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.45
-1506160036 metadata/md5-cache/dev-java/commons-jxpath-1.3
-1506160036 metadata/md5-cache/dev-java/commons-cli-1.2
-1506160037 metadata/md5-cache/dev-java/jicmp-1.0.2
-1506160037 metadata/md5-cache/dev-java/kryo-1.05
-1506160037 metadata/md5-cache/dev-java/spice-jndikit-1.2
-1506160037 metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
-1506160036 metadata/md5-cache/dev-java/commons-digester-3.2-r1
-1506160036 metadata/md5-cache/dev-java/cos-20021105-r3
+1506171306 metadata/md5-cache/dev-java/commons-jxpath-1.3
+1506171306 metadata/md5-cache/dev-java/commons-cli-1.2
+1506171307 metadata/md5-cache/dev-java/jicmp-1.0.2
+1506171307 metadata/md5-cache/dev-java/kryo-1.05
+1506171307 metadata/md5-cache/dev-java/spice-jndikit-1.2
+1506171307 metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
+1506171306 metadata/md5-cache/dev-java/commons-digester-3.2-r1
+1506171306 metadata/md5-cache/dev-java/cos-20021105-r3
 1505281110 metadata/md5-cache/dev-java/icedtea-bin-7.2.5.3
-1506160037 metadata/md5-cache/dev-java/skinlf-6.7-r1
-1506160037 metadata/md5-cache/dev-java/jaffl-0.5.1
-1506160037 metadata/md5-cache/dev-java/netty-transport-4.0.21
-1506160037 metadata/md5-cache/dev-java/jempbox-0.2.0
-1506160036 metadata/md5-cache/dev-java/commons-launcher-1.1-r1
-1506160036 metadata/md5-cache/dev-java/args4j-2.32
-1506160037 metadata/md5-cache/dev-java/odfdom-0.8.6-r1
-1506160036 metadata/md5-cache/dev-java/ant-commons-net-1.9.2
-1506160036 metadata/md5-cache/dev-java/ant-trax-1.8.4
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
-1506160037 metadata/md5-cache/dev-java/maven-bin-2.2.1
-1506160037 metadata/md5-cache/dev-java/openspml2-1.0_rc2
-1506160037 metadata/md5-cache/dev-java/jade-3.3-r2
+1506171307 metadata/md5-cache/dev-java/skinlf-6.7-r1
+1506171306 metadata/md5-cache/dev-java/jaffl-0.5.1
+1506171307 metadata/md5-cache/dev-java/netty-transport-4.0.21
+1506171307 metadata/md5-cache/dev-java/jempbox-0.2.0
+1506171306 metadata/md5-cache/dev-java/commons-launcher-1.1-r1
+1506171306 metadata/md5-cache/dev-java/args4j-2.32
+1506171307 metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+1506171306 metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+1506171306 metadata/md5-cache/dev-java/ant-trax-1.8.4
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+1506171307 metadata/md5-cache/dev-java/maven-bin-2.2.1
+1506171307 metadata/md5-cache/dev-java/openspml2-1.0_rc2
+1506171306 metadata/md5-cache/dev-java/jade-3.3-r2
 1505281111 metadata/md5-cache/dev-java/jikes-1.22-r13
-1506160037 metadata/md5-cache/dev-java/jama-1.0.3
-1506160036 metadata/md5-cache/dev-java/fastutil-6.5.4
-1506160037 metadata/md5-cache/dev-java/htmlparser-org-1.6
-1506160036 metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
-1506160037 metadata/md5-cache/dev-java/jnr-enxio-0.7
-1506160036 metadata/md5-cache/dev-java/bcprov-1.38-r3
-1506160036 metadata/md5-cache/dev-java/antlr-3.1.3-r3
-1506160037 metadata/md5-cache/dev-java/jarbundler-1.7
-1506160036 metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1
-1506160036 metadata/md5-cache/dev-java/castor-0.9.9.1-r7
-1506160037 metadata/md5-cache/dev-java/javassist-3.7-r1
-1506160036 metadata/md5-cache/dev-java/commons-validator-1.4.0
-1506160037 metadata/md5-cache/dev-java/xp-0.5-r2
-1506160036 metadata/md5-cache/dev-java/commons-io-2.4
-1506160037 metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1
-1506160037 metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
-1506160037 metadata/md5-cache/dev-java/lucene-3.6.2
-1506160037 metadata/md5-cache/dev-java/jnr-posix-3.0.10
-1506160037 metadata/md5-cache/dev-java/spring-aop-3.2.4
-1506160036 metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
-1506160037 metadata/md5-cache/dev-java/jflex-1.5.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1
-1506160037 metadata/md5-cache/dev-java/lucene-3.4.0
-1506160036 metadata/md5-cache/dev-java/castor-1.1.1-r3
-1506160037 metadata/md5-cache/dev-java/javacup-0.10k-r1
-1506160037 metadata/md5-cache/dev-java/hessian-3.0.20
-1506160036 metadata/md5-cache/dev-java/codemodel-2.1-r1
-1506160037 metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.2
-1506160036 metadata/md5-cache/dev-java/fontbox-0.1.0
-1506160037 metadata/md5-cache/dev-java/nekohtml-1.9.6
-1506160037 metadata/md5-cache/dev-java/relaxngcc-1.12-r2
-1506160037 metadata/md5-cache/dev-java/lzmajio-0.95
-1506160037 metadata/md5-cache/dev-java/jboss-modules-1.3.0
-1506160036 metadata/md5-cache/dev-java/commons-vfs-1.0
-1506160037 metadata/md5-cache/dev-java/javolution-4.0.2-r1
-1506160037 metadata/md5-cache/dev-java/msv-20050627-r2
-1506160037 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
-1506160036 metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2
-1506160037 metadata/md5-cache/dev-java/groovy-1.8.5-r1
-1506160037 metadata/md5-cache/dev-java/osgi-compendium-4.3.1
-1506160036 metadata/md5-cache/dev-java/backport-util-concurrent-3.1
-1506160037 metadata/md5-cache/dev-java/jnr-constants-0.8.3
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.1.4
-1506160037 metadata/md5-cache/dev-java/hoteqn-4.0.0
-1506160037 metadata/md5-cache/dev-java/swing-layout-1.0.4
-1506160037 metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
-1506160037 metadata/md5-cache/dev-java/jdom-1.0-r2
-1506160037 metadata/md5-cache/dev-java/mersennetwister-0_pre23765
-1506160037 metadata/md5-cache/dev-java/saxon-9.2.0.6
-1506160036 metadata/md5-cache/dev-java/ecs-1.4.2-r1
-1506160037 metadata/md5-cache/dev-java/higlayout-1.0-r1
-1506160036 metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
-1506160037 metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44
-1506160036 metadata/md5-cache/dev-java/batik-1.7-r3
-1506160037 metadata/md5-cache/dev-java/mckoi-1.0.3-r2
+1506171306 metadata/md5-cache/dev-java/jama-1.0.3
+1506171306 metadata/md5-cache/dev-java/fastutil-6.5.4
+1506171306 metadata/md5-cache/dev-java/htmlparser-org-1.6
+1506171306 metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-8.3_p603
+1506172206 metadata/md5-cache/dev-java/jnr-enxio-0.7
+1506171306 metadata/md5-cache/dev-java/bcprov-1.38-r3
+1506171306 metadata/md5-cache/dev-java/antlr-3.1.3-r3
+1506171306 metadata/md5-cache/dev-java/jarbundler-1.7
+1506171306 metadata/md5-cache/dev-java/fastinfoset-1.2.1-r1
+1506171306 metadata/md5-cache/dev-java/castor-0.9.9.1-r7
+1506171306 metadata/md5-cache/dev-java/javassist-3.7-r1
+1506171306 metadata/md5-cache/dev-java/commons-validator-1.4.0
+1506171307 metadata/md5-cache/dev-java/xp-0.5-r2
+1506171306 metadata/md5-cache/dev-java/commons-io-2.4
+1506171306 metadata/md5-cache/dev-java/istack-commons-tools-20070122-r1
+1506171307 metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
+1506171307 metadata/md5-cache/dev-java/lucene-3.6.2
+1506171307 metadata/md5-cache/dev-java/spring-aop-3.2.4
+1506171306 metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
+1506171307 metadata/md5-cache/dev-java/jflex-1.5.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-regexp-1.9.1
+1506171307 metadata/md5-cache/dev-java/lucene-3.4.0
+1506171306 metadata/md5-cache/dev-java/castor-1.1.1-r3
+1506171306 metadata/md5-cache/dev-java/javacup-0.10k-r1
+1506171306 metadata/md5-cache/dev-java/hessian-3.0.20
+1506171306 metadata/md5-cache/dev-java/codemodel-2.1-r1
+1506171307 metadata/md5-cache/dev-java/netbeans-java-8.0.2-r2
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.2
+1506171306 metadata/md5-cache/dev-java/fontbox-0.1.0
+1506171307 metadata/md5-cache/dev-java/nekohtml-1.9.6
+1506171307 metadata/md5-cache/dev-java/relaxngcc-1.12-r2
+1506171307 metadata/md5-cache/dev-java/lzmajio-0.95
+1506171307 metadata/md5-cache/dev-java/jboss-modules-1.3.0
+1506171306 metadata/md5-cache/dev-java/commons-vfs-1.0
+1506171306 metadata/md5-cache/dev-java/javolution-4.0.2-r1
+1506171307 metadata/md5-cache/dev-java/msv-20050627-r2
+1506171307 metadata/md5-cache/dev-java/slf4j-log4j12-1.7.5
+1506171306 metadata/md5-cache/dev-java/exolabcore-0.3.7_p20050205-r2
+1506171306 metadata/md5-cache/dev-java/groovy-1.8.5-r1
+1506171307 metadata/md5-cache/dev-java/osgi-compendium-4.3.1
+1506171306 metadata/md5-cache/dev-java/backport-util-concurrent-3.1
+1506172007 metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
+1506172036 metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+1506171306 metadata/md5-cache/dev-java/hoteqn-4.0.0
+1506171307 metadata/md5-cache/dev-java/swing-layout-1.0.4
+1506171307 metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217
+1506171307 metadata/md5-cache/dev-java/jdom-1.0-r2
+1506171307 metadata/md5-cache/dev-java/mersennetwister-0_pre23765
+1506171307 metadata/md5-cache/dev-java/saxon-9.2.0.6
+1506171306 metadata/md5-cache/dev-java/ecs-1.4.2-r1
+1506171306 metadata/md5-cache/dev-java/higlayout-1.0-r1
+1506171306 metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+1506171306 metadata/md5-cache/dev-java/glassfish-servlet-api-2_beta44
+1506171306 metadata/md5-cache/dev-java/batik-1.7-r3
+1506171307 metadata/md5-cache/dev-java/mckoi-1.0.3-r2
 1505281110 metadata/md5-cache/dev-java/gcj-jdk-4.8.4
-1506160037 metadata/md5-cache/dev-java/javolution-2.2.4-r2
-1506160037 metadata/md5-cache/dev-java/reflections-0.9.9
-1506160037 metadata/md5-cache/dev-java/jakarta-regexp-1.5
-1506160037 metadata/md5-cache/dev-java/xerces-1.3.1-r2
-1506160037 metadata/md5-cache/dev-java/laf-plugin-0.2
-1506160037 metadata/md5-cache/dev-java/jrrd-1.0.1-r1
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.4-r1
-1506160036 metadata/md5-cache/dev-java/commons-fileupload-1.2.2
-1506160037 metadata/md5-cache/dev-java/soap-2.3.1-r4
-1506160036 metadata/md5-cache/dev-java/commons-modeler-2.0.1
-1506160037 metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
-1506160037 metadata/md5-cache/dev-java/snappy-1.0.3_rc3
-1506160036 metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
-1506160036 metadata/md5-cache/dev-java/ant-jdepend-1.8.2
-1506160036 metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1
-1506160037 metadata/md5-cache/dev-java/jgoodies-common-1.8.0
-1506160037 metadata/md5-cache/dev-java/rhino-1.6.5
-1506160037 metadata/md5-cache/dev-java/jcodings-1.0.5
-1506160036 metadata/md5-cache/dev-java/blowfishj-2.14-r1
-1506160037 metadata/md5-cache/dev-java/jmock-1.2.0
-1506160037 metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
-1506160037 metadata/md5-cache/dev-java/jmdns-3.1.4
-1506160036 metadata/md5-cache/dev-java/ant-commons-net-1.9.1
-1506160037 metadata/md5-cache/dev-java/icu4j-4.4.2
-1506160037 metadata/md5-cache/dev-java/jazzy-0.5.2
+1506171306 metadata/md5-cache/dev-java/javolution-2.2.4-r2
+1506171307 metadata/md5-cache/dev-java/reflections-0.9.9
+1506171306 metadata/md5-cache/dev-java/jakarta-regexp-1.5
+1506171307 metadata/md5-cache/dev-java/xerces-1.3.1-r2
+1506171307 metadata/md5-cache/dev-java/laf-plugin-0.2
+1506171307 metadata/md5-cache/dev-java/jrrd-1.0.1-r1
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.4-r1
+1506171306 metadata/md5-cache/dev-java/commons-fileupload-1.2.2
+1506171307 metadata/md5-cache/dev-java/soap-2.3.1-r4
+1506171306 metadata/md5-cache/dev-java/commons-modeler-2.0.1
+1506171307 metadata/md5-cache/dev-java/pdfbox-0.7.3-r3
+1506171307 metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+1506171306 metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
+1506171306 metadata/md5-cache/dev-java/ant-jdepend-1.8.2
+1506171306 metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.1
+1506171307 metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+1506171307 metadata/md5-cache/dev-java/rhino-1.6.5
+1506171307 metadata/md5-cache/dev-java/jcodings-1.0.5
+1506171306 metadata/md5-cache/dev-java/blowfishj-2.14-r1
+1506171307 metadata/md5-cache/dev-java/jmock-1.2.0
+1506171307 metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
+1506171307 metadata/md5-cache/dev-java/jmdns-3.1.4
+1506171306 metadata/md5-cache/dev-java/ant-commons-net-1.9.1
+1506171306 metadata/md5-cache/dev-java/icu4j-4.4.2
+1506171307 metadata/md5-cache/dev-java/jazzy-0.5.2
 1505281110 metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p1
-1506160037 metadata/md5-cache/dev-java/jebl-9999
-1506160037 metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
-1506160037 metadata/md5-cache/dev-java/jython-2.1-r11
-1506160037 metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1
-1506160037 metadata/md5-cache/dev-java/jgrapht-0.8.3
-1506160036 metadata/md5-cache/dev-java/ant-junit-1.9.1
-1506160037 metadata/md5-cache/dev-java/xstream-1.3.1-r3
-1506160036 metadata/md5-cache/dev-java/ant-testutil-1.8.4
-1506160037 metadata/md5-cache/dev-java/sun-dtdparser-1.0
-1506160037 metadata/md5-cache/dev-java/jaxme-0.5.2
-1506160037 metadata/md5-cache/dev-java/jpfcodegen-0.4
-1506160036 metadata/md5-cache/dev-java/ant-apache-oro-1.8.2
-1506160037 metadata/md5-cache/dev-java/xml-writer-0.2
-1506160036 metadata/md5-cache/dev-java/commons-beanutils-1.8.0
-1506160037 metadata/md5-cache/dev-java/soap-2.3.1-r3
-1506160037 metadata/md5-cache/dev-java/netty-codec-4.0.19
-1506160036 metadata/md5-cache/dev-java/freehep-rootio-2.0.9
-1506160036 metadata/md5-cache/dev-java/bcpkix-1.50
-1506160036 metadata/md5-cache/dev-java/freehep-util-2.0.2
-1506160036 metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3
-1506160037 metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
-1506160037 metadata/md5-cache/dev-java/junit-4.10
-1506160037 metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1
-1506160037 metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
-1506160036 metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
-1506160036 metadata/md5-cache/dev-java/fop-1.1
-1506160037 metadata/md5-cache/dev-java/jffi-1.0.11-r1
+1506171307 metadata/md5-cache/dev-java/jebl-9999
+1506171307 metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
+1506171307 metadata/md5-cache/dev-java/jython-2.1-r11
+1506171306 metadata/md5-cache/dev-java/java-xmlbuilder-0.6-r1
+1506171307 metadata/md5-cache/dev-java/jgrapht-0.8.3
+1506171306 metadata/md5-cache/dev-java/ant-junit-1.9.1
+1506171307 metadata/md5-cache/dev-java/xstream-1.3.1-r3
+1506171306 metadata/md5-cache/dev-java/ant-testutil-1.8.4
+1506171307 metadata/md5-cache/dev-java/sun-dtdparser-1.0
+1506171306 metadata/md5-cache/dev-java/jaxme-0.5.2
+1506171307 metadata/md5-cache/dev-java/jpfcodegen-0.4
+1506171306 metadata/md5-cache/dev-java/ant-apache-oro-1.8.2
+1506171307 metadata/md5-cache/dev-java/xml-writer-0.2
+1506171306 metadata/md5-cache/dev-java/commons-beanutils-1.8.0
+1506171307 metadata/md5-cache/dev-java/soap-2.3.1-r3
+1506171307 metadata/md5-cache/dev-java/netty-codec-4.0.19
+1506171306 metadata/md5-cache/dev-java/freehep-rootio-2.0.9
+1506171306 metadata/md5-cache/dev-java/bcpkix-1.50
+1506171306 metadata/md5-cache/dev-java/freehep-util-2.0.2
+1506171306 metadata/md5-cache/dev-java/aspectwerkz-2.0_rc2-r3
+1506171306 metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+1506171307 metadata/md5-cache/dev-java/junit-4.10
+1506171306 metadata/md5-cache/dev-java/istack-commons-runtime-20070122-r1
+1506171306 metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
+1506171306 metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
+1506171306 metadata/md5-cache/dev-java/fop-1.1
+1506171307 metadata/md5-cache/dev-java/jffi-1.0.11-r1
 1211091737 metadata/md5-cache/dev-java/offo-hyphenation-1.2
-1506160037 metadata/md5-cache/dev-java/slf4j-api-1.6.6
-1506160037 metadata/md5-cache/dev-java/jcharts-0.7.5-r2
-1506160037 metadata/md5-cache/dev-java/swt-3.8.2
-1506160036 metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
-1506160037 metadata/md5-cache/dev-java/icu4j-4.2.1.1
-1506160037 metadata/md5-cache/dev-java/zemberek-2.1.1
-1506160037 metadata/md5-cache/dev-java/trove-3.0.2
-1506160037 metadata/md5-cache/dev-java/jlibeps-0.1
-1506160037 metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
-1506160037 metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
+1506171307 metadata/md5-cache/dev-java/slf4j-api-1.6.6
+1506171307 metadata/md5-cache/dev-java/jcharts-0.7.5-r2
+1506171307 metadata/md5-cache/dev-java/swt-3.8.2
+1506171306 metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
+1506171306 metadata/md5-cache/dev-java/icu4j-4.2.1.1
+1506171307 metadata/md5-cache/dev-java/zemberek-2.1.1
+1506171307 metadata/md5-cache/dev-java/trove-3.0.2
+1506171307 metadata/md5-cache/dev-java/jlibeps-0.1
+1506171307 metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
+1506171307 metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2
 1505281110 metadata/md5-cache/dev-java/gcj-jdk-4.9.2
-1506160037 metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
-1506160037 metadata/md5-cache/dev-java/httpunit-1.7
-1506160037 metadata/md5-cache/dev-java/japitools-0.9.7-r1
-1506160036 metadata/md5-cache/dev-java/bcprov-1.49-r3
-1506160037 metadata/md5-cache/dev-java/sun-jms-1.1-r2
-1506160036 metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1
-1506160037 metadata/md5-cache/dev-java/xerces-2.11.0
-1506160037 metadata/md5-cache/dev-java/javassist-2.6-r2
-1506160037 metadata/md5-cache/dev-java/xpp2-2.1.10-r1
-1506160036 metadata/md5-cache/dev-java/asm-2.2.3-r1
-1506160037 metadata/md5-cache/dev-java/junit-4.6
-1506160036 metadata/md5-cache/dev-java/aspectj-1.7.3-r1
-1506160036 metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
-1506160036 metadata/md5-cache/dev-java/eclipsito-0_pre20130713
-1506160037 metadata/md5-cache/dev-java/glazedlists-1.8.0
-1506160036 metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2
-1506160036 metadata/md5-cache/dev-java/fop-0.95
-1506160037 metadata/md5-cache/dev-java/kryo-2.21
-1506160037 metadata/md5-cache/dev-java/jutils-1.0.0
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.0.6
-1506160037 metadata/md5-cache/dev-java/jsr311-api-1.1
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-3
-1506160037 metadata/md5-cache/dev-java/jmdns-1.0
-1506160036 metadata/md5-cache/dev-java/ant-jmf-1.9.2
-1506160037 metadata/md5-cache/dev-java/stax-ex-1.7.6
-1506160037 metadata/md5-cache/dev-java/xml-security-1.5.7
-1506160037 metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
-1506160036 metadata/md5-cache/dev-java/ehcache-1.2.4-r4
-1506160037 metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2
-1506160037 metadata/md5-cache/dev-java/jgroups-2.9.0
-1506160037 metadata/md5-cache/dev-java/opencsv-2.3
-1506160037 metadata/md5-cache/dev-java/higlayout-1.0-r2
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1
-1506160037 metadata/md5-cache/dev-java/jnr-x86asm-0.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2
-1506160037 metadata/md5-cache/dev-java/xom-1.2.10
-1506160036 metadata/md5-cache/dev-java/commons-lang-3.3.2
-1506160037 metadata/md5-cache/dev-java/neuroph-2.3.1
-1506160037 metadata/md5-cache/dev-java/stax-1.2.0
-1506160037 metadata/md5-cache/dev-java/jaxp-1.4-r1
+1506171307 metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
+1506171306 metadata/md5-cache/dev-java/httpunit-1.7
+1506171306 metadata/md5-cache/dev-java/japitools-0.9.7-r1
+1506171306 metadata/md5-cache/dev-java/bcprov-1.49-r3
+1506171307 metadata/md5-cache/dev-java/sun-jms-1.1-r2
+1506171306 metadata/md5-cache/dev-java/commons-fileupload-1.2.1-r1
+1506171307 metadata/md5-cache/dev-java/xerces-2.11.0
+1506171306 metadata/md5-cache/dev-java/javassist-2.6-r2
+1506171307 metadata/md5-cache/dev-java/xpp2-2.1.10-r1
+1506171306 metadata/md5-cache/dev-java/asm-2.2.3-r1
+1506171307 metadata/md5-cache/dev-java/junit-4.6
+1506171306 metadata/md5-cache/dev-java/aspectj-1.7.3-r1
+1506171306 metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+1506171306 metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+1506171306 metadata/md5-cache/dev-java/glazedlists-1.8.0
+1506171306 metadata/md5-cache/dev-java/ant-apache-resolver-1.8.2
+1506171306 metadata/md5-cache/dev-java/fop-0.95
+1506171307 metadata/md5-cache/dev-java/kryo-2.21
+1506171307 metadata/md5-cache/dev-java/jutils-1.0.0
+1506171307 metadata/md5-cache/dev-java/jsr311-api-1.1
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-3
+1506171307 metadata/md5-cache/dev-java/jmdns-1.0
+1506171306 metadata/md5-cache/dev-java/ant-jmf-1.9.2
+1506171307 metadata/md5-cache/dev-java/stax-ex-1.7.6
+1506171307 metadata/md5-cache/dev-java/xml-security-1.5.7
+1506171307 metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
+1506171306 metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+1506171307 metadata/md5-cache/dev-java/piccolo2d-1.2.1-r2
+1506171307 metadata/md5-cache/dev-java/jgroups-2.9.0
+1506171307 metadata/md5-cache/dev-java/opencsv-2.3
+1506171306 metadata/md5-cache/dev-java/higlayout-1.0-r2
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.5.14-r1
+1506171307 metadata/md5-cache/dev-java/jnr-x86asm-0.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-xalan2-1.8.2
+1506171307 metadata/md5-cache/dev-java/xom-1.2.10
+1506171306 metadata/md5-cache/dev-java/commons-lang-3.3.2
+1506171307 metadata/md5-cache/dev-java/neuroph-2.3.1
+1506171307 metadata/md5-cache/dev-java/stax-1.2.0
+1506171306 metadata/md5-cache/dev-java/jaxp-1.4-r1
 1505281111 metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.80
-1506160037 metadata/md5-cache/dev-java/slf4j-simple-1.7.6
-1506160037 metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1
+1506171307 metadata/md5-cache/dev-java/slf4j-simple-1.7.6
+1506171307 metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1
 1211091736 metadata/md5-cache/dev-java/jad-bin-1.5.8e
-1506160037 metadata/md5-cache/dev-java/joni-2.1.0
-1506160037 metadata/md5-cache/dev-java/jarbundler-1.8.1-r1
-1506160037 metadata/md5-cache/dev-java/jzlib-1.0.7-r1
-1506160037 metadata/md5-cache/dev-java/saxon-8.4b-r3
-1506160037 metadata/md5-cache/dev-java/xsom-20060901
-1506160037 metadata/md5-cache/dev-java/junit-3.8.2-r1
-1506160036 metadata/md5-cache/dev-java/freehep-rtti-2.0.1
-1506160036 metadata/md5-cache/dev-java/bndlib-2.1.0
-1506160037 metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
-1506160037 metadata/md5-cache/dev-java/javassist-3.18.2
-1506160037 metadata/md5-cache/dev-java/sun-jaf-1.1.1
-1506160037 metadata/md5-cache/dev-java/maven-bin-3.1.0-r1
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.7.9
-1506160037 metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
-1506160037 metadata/md5-cache/dev-java/reflectasm-1.09
-1506160037 metadata/md5-cache/dev-java/jump-0.5
-1506160037 metadata/md5-cache/dev-java/javolution-2.2.4-r1
-1506160037 metadata/md5-cache/dev-java/sax-2.2.1-r2
-1506160037 metadata/md5-cache/dev-java/webgraph-1.4.1-r1
-1506160037 metadata/md5-cache/dev-java/jsr101-1.4-r2
-1506160037 metadata/md5-cache/dev-java/lucene-2.3.2
-1506160036 metadata/md5-cache/dev-java/freehep-xml-2.1.2
-1506160037 metadata/md5-cache/dev-java/javahelp-2.0.05_p63
-1506160036 metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
-1506160036 metadata/md5-cache/dev-java/apt-mirror-1.0-r1
-1506160036 metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
-1506160037 metadata/md5-cache/dev-java/snakeyaml-1.9-r1
-1506160037 metadata/md5-cache/dev-java/sun-javamail-1.4.3
-1506160037 metadata/md5-cache/dev-java/jstun-0.7.3
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
-1506160037 metadata/md5-cache/dev-java/saxon-6.5.5
-1506160037 metadata/md5-cache/dev-java/sux4j-2.0
-1506160037 metadata/md5-cache/dev-java/jffi-1.2.7
-1506160037 metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
-1506160037 metadata/md5-cache/dev-java/invokebinder-1.2
-1506160037 metadata/md5-cache/dev-java/jsr173-1.0-r1
-1506160037 metadata/md5-cache/dev-java/jline-2.12.1
-1506160036 metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
+1506171307 metadata/md5-cache/dev-java/joni-2.1.0
+1506171306 metadata/md5-cache/dev-java/jarbundler-1.8.1-r1
+1506171307 metadata/md5-cache/dev-java/jzlib-1.0.7-r1
+1506171307 metadata/md5-cache/dev-java/saxon-8.4b-r3
+1506171307 metadata/md5-cache/dev-java/xsom-20060901
+1506171307 metadata/md5-cache/dev-java/junit-3.8.2-r1
+1506171306 metadata/md5-cache/dev-java/freehep-rtti-2.0.1
+1506171306 metadata/md5-cache/dev-java/bndlib-2.1.0
+1506171306 metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
+1506171306 metadata/md5-cache/dev-java/javassist-3.18.2
+1506171307 metadata/md5-cache/dev-java/sun-jaf-1.1.1
+1506171307 metadata/md5-cache/dev-java/maven-bin-3.1.0-r1
+1506171307 metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+1506171307 metadata/md5-cache/dev-java/reflectasm-1.09
+1506171307 metadata/md5-cache/dev-java/jump-0.5
+1506171306 metadata/md5-cache/dev-java/javolution-2.2.4-r1
+1506171307 metadata/md5-cache/dev-java/sax-2.2.1-r2
+1506171307 metadata/md5-cache/dev-java/webgraph-1.4.1-r1
+1506171307 metadata/md5-cache/dev-java/jsr101-1.4-r2
+1506171307 metadata/md5-cache/dev-java/lucene-2.3.2
+1506171306 metadata/md5-cache/dev-java/freehep-xml-2.1.2
+1506171306 metadata/md5-cache/dev-java/javahelp-2.0.05_p63
+1506171306 metadata/md5-cache/dev-java/caucho-services-3.0.8-r2
+1506171306 metadata/md5-cache/dev-java/apt-mirror-1.0-r1
+1506171306 metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
+1506171307 metadata/md5-cache/dev-java/snakeyaml-1.9-r1
+1506171307 metadata/md5-cache/dev-java/sun-javamail-1.4.3
+1506171307 metadata/md5-cache/dev-java/jstun-0.7.3
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+1506171307 metadata/md5-cache/dev-java/saxon-6.5.5
+1506171307 metadata/md5-cache/dev-java/sux4j-2.0
+1506171307 metadata/md5-cache/dev-java/jffi-1.2.7
+1506171307 metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
+1506171306 metadata/md5-cache/dev-java/invokebinder-1.2
+1506171307 metadata/md5-cache/dev-java/jsr173-1.0-r1
+1506171307 metadata/md5-cache/dev-java/jline-2.12.1
+1506171306 metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
 1505281111 metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.60
 1505281110 metadata/md5-cache/dev-java/ibm-jre-bin-1.6.0.9_p2
-1506160036 metadata/md5-cache/dev-java/ant-jai-1.9.1
-1506160037 metadata/md5-cache/dev-java/slf4j-api-1.5.11
-1506160036 metadata/md5-cache/dev-java/commons-logging-1.1.1
-1506160037 metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5
-1506160037 metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
-1506160036 metadata/md5-cache/dev-java/ant-trax-1.9.2
-1506160037 metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
-1506160037 metadata/md5-cache/dev-java/jdbc-mysql-5.1.14
-1506160037 metadata/md5-cache/dev-java/proxool-0.8.3-r2
-1506160037 metadata/md5-cache/dev-java/xmlc-2.3.1-r1
-1506160037 metadata/md5-cache/dev-java/fscript-1.17
-1506160036 metadata/md5-cache/dev-java/cortado-0.6.0
-1506160037 metadata/md5-cache/dev-java/javax-inject-1-r1
-1506160036 metadata/md5-cache/dev-java/freehep-xdr-2.0.3
-1506160036 metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2
-1506160037 metadata/md5-cache/dev-java/jtds-1.2.5-r1
-1506160037 metadata/md5-cache/dev-java/jarbundler-2.3.1
-1506160037 metadata/md5-cache/dev-java/jsr223-1.0-r1
-1506160037 metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
-1506160037 metadata/md5-cache/dev-java/javacc-4.2
-1506160037 metadata/md5-cache/dev-java/hessian-3.0.8-r5
-1506160037 metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
-1506160037 metadata/md5-cache/dev-java/hamcrest-library-1.1
-1506160037 metadata/md5-cache/dev-java/mockito-1.9.5-r1
-1506160037 metadata/md5-cache/dev-java/hamcrest-generator-1.1
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.22
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
-1506160036 metadata/md5-cache/dev-java/dbus-java-2.7-r1
+1506171306 metadata/md5-cache/dev-java/ant-jai-1.9.1
+1506171307 metadata/md5-cache/dev-java/slf4j-api-1.5.11
+1506171306 metadata/md5-cache/dev-java/commons-logging-1.1.1
+1506171307 metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5
+1506171306 metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
+1506171306 metadata/md5-cache/dev-java/ant-trax-1.9.2
+1506171307 metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+1506171307 metadata/md5-cache/dev-java/jdbc-mysql-5.1.14
+1506171307 metadata/md5-cache/dev-java/proxool-0.8.3-r2
+1506171307 metadata/md5-cache/dev-java/xmlc-2.3.1-r1
+1506171306 metadata/md5-cache/dev-java/fscript-1.17
+1506171306 metadata/md5-cache/dev-java/cortado-0.6.0
+1506171306 metadata/md5-cache/dev-java/javax-inject-1-r1
+1506171306 metadata/md5-cache/dev-java/freehep-xdr-2.0.3
+1506171306 metadata/md5-cache/dev-java/commons-graph-0.8.1_p20040118-r2
+1506171307 metadata/md5-cache/dev-java/jtds-1.2.5-r1
+1506171306 metadata/md5-cache/dev-java/jarbundler-2.3.1
+1506171307 metadata/md5-cache/dev-java/jsr223-1.0-r1
+1506171307 metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+1506171306 metadata/md5-cache/dev-java/javacc-4.2
+1506171306 metadata/md5-cache/dev-java/hessian-3.0.8-r5
+1506171307 metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
+1506171306 metadata/md5-cache/dev-java/hamcrest-library-1.1
+1506171307 metadata/md5-cache/dev-java/mockito-1.9.5-r1
+1506171306 metadata/md5-cache/dev-java/hamcrest-generator-1.1
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.22
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
+1506171306 metadata/md5-cache/dev-java/dbus-java-2.7-r1
 1505281111 metadata/md5-cache/dev-java/java-config-2.2.0
-1506160036 metadata/md5-cache/dev-java/ant-core-1.8.0-r1
-1506160037 metadata/md5-cache/dev-java/servletapi-2.3-r3
-1506160036 metadata/md5-cache/dev-java/commons-lang-2.0-r2
-1506160037 metadata/md5-cache/dev-java/jcommon-1.0.18
-1506160037 metadata/md5-cache/dev-java/jortho-1.0
-1506160037 metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
-1506160037 metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
-1506160036 metadata/md5-cache/dev-java/bctsp-1.45-r1
-1506160036 metadata/md5-cache/dev-java/ant-jdepend-1.8.4
-1506160037 metadata/md5-cache/dev-java/jdbm-0.12-r2
-1506160037 metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
-1506160037 metadata/md5-cache/dev-java/xjavadoc-1.1-r2
-1506160037 metadata/md5-cache/dev-java/jline-1.0
-1506160037 metadata/md5-cache/dev-java/jtreemap-1.1.0
-1506160036 metadata/md5-cache/dev-java/ant-javamail-1.9.1
-1506160037 metadata/md5-cache/dev-java/javassist-2.6-r1
+1506171306 metadata/md5-cache/dev-java/ant-core-1.8.0-r1
+1506171307 metadata/md5-cache/dev-java/servletapi-2.3-r3
+1506171306 metadata/md5-cache/dev-java/commons-lang-2.0-r2
+1506171307 metadata/md5-cache/dev-java/jcommon-1.0.18
+1506171307 metadata/md5-cache/dev-java/jortho-1.0
+1506171307 metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+1506171307 metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
+1506171306 metadata/md5-cache/dev-java/bctsp-1.45-r1
+1506171306 metadata/md5-cache/dev-java/ant-jdepend-1.8.4
+1506171307 metadata/md5-cache/dev-java/jdbm-0.12-r2
+1506171307 metadata/md5-cache/dev-java/rxtx-2.1.7.2-r3
+1506171307 metadata/md5-cache/dev-java/xjavadoc-1.1-r2
+1506171307 metadata/md5-cache/dev-java/jline-1.0
+1506171307 metadata/md5-cache/dev-java/jtreemap-1.1.0
+1506171306 metadata/md5-cache/dev-java/ant-javamail-1.9.1
+1506171306 metadata/md5-cache/dev-java/javassist-2.6-r1
 1505281110 metadata/md5-cache/dev-java/ant-1.9.1
-1506160037 metadata/md5-cache/dev-java/ical4j-1.0_beta2
-1506160036 metadata/md5-cache/dev-java/fec-1.0.4-r1
-1506160037 metadata/md5-cache/dev-java/miglayout-4.0
-1506160036 metadata/md5-cache/dev-java/commons-vfs-2.0-r1
-1506160037 metadata/md5-cache/dev-java/netbeans-nb-8.0.2
-1506160037 metadata/md5-cache/dev-java/javolution-4.0.2
-1506160036 metadata/md5-cache/dev-java/ant-swing-1.9.1
-1506160037 metadata/md5-cache/dev-java/maven-bin-2.0.11
-1506160037 metadata/md5-cache/dev-java/ognl-3.0.8
-1506160037 metadata/md5-cache/dev-java/swt-4.2-r2
-1506160037 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1
-1506160037 metadata/md5-cache/dev-java/stringtemplate-3.2
-1506160037 metadata/md5-cache/dev-java/xmlunit-1.4
-1506160036 metadata/md5-cache/dev-java/commons-lang-3.1
-1506160037 metadata/md5-cache/dev-java/jboss-modules-1.3.3
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.3.1
-1506160036 metadata/md5-cache/dev-java/flute-1.3-r1
-1506160037 metadata/md5-cache/dev-java/xz-java-1.5
-1506160037 metadata/md5-cache/dev-java/jtds-1.3.0
-1506160037 metadata/md5-cache/dev-java/icu4j-53.1
-1506160037 metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
-1506160037 metadata/md5-cache/dev-java/j2ssh-0.2.9
-1506160036 metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
-1506160037 metadata/md5-cache/dev-java/icu4j-4.4.1.1
-1506160037 metadata/md5-cache/dev-java/jlfgr-1.0-r1
-1506160036 metadata/md5-cache/dev-java/asm-5.0.3
+1506171306 metadata/md5-cache/dev-java/ical4j-1.0_beta2
+1506171306 metadata/md5-cache/dev-java/fec-1.0.4-r1
+1506171307 metadata/md5-cache/dev-java/miglayout-4.0
+1506171306 metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+1506171307 metadata/md5-cache/dev-java/netbeans-nb-8.0.2
+1506171306 metadata/md5-cache/dev-java/javolution-4.0.2
+1506171306 metadata/md5-cache/dev-java/ant-swing-1.9.1
+1506171307 metadata/md5-cache/dev-java/maven-bin-2.0.11
+1506171307 metadata/md5-cache/dev-java/ognl-3.0.8
+1506171307 metadata/md5-cache/dev-java/swt-4.2-r2
+1506171307 metadata/md5-cache/dev-java/jdbc-jaybird-2.1.5-r1
+1506171307 metadata/md5-cache/dev-java/stringtemplate-3.2
+1506171307 metadata/md5-cache/dev-java/xmlunit-1.4
+1506171306 metadata/md5-cache/dev-java/commons-lang-3.1
+1506171307 metadata/md5-cache/dev-java/jboss-modules-1.3.3
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.3.1
+1506171306 metadata/md5-cache/dev-java/flute-1.3-r1
+1506171307 metadata/md5-cache/dev-java/xz-java-1.5
+1506171307 metadata/md5-cache/dev-java/jtds-1.3.0
+1506171306 metadata/md5-cache/dev-java/icu4j-53.1
+1506171306 metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
+1506171306 metadata/md5-cache/dev-java/j2ssh-0.2.9
+1506171306 metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
+1506171306 metadata/md5-cache/dev-java/icu4j-4.4.1.1
+1506171307 metadata/md5-cache/dev-java/jlfgr-1.0-r1
+1506171306 metadata/md5-cache/dev-java/asm-5.0.3
 1211091737 metadata/md5-cache/dev-java/sun-jce-bin-1.6.0
-1506160036 metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4
-1506160037 metadata/md5-cache/dev-java/stax-ex-1.0-r1
-1506160036 metadata/md5-cache/dev-java/bcpg-1.50
-1506160036 metadata/md5-cache/dev-java/bcprov-1.45-r1
-1506160037 metadata/md5-cache/dev-java/trident-1.3
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.13
-1506160036 metadata/md5-cache/dev-java/commons-jelly-1.0-r6
-1506160037 metadata/md5-cache/dev-java/json-simple-1.1
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
-1506160037 metadata/md5-cache/dev-java/javassist-3.14.0-r1
-1506160037 metadata/md5-cache/dev-java/slf4j-simple-1.7.7
-1506160037 metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
-1506160037 metadata/md5-cache/dev-java/swt-3.7.2
-1506160037 metadata/md5-cache/dev-java/jfreesvg-3.0
-1506160037 metadata/md5-cache/dev-java/java-getopt-1.0.14
-1506160037 metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2
-1506160036 metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4
-1506160037 metadata/md5-cache/dev-java/mx4j-core-3.0.2
-1506160036 metadata/md5-cache/dev-java/commons-net-1.4.1-r1
-1506160036 metadata/md5-cache/dev-java/asm-4.0
-1506161036 metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
-1506160036 metadata/md5-cache/dev-java/fastinfoset-1.2.11
-1506160037 metadata/md5-cache/dev-java/gnu-hylafax-1.0.3
-1506160036 metadata/md5-cache/dev-java/commons-betwixt-0.8
-1506160036 metadata/md5-cache/dev-java/asm-1.5.3
+1506171306 metadata/md5-cache/dev-java/ant-apache-regexp-1.8.4
+1506171307 metadata/md5-cache/dev-java/stax-ex-1.0-r1
+1506171306 metadata/md5-cache/dev-java/bcpg-1.50
+1506171306 metadata/md5-cache/dev-java/bcprov-1.45-r1
+1506171307 metadata/md5-cache/dev-java/trident-1.3
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.13
+1506171306 metadata/md5-cache/dev-java/commons-jelly-1.0-r6
+1506171307 metadata/md5-cache/dev-java/json-simple-1.1
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
+1506171306 metadata/md5-cache/dev-java/javassist-3.14.0-r1
+1506171307 metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+1506171307 metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+1506171307 metadata/md5-cache/dev-java/swt-3.7.2
+1506171307 metadata/md5-cache/dev-java/jfreesvg-3.0
+1506171306 metadata/md5-cache/dev-java/java-getopt-1.0.14
+1506171307 metadata/md5-cache/dev-java/mx4j-tools-3.0.1-r2
+1506171306 metadata/md5-cache/dev-java/ant-apache-log4j-1.8.4
+1506171307 metadata/md5-cache/dev-java/mx4j-core-3.0.2
+1506171306 metadata/md5-cache/dev-java/commons-net-1.4.1-r1
+1506171306 metadata/md5-cache/dev-java/asm-4.0
+1506171307 metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
+1506171306 metadata/md5-cache/dev-java/fastinfoset-1.2.11
+1506171306 metadata/md5-cache/dev-java/gnu-hylafax-1.0.3
+1506171306 metadata/md5-cache/dev-java/commons-betwixt-0.8
+1506171306 metadata/md5-cache/dev-java/asm-1.5.3
 1505281110 metadata/md5-cache/dev-java/ibm-jdk-bin-1.6.0.9_p2-r1
-1506160037 metadata/md5-cache/dev-java/piccolo-1.04
-1506160037 metadata/md5-cache/dev-java/javassist-3.4-r1
-1506160037 metadata/md5-cache/dev-java/jackson-1.9.13
-1506160037 metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
-1506160037 metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
-1506160037 metadata/md5-cache/dev-java/icu4j-54.1.1
-1506160036 metadata/md5-cache/dev-java/bcprov-1.48-r1
-1506160037 metadata/md5-cache/dev-java/jnr-posix-2.5.2
-1506160037 metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
-1506160037 metadata/md5-cache/dev-java/jboss-logging-3.1.4
-1506160037 metadata/md5-cache/dev-java/hamcrest-core-1.1
-1506160037 metadata/md5-cache/dev-java/mx4j-tools-3.0.2
-1506160037 metadata/md5-cache/dev-java/freemarker-2.3.13-r1
-1506160036 metadata/md5-cache/dev-java/antlr-2.7.7-r5
+1506171307 metadata/md5-cache/dev-java/piccolo-1.04
+1506171306 metadata/md5-cache/dev-java/javassist-3.4-r1
+1506171306 metadata/md5-cache/dev-java/jackson-1.9.13
+1506171307 metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
+1506171307 metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
+1506171306 metadata/md5-cache/dev-java/icu4j-54.1.1
+1506171306 metadata/md5-cache/dev-java/bcprov-1.48-r1
+1506171307 metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+1506171307 metadata/md5-cache/dev-java/jboss-logging-3.1.4
+1506171306 metadata/md5-cache/dev-java/hamcrest-core-1.1
+1506171307 metadata/md5-cache/dev-java/mx4j-tools-3.0.2
+1506171306 metadata/md5-cache/dev-java/freemarker-2.3.13-r1
+1506171306 metadata/md5-cache/dev-java/antlr-2.7.7-r5
 1503271336 metadata/md5-cache/dev-java/jad-bin-1.5.8e-r1
-1506160037 metadata/md5-cache/dev-java/icu4j-4.0.1.1
+1506171306 metadata/md5-cache/dev-java/icu4j-4.0.1.1
 1505281110 metadata/md5-cache/dev-java/icedtea-bin-6.1.13.5
-1506160037 metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
-1506160037 metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
-1506160036 metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2
-1506160036 metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
-1506160036 metadata/md5-cache/dev-java/commons-httpclient-3.1
-1506160036 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
-1506160037 metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
-1506160037 metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201
-1506160037 metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
-1506160037 metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
-1506160037 metadata/md5-cache/dev-java/osgi-obr-1.0.2
-1506160037 metadata/md5-cache/dev-java/lucene-2.2.0
+1506171307 metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+1506171306 metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+1506171306 metadata/md5-cache/dev-java/ant-apache-log4j-1.8.2
+1506171306 metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+1506171306 metadata/md5-cache/dev-java/commons-httpclient-3.1
+1506171306 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
+1506171307 metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
+1506171307 metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1201
+1506171307 metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
+1506171307 metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
+1506171307 metadata/md5-cache/dev-java/osgi-obr-1.0.2
+1506171307 metadata/md5-cache/dev-java/lucene-2.2.0
 1505281111 metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.80
-1506160036 metadata/md5-cache/dev-java/freehep-record-2.0
-1506160037 metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
-1506160037 metadata/md5-cache/dev-java/jflex-1.4.3-r1
-1506160036 metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
-1506160036 metadata/md5-cache/dev-java/balloontip-1.2.1
-1506160037 metadata/md5-cache/dev-java/jlayer-1.0.1
-1506160037 metadata/md5-cache/dev-java/xmldb-20011111-r1
-1506160036 metadata/md5-cache/dev-java/db4o-jdk11-7.4
-1506160036 metadata/md5-cache/dev-java/codemodel-2.6
-1506160037 metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
-1506160036 metadata/md5-cache/dev-java/commons-collections-3.2.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4
-1506160036 metadata/md5-cache/dev-java/commons-digester-2.1
-1506160037 metadata/md5-cache/dev-java/hamcrest-core-1.2
-1506160037 metadata/md5-cache/dev-java/testng-6.8-r2
-1506160037 metadata/md5-cache/dev-java/jnr-posix-2.4.0
-1506160037 metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
-1506160036 metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
-1506160037 metadata/md5-cache/dev-java/jcommander-1.32
-1506160037 metadata/md5-cache/dev-java/jnr-posix-2.0.0
-1506160036 metadata/md5-cache/dev-java/bsf-2.4.0-r1
-1506160036 metadata/md5-cache/dev-java/easyneurons-2.3
-1506160037 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
-1506160036 metadata/md5-cache/dev-java/commons-dbutils-1.1
-1506160036 metadata/md5-cache/dev-java/ehcache-1.2.4-r2
-1506160036 metadata/md5-cache/dev-java/ant-commons-logging-1.9.1
-1506160037 metadata/md5-cache/dev-java/javassist-3.7
-1506160037 metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
-1506160037 metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
-1506160036 metadata/md5-cache/dev-java/bnd-junit-2.1.0
-1506160036 metadata/md5-cache/dev-java/cocoon-2.1.11
-1506160036 metadata/md5-cache/dev-java/commons-compress-1.4.1
-1506160037 metadata/md5-cache/dev-java/tablelayout-20090826
-1506160037 metadata/md5-cache/dev-java/jsoup-1.7.2
-1506160037 metadata/md5-cache/dev-java/relaxngcc-1.12-r1
-1506160036 metadata/md5-cache/dev-java/codemodel-2.1
-1506160037 metadata/md5-cache/dev-java/icedtea-7.2.5.5
-1506170036 metadata/md5-cache/dev-java/msv-20130601
-1506160037 metadata/md5-cache/dev-java/jfreechart-1.0.14
-1506160037 metadata/md5-cache/dev-java/jsch-0.1.49
-1506160037 metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
-1506160036 metadata/md5-cache/dev-java/ant-trax-1.8.2
-1506160037 metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
-1506160036 metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4
-1506160037 metadata/md5-cache/dev-java/janino-2.7.0
-1506160037 metadata/md5-cache/dev-java/slf4j-ext-1.7.5
-1506160037 metadata/md5-cache/dev-java/xsdlib-20090415
-1506160037 metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
-1506160037 metadata/md5-cache/dev-java/jffi-1.2.8
-1506160037 metadata/md5-cache/dev-java/jinklevel-0.1
-1506160036 metadata/md5-cache/dev-java/commons-pool-2.2
-1506160037 metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
-1506160037 metadata/md5-cache/dev-java/jdom-1.0_beta9-r4
-1506161436 metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3
-1506160036 metadata/md5-cache/dev-java/cofoja-1.1_p150
-1506160037 metadata/md5-cache/dev-java/jcommon-1.0.16
+1506171306 metadata/md5-cache/dev-java/freehep-record-2.0
+1506171307 metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
+1506171307 metadata/md5-cache/dev-java/jflex-1.4.3-r1
+1506171306 metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
+1506171306 metadata/md5-cache/dev-java/balloontip-1.2.1
+1506171307 metadata/md5-cache/dev-java/jlayer-1.0.1
+1506171307 metadata/md5-cache/dev-java/xmldb-20011111-r1
+1506171306 metadata/md5-cache/dev-java/db4o-jdk11-7.4
+1506171306 metadata/md5-cache/dev-java/codemodel-2.6
+1506171307 metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
+1506171306 metadata/md5-cache/dev-java/commons-collections-3.2.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-bcel-1.8.4
+1506171306 metadata/md5-cache/dev-java/commons-digester-2.1
+1506171306 metadata/md5-cache/dev-java/hamcrest-core-1.2
+1506171307 metadata/md5-cache/dev-java/testng-6.8-r2
+1506172036 metadata/md5-cache/dev-java/jnr-posix-2.4.0
+1506171306 metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
+1506171306 metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+1506171307 metadata/md5-cache/dev-java/jcommander-1.32
+1506171306 metadata/md5-cache/dev-java/bsf-2.4.0-r1
+1506171306 metadata/md5-cache/dev-java/easyneurons-2.3
+1506171306 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
+1506171306 metadata/md5-cache/dev-java/commons-dbutils-1.1
+1506171306 metadata/md5-cache/dev-java/ehcache-1.2.4-r2
+1506171306 metadata/md5-cache/dev-java/ant-commons-logging-1.9.1
+1506171306 metadata/md5-cache/dev-java/javassist-3.7
+1506171307 metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
+1506171306 metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
+1506171306 metadata/md5-cache/dev-java/bnd-junit-2.1.0
+1506171306 metadata/md5-cache/dev-java/cocoon-2.1.11
+1506171306 metadata/md5-cache/dev-java/commons-compress-1.4.1
+1506171307 metadata/md5-cache/dev-java/tablelayout-20090826
+1506171307 metadata/md5-cache/dev-java/jsoup-1.7.2
+1506171307 metadata/md5-cache/dev-java/relaxngcc-1.12-r1
+1506171306 metadata/md5-cache/dev-java/codemodel-2.1
+1506171306 metadata/md5-cache/dev-java/icedtea-7.2.5.5
+1506171307 metadata/md5-cache/dev-java/msv-20130601
+1506171307 metadata/md5-cache/dev-java/jfreechart-1.0.14
+1506171307 metadata/md5-cache/dev-java/jsch-0.1.49
+1506171306 metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
+1506171306 metadata/md5-cache/dev-java/ant-trax-1.8.2
+1506171307 metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
+1506171306 metadata/md5-cache/dev-java/ant-apache-bsf-1.8.4
+1506171306 metadata/md5-cache/dev-java/janino-2.7.0
+1506171307 metadata/md5-cache/dev-java/slf4j-ext-1.7.5
+1506171307 metadata/md5-cache/dev-java/xsdlib-20090415
+1506171307 metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+1506171307 metadata/md5-cache/dev-java/jffi-1.2.8
+1506171307 metadata/md5-cache/dev-java/jinklevel-0.1
+1506171306 metadata/md5-cache/dev-java/commons-pool-2.2
+1506171307 metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+1506171307 metadata/md5-cache/dev-java/jdom-1.0_beta9-r4
+1506171307 metadata/md5-cache/dev-java/netbeans-java-8.0.2-r3
+1506171306 metadata/md5-cache/dev-java/cofoja-1.1_p150
+1506171307 metadata/md5-cache/dev-java/jcommon-1.0.16
 1211091736 metadata/md5-cache/dev-java/java-config-wrapper-0.16
-1506160037 metadata/md5-cache/dev-java/tagsoup-1.2.1
-1506160037 metadata/md5-cache/dev-java/junit-addons-1.4
-1506160037 metadata/md5-cache/dev-java/tijmp-0.8
-1506160036 metadata/md5-cache/dev-java/ant-jdepend-1.9.2
-1506160037 metadata/md5-cache/dev-java/lucene-3.5.0
-1506160036 metadata/md5-cache/dev-java/ant-nodeps-1.8.4
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-4.0.25
-1506160037 metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
-1506160037 metadata/md5-cache/dev-java/icedtea-7.2.4.8
-1506160036 metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1
-1506160037 metadata/md5-cache/dev-java/jformatstring-2.0.3
-1506160036 metadata/md5-cache/dev-java/disruptor-3.2.0
-1506160037 metadata/md5-cache/dev-java/swing-worker-1.1
-1506160037 metadata/md5-cache/dev-java/istack-commons-buildtools-2.22
-1506160036 metadata/md5-cache/dev-java/bcmail-1.38-r3
-1506160037 metadata/md5-cache/dev-java/zeus-jscl-1.64
-1506160036 metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
-1506160037 metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
-1506160037 metadata/md5-cache/dev-java/jnr-netdb-1.1.1
+1506171307 metadata/md5-cache/dev-java/tagsoup-1.2.1
+1506171307 metadata/md5-cache/dev-java/junit-addons-1.4
+1506171307 metadata/md5-cache/dev-java/tijmp-0.8
+1506171306 metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+1506171307 metadata/md5-cache/dev-java/lucene-3.5.0
+1506171306 metadata/md5-cache/dev-java/ant-nodeps-1.8.4
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-4.0.25
+1506171307 metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
+1506171306 metadata/md5-cache/dev-java/icedtea-7.2.4.8
+1506171306 metadata/md5-cache/dev-java/ant-apache-bcel-1.9.1
+1506171307 metadata/md5-cache/dev-java/jformatstring-2.0.3
+1506171306 metadata/md5-cache/dev-java/disruptor-3.2.0
+1506171307 metadata/md5-cache/dev-java/swing-worker-1.1
+1506171306 metadata/md5-cache/dev-java/istack-commons-buildtools-2.22
+1506171306 metadata/md5-cache/dev-java/bcmail-1.38-r3
+1506171307 metadata/md5-cache/dev-java/zeus-jscl-1.64
+1506171306 metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2
+1506171306 metadata/md5-cache/dev-java/gnu-classpath-0.98-r3
 1505281110 metadata/md5-cache/dev-java/apple-jdk-bin-1.6.0
-1506160036 metadata/md5-cache/dev-java/aspectwerkz-2.0-r1
-1506160036 metadata/md5-cache/dev-java/ant-testutil-1.9.1
-1506160037 metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
-1506160036 metadata/md5-cache/dev-java/db4o-jdk12-7.4
-1506160036 metadata/md5-cache/dev-java/flute-1.3-r2
-1506160036 metadata/md5-cache/dev-java/commons-discovery-0.4
-1506160037 metadata/md5-cache/dev-java/jigsaw-2.2.6
-1506160037 metadata/md5-cache/dev-java/jnr-unixsocket-0.6
-1506160036 metadata/md5-cache/dev-java/constantine-0.7
-1506160037 metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
-1506160037 metadata/md5-cache/dev-java/saxpath-1.0-r2
-1506160036 metadata/md5-cache/dev-java/eclipse-ecj-3.7.1
-1506160037 metadata/md5-cache/dev-java/jcalendar-1.3.3
-1506160036 metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2
-1506160037 metadata/md5-cache/dev-java/jaxb-tools-2.1.2
-1506160037 metadata/md5-cache/dev-java/junit-4.11
-1506160036 metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
-1506160037 metadata/md5-cache/dev-java/wsdl4j-1.6.2
-1506160037 metadata/md5-cache/dev-java/resin-servlet-api-3.1.10
-1506160037 metadata/md5-cache/dev-java/jfreechart-1.0.19
+1506171306 metadata/md5-cache/dev-java/aspectwerkz-2.0-r1
+1506171306 metadata/md5-cache/dev-java/ant-testutil-1.9.1
+1506171307 metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
+1506171306 metadata/md5-cache/dev-java/db4o-jdk12-7.4
+1506171306 metadata/md5-cache/dev-java/flute-1.3-r2
+1506171306 metadata/md5-cache/dev-java/commons-discovery-0.4
+1506171307 metadata/md5-cache/dev-java/jigsaw-2.2.6
+1506172036 metadata/md5-cache/dev-java/jnr-unixsocket-0.6
+1506171306 metadata/md5-cache/dev-java/constantine-0.7
+1506171307 metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
+1506171307 metadata/md5-cache/dev-java/saxpath-1.0-r2
+1506171306 metadata/md5-cache/dev-java/eclipse-ecj-3.7.1
+1506171307 metadata/md5-cache/dev-java/jcalendar-1.3.3
+1506171306 metadata/md5-cache/dev-java/ant-apache-regexp-1.8.2
+1506171306 metadata/md5-cache/dev-java/jaxb-tools-2.1.2
+1506171307 metadata/md5-cache/dev-java/junit-4.11
+1506171306 metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
+1506171307 metadata/md5-cache/dev-java/wsdl4j-1.6.2
+1506171307 metadata/md5-cache/dev-java/resin-servlet-api-3.1.10
+1506171307 metadata/md5-cache/dev-java/jfreechart-1.0.19
 1505281111 metadata/md5-cache/dev-java/java-sdk-docs-1.7.0.80
-1506160037 metadata/md5-cache/dev-java/sablecc-3.2
-1506160036 metadata/md5-cache/dev-java/freehep-export-2.1.1
-1506160037 metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
-1506160036 metadata/md5-cache/dev-java/asm-1.5.3-r1
-1506160036 metadata/md5-cache/dev-java/ant-commons-logging-1.8.4
-1506160037 metadata/md5-cache/dev-java/java-service-wrapper-3.2.3
-1506160037 metadata/md5-cache/dev-java/openspml-0.5-r1
-1506160036 metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2
-1506160037 metadata/md5-cache/dev-java/spymemcached-2.9.1
-1506160036 metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
-1506160037 metadata/md5-cache/dev-java/yanfs-1.0
-1506160037 metadata/md5-cache/dev-java/javassist-3.14.0
-1506160036 metadata/md5-cache/dev-java/base64-2.3.7
-1506160036 metadata/md5-cache/dev-java/ant-antlr-1.8.2
-1506160037 metadata/md5-cache/dev-java/jython-2.2.1-r2
-1506160036 metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
-1506160037 metadata/md5-cache/dev-java/milton-api-2.5.1.5
-1506160037 metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
-1506160037 metadata/md5-cache/dev-java/jffi-1.0.0-r1
-1506160037 metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
-1506160037 metadata/md5-cache/dev-java/gson-2.3.1
-1506160037 metadata/md5-cache/dev-java/jmi-interface-1.0-r3
+1506171307 metadata/md5-cache/dev-java/sablecc-3.2
+1506171306 metadata/md5-cache/dev-java/freehep-export-2.1.1
+1506171306 metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
+1506171306 metadata/md5-cache/dev-java/asm-1.5.3-r1
+1506171306 metadata/md5-cache/dev-java/ant-commons-logging-1.8.4
+1506171306 metadata/md5-cache/dev-java/java-service-wrapper-3.2.3
+1506171307 metadata/md5-cache/dev-java/openspml-0.5-r1
+1506171306 metadata/md5-cache/dev-java/fastinfoset-1.2.1-r2
+1506171307 metadata/md5-cache/dev-java/spymemcached-2.9.1
+1506171306 metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
+1506171307 metadata/md5-cache/dev-java/yanfs-1.0
+1506171306 metadata/md5-cache/dev-java/javassist-3.14.0
+1506171306 metadata/md5-cache/dev-java/base64-2.3.7
+1506171306 metadata/md5-cache/dev-java/ant-antlr-1.8.2
+1506171307 metadata/md5-cache/dev-java/jython-2.2.1-r2
+1506171306 metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
+1506171307 metadata/md5-cache/dev-java/milton-api-2.5.1.5
+1506171307 metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+1506171307 metadata/md5-cache/dev-java/jffi-1.0.0-r1
+1506171307 metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
+1506171306 metadata/md5-cache/dev-java/gson-2.3.1
+1506171307 metadata/md5-cache/dev-java/jmi-interface-1.0-r3
 1503312206 metadata/md5-cache/dev-java/maven-bin-1.1-r3
-1506160036 metadata/md5-cache/dev-java/bcmail-1.45-r2
-1506160037 metadata/md5-cache/dev-java/jal-20031117-r3
-1506160036 metadata/md5-cache/dev-java/dbunit-2.4.1
-1506160036 metadata/md5-cache/dev-java/aopalliance-1.0-r2
-1506160036 metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1
-1506160037 metadata/md5-cache/dev-java/jsr93-1.0
-1506160037 metadata/md5-cache/dev-java/lucene-3.0.0
-1506160037 metadata/md5-cache/dev-java/lucene-2.3.0
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-0.7.11
-1506160037 metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
-1506160037 metadata/md5-cache/dev-java/jfreechart-1.0.13
-1506160037 metadata/md5-cache/dev-java/netty-buffer-4.0.21
-1506160036 metadata/md5-cache/dev-java/ant-nodeps-1.9.1
-1506160036 metadata/md5-cache/dev-java/commons-math-2.1-r1
-1506160037 metadata/md5-cache/dev-java/headius-options-1.1
-1506160037 metadata/md5-cache/dev-java/ognl-2.6.9-r2
-1506160037 metadata/md5-cache/dev-java/jnr-x86asm-1.0.2
-1506160037 metadata/md5-cache/dev-java/jackson-2.5.1
-1506160037 metadata/md5-cache/dev-java/jnr-ffi-1.0.6
-1506160037 metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
-1506160036 metadata/md5-cache/dev-java/commons-jexl-1.1
-1506160037 metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
-1506160037 metadata/md5-cache/dev-java/jspeex-0.9.7-r1
-1506160036 metadata/md5-cache/dev-java/cldc-api-1.1
-1506160037 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
-1506160037 metadata/md5-cache/dev-java/java-getopt-1.0.13
-1506160037 metadata/md5-cache/dev-java/guava-16.0.1
-1506160037 metadata/md5-cache/dev-java/htmlparser-1.4-r1
-1506160037 metadata/md5-cache/dev-java/junit-4.8.2-r1
-1506160036 metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
-1506160037 metadata/md5-cache/dev-java/javacc-5.0
-1506160036 metadata/md5-cache/dev-java/asm-2.0-r1
-1506160036 metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
-1506160037 metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
-1506160036 metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
-1506160037 metadata/md5-cache/dev-java/jsr181-1.0-r1
-1506160037 metadata/md5-cache/dev-java/jusb-0.4.4-r1
-1506160037 metadata/md5-cache/dev-java/xml-commons-external-1.4.01
-1506160037 metadata/md5-cache/dev-java/jflex-1.4.3-r2
-1506160037 metadata/md5-cache/dev-java/jcodings-1.0.4
-1506160036 metadata/md5-cache/dev-java/ant-javamail-1.8.2
-1506160037 metadata/md5-cache/dev-java/jamon-1.01-r3
-1506160036 metadata/md5-cache/dev-java/ant-junit-1.8.2
-1506160037 metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1
-1506160037 metadata/md5-cache/dev-java/spring-core-3.2.4
-1506160037 metadata/md5-cache/dev-java/jmock-2.5.1
-1506160037 metadata/md5-cache/dev-java/jid3-0.46-r1
-1506160037 metadata/md5-cache/dev-java/jss-4.3-r1
-1506160037 metadata/md5-cache/dev-java/lucene-2.3.2-r1
-1506160036 metadata/md5-cache/dev-java/ant-jai-1.9.2
-1506160037 metadata/md5-cache/dev-java/slf4j-nop-1.7.5
-1506160037 metadata/md5-cache/dev-java/jmdns-3.4.1
-1506160036 metadata/md5-cache/dev-java/bcprov-1.45
-1506160037 metadata/md5-cache/dev-java/java-gnome-4.1.3
-1506160036 metadata/md5-cache/dev-java/commons-fileupload-1.3
-1506160036 metadata/md5-cache/dev-java/cdi-api-1.2
-1506160037 metadata/md5-cache/dev-java/jax-ws-api-2.0
+1506171306 metadata/md5-cache/dev-java/bcmail-1.45-r2
+1506171306 metadata/md5-cache/dev-java/jal-20031117-r3
+1506171306 metadata/md5-cache/dev-java/dbunit-2.4.1
+1506171306 metadata/md5-cache/dev-java/aopalliance-1.0-r2
+1506171306 metadata/md5-cache/dev-java/eclipse-ecj-3.7.2-r1
+1506171307 metadata/md5-cache/dev-java/jsr93-1.0
+1506171307 metadata/md5-cache/dev-java/lucene-3.0.0
+1506171307 metadata/md5-cache/dev-java/lucene-2.3.0
+1506171307 metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
+1506171307 metadata/md5-cache/dev-java/jfreechart-1.0.13
+1506171307 metadata/md5-cache/dev-java/netty-buffer-4.0.21
+1506171306 metadata/md5-cache/dev-java/ant-nodeps-1.9.1
+1506171306 metadata/md5-cache/dev-java/commons-math-2.1-r1
+1506171306 metadata/md5-cache/dev-java/headius-options-1.1
+1506171307 metadata/md5-cache/dev-java/ognl-2.6.9-r2
+1506171307 metadata/md5-cache/dev-java/jnr-x86asm-1.0.2
+1506171306 metadata/md5-cache/dev-java/jackson-2.5.1
+1506171306 metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
+1506171306 metadata/md5-cache/dev-java/commons-jexl-1.1
+1506171307 metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
+1506171307 metadata/md5-cache/dev-java/jspeex-0.9.7-r1
+1506171306 metadata/md5-cache/dev-java/cldc-api-1.1
+1506171306 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
+1506171306 metadata/md5-cache/dev-java/java-getopt-1.0.13
+1506171306 metadata/md5-cache/dev-java/guava-16.0.1
+1506171306 metadata/md5-cache/dev-java/htmlparser-1.4-r1
+1506171307 metadata/md5-cache/dev-java/junit-4.8.2-r1
+1506171306 metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
+1506171306 metadata/md5-cache/dev-java/javacc-5.0
+1506171306 metadata/md5-cache/dev-java/asm-2.0-r1
+1506171306 metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
+1506171307 metadata/md5-cache/dev-java/jjtraveler-0.4.3-r2
+1506171306 metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
+1506171307 metadata/md5-cache/dev-java/jsr181-1.0-r1
+1506171307 metadata/md5-cache/dev-java/jusb-0.4.4-r1
+1506171307 metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+1506171307 metadata/md5-cache/dev-java/jflex-1.4.3-r2
+1506171307 metadata/md5-cache/dev-java/jcodings-1.0.4
+1506171306 metadata/md5-cache/dev-java/ant-javamail-1.8.2
+1506171306 metadata/md5-cache/dev-java/jamon-1.01-r3
+1506171306 metadata/md5-cache/dev-java/ant-junit-1.8.2
+1506172036 metadata/md5-cache/dev-java/jnr-posix-3.0.1-r1
+1506171307 metadata/md5-cache/dev-java/spring-core-3.2.4
+1506171307 metadata/md5-cache/dev-java/jmock-2.5.1
+1506171307 metadata/md5-cache/dev-java/jid3-0.46-r1
+1506171307 metadata/md5-cache/dev-java/jss-4.3-r1
+1506171307 metadata/md5-cache/dev-java/lucene-2.3.2-r1
+1506171306 metadata/md5-cache/dev-java/ant-jai-1.9.2
+1506171307 metadata/md5-cache/dev-java/slf4j-nop-1.7.5
+1506171307 metadata/md5-cache/dev-java/jmdns-3.4.1
+1506171306 metadata/md5-cache/dev-java/bcprov-1.45
+1506171306 metadata/md5-cache/dev-java/java-gnome-4.1.3
+1506171306 metadata/md5-cache/dev-java/commons-fileupload-1.3
+1506171306 metadata/md5-cache/dev-java/cdi-api-1.2
+1506171306 metadata/md5-cache/dev-java/jax-ws-api-2.0
 1505281110 metadata/md5-cache/dev-java/ant-1.8.2
-1506160037 metadata/md5-cache/dev-java/joda-convert-1.3.1
-1506160037 metadata/md5-cache/dev-java/jdom-1.0_beta9-r2
-1506160037 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
-1506160036 metadata/md5-cache/dev-java/cacao-0.99.4
+1506171307 metadata/md5-cache/dev-java/joda-convert-1.3.1
+1506171307 metadata/md5-cache/dev-java/jdom-1.0_beta9-r2
+1506171307 metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+1506171306 metadata/md5-cache/dev-java/cacao-0.99.4
 1505281111 metadata/md5-cache/dev-java/java-sdk-docs-1.8.0.45
-1506160036 metadata/md5-cache/dev-java/asm-1.4.3-r4
-1506160037 metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
-1506160037 metadata/md5-cache/dev-java/sjsxp-1.0.1
-1506160036 metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
-1506160037 metadata/md5-cache/dev-java/swt-3.6.1
-1506160037 metadata/md5-cache/dev-java/jta-1.0.1-r1
-1506160037 metadata/md5-cache/dev-java/xerial-core-2.0.1
-1506160036 metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
-1506160037 metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
-1506160037 metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1
-1506160037 metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
-1506160037 metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1
+1506171306 metadata/md5-cache/dev-java/asm-1.4.3-r4
+1506171307 metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
+1506171307 metadata/md5-cache/dev-java/sjsxp-1.0.1
+1506171306 metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+1506171307 metadata/md5-cache/dev-java/swt-3.6.1
+1506171307 metadata/md5-cache/dev-java/jta-1.0.1-r1
+1506171307 metadata/md5-cache/dev-java/xerial-core-2.0.1
+1506171306 metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
+1506171307 metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
+1506171307 metadata/md5-cache/dev-java/mockmaker-1.12.0_p20050104-r1
+1506171307 metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
+1506171306 metadata/md5-cache/dev-java/istack-commons-runtime-20090620-r1
 1505281128 metadata/md5-cache/sys-process/pidof-bsd-20050501-r4
 1506021107 metadata/md5-cache/sys-process/incron-0.5.10-r1
 1506030739 metadata/md5-cache/sys-process/unixtop-3.8_beta1-r1
@@ -44631,7 +44587,9 @@
 1505281128 metadata/md5-cache/www-client/surfraw-2.2.9-r1
 1505281128 metadata/md5-cache/www-client/conkeror-1.0_pre20141005
 1505281128 metadata/md5-cache/www-client/uget-1.8.0
+1506180806 metadata/md5-cache/www-client/opera-beta-31.0.1889.16
 1505281128 metadata/md5-cache/www-client/httrack-3.48.13
+1506172207 metadata/md5-cache/www-client/chromium-45.0.2431.0
 1505281128 metadata/md5-cache/www-client/lynx-2.8.9_pre4
 1506090536 metadata/md5-cache/www-client/chromium-44.0.2403.30
 1506091806 metadata/md5-cache/www-client/epiphany-3.16.1
@@ -44650,7 +44608,6 @@
 1506160737 metadata/md5-cache/www-client/vivaldi-1.0.201.2_p1
 1506161036 metadata/md5-cache/www-client/seamonkey-2.33.1-r1
 1506030739 metadata/md5-cache/www-client/netrik-1.16.1-r1
-1506090006 metadata/md5-cache/www-client/chromium-45.0.2421.0
 1505281128 metadata/md5-cache/www-client/pybugz-0.11.1
 1505281128 metadata/md5-cache/www-client/dwb-2013.03.30
 1506130606 metadata/md5-cache/www-client/google-chrome-43.0.2357.125_p1
@@ -44961,12 +44918,12 @@
 1505281109 metadata/md5-cache/dev-dotnet/nini-1.1.0-r2
 1506030736 metadata/md5-cache/dev-dotnet/art-sharp-2.24.2
 1505281109 metadata/md5-cache/dev-dotnet/flickrnet-bin-2.2-r1
-1506160036 metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
+1506171306 metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
 1506030736 metadata/md5-cache/dev-dotnet/atk-sharp-2.12.10
 1505281109 metadata/md5-cache/dev-dotnet/ikvm-bin-7.1.4532.2
 1505281109 metadata/md5-cache/dev-dotnet/gudev-sharp-0.1
 1505281109 metadata/md5-cache/dev-dotnet/log4net-1.2.11
-1506160036 metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
+1506171306 metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
 1506030736 metadata/md5-cache/dev-dotnet/gconf-sharp-2.24.2
 1505281109 metadata/md5-cache/dev-dotnet/taglib-sharp-2.1.0.0
 1505281109 metadata/md5-cache/dev-dotnet/mono-addins-0.6.2
@@ -45006,7 +44963,7 @@
 1506030736 metadata/md5-cache/dev-dotnet/vte-sharp-2.24.0-r10
 1506071606 metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0
 1506030736 metadata/md5-cache/dev-dotnet/gnome-sharp-2.24.2
-1506160036 metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
+1506171306 metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
 1506030736 metadata/md5-cache/dev-dotnet/glib-sharp-2.12.10
 1506071608 metadata/md5-cache/x11-libs/libva-9999
 1506162107 metadata/md5-cache/x11-libs/qwt-6.1.2
@@ -45631,7 +45588,7 @@
 1211091751 metadata/md5-cache/sys-block/tw_cli-9.3.0.3
 1505281127 metadata/md5-cache/sys-block/fio-2.1.9
 1505281108 metadata/md5-cache/app-misc/dvtm-0.8
-1506160036 metadata/md5-cache/app-misc/slashtime-0.5.13-r1
+1506171306 metadata/md5-cache/app-misc/slashtime-0.5.13-r1
 1505281108 metadata/md5-cache/app-misc/task-2.1.2
 1505281108 metadata/md5-cache/app-misc/datovka-3.0.3
 1506051806 metadata/md5-cache/app-misc/tmux-mem-cpu-load-2.2.1
@@ -45672,12 +45629,12 @@
 1505281108 metadata/md5-cache/app-misc/gcstar-1.7.0
 1506132236 metadata/md5-cache/app-misc/conmux-0.15.1-r3
 1506030736 metadata/md5-cache/app-misc/sphinx-2.0.10
-1506160036 metadata/md5-cache/app-misc/jitac-0.3.0
+1506171306 metadata/md5-cache/app-misc/jitac-0.3.0
 1505281108 metadata/md5-cache/app-misc/away-0.9.5-r1
 1505281108 metadata/md5-cache/app-misc/gcalcli-3.2
 1505281108 metadata/md5-cache/app-misc/ca-certificates-20120212
 1505281108 metadata/md5-cache/app-misc/binclock-1.5
-1506160036 metadata/md5-cache/app-misc/freemind-1.0.0-r1
+1506171306 metadata/md5-cache/app-misc/freemind-1.0.0-r1
 1505281108 metadata/md5-cache/app-misc/ddate-0.2.1
 1506071606 metadata/md5-cache/app-misc/evemu-2.0.0
 1211091734 metadata/md5-cache/app-misc/hello-2.8
@@ -45783,7 +45740,7 @@
 1505281108 metadata/md5-cache/app-misc/ktoblzcheck-1.45
 1505281108 metadata/md5-cache/app-misc/geoclue-2.2.0
 1505281108 metadata/md5-cache/app-misc/rioutil-1.5.0-r2
-1506160036 metadata/md5-cache/app-misc/jdictionary-1.8-r3
+1506171306 metadata/md5-cache/app-misc/jdictionary-1.8-r3
 1505281108 metadata/md5-cache/app-misc/ca-certificates-20090709
 1506132236 metadata/md5-cache/app-misc/beancounter-0.8.10-r1
 1505281108 metadata/md5-cache/app-misc/graphlcd-base-0.1.9
@@ -45840,7 +45797,7 @@
 1506021106 metadata/md5-cache/app-misc/usbirboy-0.2.1-r1
 1506132236 metadata/md5-cache/app-misc/smtm-1.6.10-r1
 1506092106 metadata/md5-cache/app-misc/golly-2.7
-1506160036 metadata/md5-cache/app-misc/freemind-1.0.1
+1506171306 metadata/md5-cache/app-misc/freemind-1.0.1
 1505281108 metadata/md5-cache/app-misc/beep-1.2.2-r1
 1505281108 metadata/md5-cache/app-misc/terminal-colors-2.1
 1506160036 metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -46011,7 +45968,7 @@
 1505281108 metadata/md5-cache/app-misc/fslurp-2.1.3
 1505281108 metadata/md5-cache/app-misc/ktoblzcheck-1.48
 1411041336 metadata/md5-cache/app-misc/scrub-2.6.1
-1506160036 metadata/md5-cache/app-misc/bfm-1.2-r2
+1506171306 metadata/md5-cache/app-misc/bfm-1.2-r2
 1505281108 metadata/md5-cache/app-misc/vifm-0.7.7
 1505281108 metadata/md5-cache/app-misc/leave-20100918
 1505281108 metadata/md5-cache/app-misc/pysmssend-1.48
@@ -46068,7 +46025,7 @@
 1505281108 metadata/md5-cache/app-misc/task-2.4.1
 1505281108 metadata/md5-cache/app-misc/getopt-1.1.4
 1505281108 metadata/md5-cache/app-misc/pdfpc-3.1.1
-1506160036 metadata/md5-cache/app-misc/freemind-0.9.0-r1
+1506171306 metadata/md5-cache/app-misc/freemind-0.9.0-r1
 1505281108 metadata/md5-cache/app-misc/emelfm2-0.8.2
 1505281108 metadata/md5-cache/app-misc/bottlerocket-0.04c-r1
 1505281108 metadata/md5-cache/app-misc/scope-0.04-r1
@@ -46101,11 +46058,12 @@
 1407111238 metadata/md5-cache/app-misc/dnetc-2.9103.509
 1505281108 metadata/md5-cache/app-misc/worker-2.19.6
 1505281108 metadata/md5-cache/app-misc/gourmet-0.17.2
-1506160036 metadata/md5-cache/app-misc/jdictionary-1.8-r2
+1506171306 metadata/md5-cache/app-misc/jdictionary-1.8-r2
 1505281108 metadata/md5-cache/app-misc/ondir-0.2.2-r1
 1408102236 metadata/md5-cache/app-misc/matew-1.9
 1505281108 metadata/md5-cache/app-misc/realpath-1.17
 1506111836 metadata/md5-cache/app-misc/task-2.3.0-r1
+1506180806 metadata/md5-cache/app-misc/dateutils-0.3.3
 1503082006 metadata/md5-cache/app-misc/dateutils-0.3.2
 1506071606 metadata/md5-cache/app-misc/muttprint-0.73
 1505281108 metadata/md5-cache/app-misc/regionset-0.1-r1
@@ -46116,7 +46074,7 @@
 1506162106 metadata/md5-cache/app-misc/subsurface-4.2
 1505281108 metadata/md5-cache/app-misc/color-1.2-r1
 1211091734 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11
-1506160036 metadata/md5-cache/app-misc/bfm-1.2-r1
+1506171306 metadata/md5-cache/app-misc/bfm-1.2-r1
 1505281108 metadata/md5-cache/app-misc/ca-certificates-20110502-r1
 1506021106 metadata/md5-cache/sys-auth/consolekit-0.9.2
 1505281127 metadata/md5-cache/sys-auth/pam_radius-1.3.17-r1
@@ -46215,7 +46173,6 @@
 1506030739 metadata/md5-cache/sys-auth/pam_ldap-184
 1505281127 metadata/md5-cache/sys-auth/polkit-qt-0.112.0-r1
 1403071836 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
-1505281126 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.5-r1
 1505281127 metadata/md5-cache/sys-auth/pam_usb-0.5.0
 1506071607 metadata/md5-cache/sys-auth/sssd-1.9.7
 1506071607 metadata/md5-cache/sys-auth/pam_dotfile-0.7-r2
@@ -46223,7 +46180,7 @@
 1505281127 metadata/md5-cache/sys-auth/pam_p11-0.1.5-r1
 1506030739 metadata/md5-cache/sys-auth/libnss-pgsql-1.4.0
 1505281127 metadata/md5-cache/sys-auth/pam_passwdqc-1.0.4
-1506152137 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
+1506180106 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
 1506162107 metadata/md5-cache/sys-auth/fingerprint-gui-1.05-r1
 1505281127 metadata/md5-cache/sys-auth/pam_ssh-1.98
 1505281126 metadata/md5-cache/sys-auth/pam-pgsql-0.7.3
@@ -46267,7 +46224,7 @@
 1506162106 metadata/md5-cache/app-benchmarks/i7z-0.27.2
 1505281106 metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.4
 1506030736 metadata/md5-cache/app-benchmarks/ltp-20130503
-1506160036 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
+1506171306 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
 1505281106 metadata/md5-cache/app-benchmarks/libc-bench-20110206
 1506030736 metadata/md5-cache/app-benchmarks/siege-3.0.6
 1505281106 metadata/md5-cache/app-benchmarks/bonnie++-1.96
@@ -46283,7 +46240,7 @@
 1506030736 metadata/md5-cache/app-benchmarks/sysbench-0.4.12-r1
 1505281106 metadata/md5-cache/app-benchmarks/bonnie-2.0.6
 1505281106 metadata/md5-cache/app-benchmarks/expedite-1.7.10
-1506160036 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
+1506171306 metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
 1505281106 metadata/md5-cache/app-benchmarks/contest-0.61
 1506030736 metadata/md5-cache/app-benchmarks/stress-1.0.0
 1505281106 metadata/md5-cache/app-benchmarks/pipebench-0.40-r1
@@ -46375,7 +46332,6 @@
 1506121936 metadata/md5-cache/dev-libs/openssl-1.0.2c
 1405171936 metadata/md5-cache/dev-libs/softhsm-1.3.6
 1506071606 metadata/md5-cache/dev-libs/libbrahe-1.1.0-r1
-1407291106 metadata/md5-cache/dev-libs/replicant-0.6.2
 1505281112 metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
 1408261336 metadata/md5-cache/dev-libs/replicant-0.6.4
 1505281112 metadata/md5-cache/dev-libs/pcc-libs-1.0.1_pre20121112
@@ -46413,8 +46369,6 @@
 1505281112 metadata/md5-cache/dev-libs/efl-1.8.6
 1505281112 metadata/md5-cache/dev-libs/isl-0.13
 1505281112 metadata/md5-cache/dev-libs/libevocosm-3.3.1-r1
-1506030737 metadata/md5-cache/dev-libs/hyperleveldb-1.2.1
-1408251036 metadata/md5-cache/dev-libs/replicant-0.6.3
 1505281112 metadata/md5-cache/dev-libs/klibc-2.0.3-r1
 1506030737 metadata/md5-cache/dev-libs/weston-1.6.1
 1506071336 metadata/md5-cache/dev-libs/gjs-1.42.0
@@ -46427,7 +46381,6 @@
 1506071606 metadata/md5-cache/dev-libs/blitz-0.10-r1
 1506071606 metadata/md5-cache/dev-libs/libbase58-0.1.1
 1506030737 metadata/md5-cache/dev-libs/yaz-3.0.53
-1505281306 metadata/md5-cache/dev-libs/replicant-0.7.0
 1505281112 metadata/md5-cache/dev-libs/elfutils-0.151
 1506071606 metadata/md5-cache/dev-libs/libksba-1.3.3
 1506091406 metadata/md5-cache/dev-libs/folks-0.11.1
@@ -46514,7 +46467,6 @@
 1506071606 metadata/md5-cache/dev-libs/protobuf-c-0.15
 1505281112 metadata/md5-cache/dev-libs/libltdl-1.3.5
 1506071606 metadata/md5-cache/dev-libs/gf2x-1.0-r1
-1408251006 metadata/md5-cache/dev-libs/busybee-0.5.1
 1506071606 metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
 1505281111 metadata/md5-cache/dev-libs/c-blosc-1.3.2
 1505281111 metadata/md5-cache/dev-libs/ace-5.5-r1
@@ -46544,7 +46496,6 @@
 1505281111 metadata/md5-cache/dev-libs/boost-numpy-9999
 1506030737 metadata/md5-cache/dev-libs/glib-1.2.10-r5
 1505281112 metadata/md5-cache/dev-libs/qjson-0.8.1
-1405221236 metadata/md5-cache/dev-libs/busybee-0.5.0
 1506052006 metadata/md5-cache/dev-libs/libexecinfo-1.1
 1505281112 metadata/md5-cache/dev-libs/leveldb-1.15.0
 1506160037 metadata/md5-cache/dev-libs/link-grammar-4.8.6
@@ -46623,7 +46574,7 @@
 1303312206 metadata/md5-cache/dev-libs/libxdiff-0.23
 1506071306 metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
 1505281112 metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1
-1506151607 metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
+1506172236 metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
 1506030737 metadata/md5-cache/dev-libs/libuv-1.1.0
 1505281111 metadata/md5-cache/dev-libs/collada-dom-9999
 1506030737 metadata/md5-cache/dev-libs/glib-2.40.2
@@ -46640,7 +46591,6 @@
 1505281112 metadata/md5-cache/dev-libs/nss-3.19
 1505281112 metadata/md5-cache/dev-libs/libinput-0.8.0
 1505281112 metadata/md5-cache/dev-libs/libcroco-0.6.8-r1
-1402210706 metadata/md5-cache/dev-libs/busybee-0.4.1
 1505281112 metadata/md5-cache/dev-libs/klibc-2.0.3
 1211091737 metadata/md5-cache/dev-libs/fampp2-6.0.1
 1505281112 metadata/md5-cache/dev-libs/ppl-0.12.1-r1
@@ -46748,7 +46698,6 @@
 1506071606 metadata/md5-cache/dev-libs/libzip-1.0.1
 1505281112 metadata/md5-cache/dev-libs/leveldb-1.11.0-r1
 1506160037 metadata/md5-cache/dev-libs/OpenNI-9999
-1211091737 metadata/md5-cache/dev-libs/busybee-0.1.0
 1506100136 metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1
 1402221906 metadata/md5-cache/dev-libs/log4cplus-1.1.2
 1506071606 metadata/md5-cache/dev-libs/cgilib-0.7
@@ -46830,7 +46779,6 @@
 1505281112 metadata/md5-cache/dev-libs/libltdl-2.4.6
 1505281236 metadata/md5-cache/dev-libs/libpo6-0.7.0
 1506152236 metadata/md5-cache/dev-libs/intel-common-14.0.0.080
-1407110706 metadata/md5-cache/dev-libs/replicant-0.6.1
 1505281112 metadata/md5-cache/dev-libs/distorm64-3.3-r1
 1506162106 metadata/md5-cache/dev-libs/kqoauth-0.98
 1505281112 metadata/md5-cache/dev-libs/matrixssl-3.6.1
@@ -46950,7 +46898,6 @@
 1506071606 metadata/md5-cache/dev-libs/oniguruma-5.9.5
 1505281112 metadata/md5-cache/dev-libs/libatomic_ops-7.2_alpha4
 1505281112 metadata/md5-cache/dev-libs/skalibs-2.3.2.0
-1405221236 metadata/md5-cache/dev-libs/replicant-0.6.0
 1505281112 metadata/md5-cache/dev-libs/tre-0.8.0
 1505281112 metadata/md5-cache/dev-libs/efl-1.13.1
 1505281112 metadata/md5-cache/dev-libs/redland-1.0.15
@@ -46969,7 +46916,6 @@
 1506030737 metadata/md5-cache/dev-libs/yaz-4.2.30
 1506030737 metadata/md5-cache/dev-libs/mongo-c-driver-1.1.2-r1
 1505281112 metadata/md5-cache/dev-libs/uthash-1.9.9
-1402210736 metadata/md5-cache/dev-libs/replicant-0.4.0
 1505281112 metadata/md5-cache/dev-libs/libe-0.9.0
 1506030737 metadata/md5-cache/dev-libs/libxslt-1.1.28-r3
 1505281112 metadata/md5-cache/dev-libs/libinput-0.13.0
@@ -47183,7 +47129,6 @@
 1506030737 metadata/md5-cache/dev-libs/libevent-9999
 1506030737 metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
 1505281112 metadata/md5-cache/dev-libs/gobject-introspection-1.40.0-r2
-1505300236 metadata/md5-cache/dev-libs/libe-0.10.0
 1506111736 metadata/md5-cache/dev-libs/apr-util-1.5.4
 1505281112 metadata/md5-cache/dev-libs/libx86-1.1-r2
 1506030737 metadata/md5-cache/dev-libs/opencryptoki-2.3.3-r5
@@ -47265,7 +47210,7 @@
 1506071606 metadata/md5-cache/dev-libs/libyaml-0.1.6
 1506071606 metadata/md5-cache/dev-libs/liblogging-1.0.2
 1505281112 metadata/md5-cache/dev-libs/libatomic_ops-7.2d
-1506151607 metadata/md5-cache/dev-libs/openssl-1.0.1o
+1506172236 metadata/md5-cache/dev-libs/openssl-1.0.1o
 1211091737 metadata/md5-cache/dev-libs/cityhash-1.1.0
 1505281112 metadata/md5-cache/dev-libs/grantlee-0.4.0
 1501191436 metadata/md5-cache/dev-libs/nanomsg-0.5
@@ -47286,8 +47231,6 @@
 1505281112 metadata/md5-cache/dev-libs/liblinear-196-r1
 1505281112 metadata/md5-cache/dev-libs/nss-3.17.4
 1505281112 metadata/md5-cache/dev-libs/libf2c-20110801-r4
-1506030737 metadata/md5-cache/dev-libs/hyperleveldb-1.2.0
-1404301336 metadata/md5-cache/dev-libs/replicant-0.5.0
 1506071606 metadata/md5-cache/dev-libs/radlib-2.12.0-r1
 1505281112 metadata/md5-cache/dev-libs/libical-1.0.1
 1506030737 metadata/md5-cache/dev-libs/zthread-2.3.2-r3
@@ -47332,6 +47275,7 @@
 1505281111 metadata/md5-cache/dev-libs/boost-numpy-0_pre20131206
 1505281112 metadata/md5-cache/dev-libs/libx86-1.1-r3
 1505281112 metadata/md5-cache/dev-libs/elfutils-0.149
+1506180607 metadata/md5-cache/dev-libs/libe-0.10.1
 1505281112 metadata/md5-cache/dev-libs/libebml-1.2.2
 1506030737 metadata/md5-cache/dev-libs/mini-xml-2.7-r1
 1506160037 metadata/md5-cache/dev-libs/xapian-bindings-1.3.3
@@ -47412,6 +47356,7 @@
 1211091737 metadata/md5-cache/dev-libs/asyncresolv-0.0.3
 1506071606 metadata/md5-cache/dev-libs/papi-5.3.0
 1506071606 metadata/md5-cache/dev-libs/libcgroup-0.41
+1506180607 metadata/md5-cache/dev-libs/replicant-0.7.1
 1505281112 metadata/md5-cache/dev-libs/xmlwrapp-0.6.3
 1506030737 metadata/md5-cache/dev-libs/cloog-9999
 1506160037 metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
@@ -47453,9 +47398,7 @@
 1506030737 metadata/md5-cache/dev-libs/libhome-0.10.2-r1
 1506030737 metadata/md5-cache/dev-libs/gumbo-0.9.3
 1505281112 metadata/md5-cache/dev-libs/gmp-5.0.4
-1311200806 metadata/md5-cache/dev-libs/busybee-0.4.0
 1505281112 metadata/md5-cache/dev-libs/libffi-3.1-r3
-1312110806 metadata/md5-cache/dev-libs/replicant-0.3.1
 1505281112 metadata/md5-cache/dev-libs/gom-0.3.1
 1506152236 metadata/md5-cache/dev-libs/intel-common-13.0.1.117
 1505281112 metadata/md5-cache/dev-libs/vc-0.7.3
@@ -48019,11 +47962,12 @@
 1212152206 metadata/md5-cache/www-apache/modsecurity-crs-2.2.6-r1
 1505281128 metadata/md5-cache/www-apache/mod_security-2.7.5
 1505281128 metadata/md5-cache/www-apache/mod_rpaf-0.6
+1506172106 metadata/md5-cache/www-apache/mod_h2-0.7.0
 1505281128 metadata/md5-cache/www-apache/mod-auth-mysql-4.3.9-r1
 1506030739 metadata/md5-cache/www-apache/mod_auth_xradius-0.4.6
 1505281128 metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0
 1505281128 metadata/md5-cache/www-apache/mod_cband-0.9.7.5
-1506101436 metadata/md5-cache/www-apache/mod_h2-9999
+1506172106 metadata/md5-cache/www-apache/mod_h2-9999
 1505281128 metadata/md5-cache/www-apache/mod_slotlimit-1.3
 1505281128 metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141-r1
 1505281128 metadata/md5-cache/www-apache/mod_diagnostics-0.0.1
@@ -48050,7 +47994,7 @@
 1505281128 metadata/md5-cache/www-apache/anyterm-1.1.29
 1506021107 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p2
 1506030739 metadata/md5-cache/www-apache/mod_qos-11.12
-1506160039 metadata/md5-cache/www-apache/mod_jk-1.2.37
+1506171308 metadata/md5-cache/www-apache/mod_jk-1.2.37
 1506160039 metadata/md5-cache/www-apache/passenger-4.0.53
 1505281128 metadata/md5-cache/www-apache/mod_security-2.7.7
 1506160039 metadata/md5-cache/www-apache/passenger-4.0.59
@@ -48149,7 +48093,7 @@
 1505281124 metadata/md5-cache/net-print/c2esp-25c
 1506030739 metadata/md5-cache/net-print/gtklp-1.3.0
 1506030739 metadata/md5-cache/net-print/gtklp-1.3.1
-1506160039 metadata/md5-cache/net-print/gmso2-0.1-r1
+1506171307 metadata/md5-cache/net-print/gmso2-0.1-r1
 1505281124 metadata/md5-cache/net-print/cups-pdf-2.6.1
 1506030739 metadata/md5-cache/net-print/cndrvcups-common-lb-2.90
 1505281124 metadata/md5-cache/net-print/poster-20060221
@@ -48594,7 +48538,7 @@
 1211091733 metadata/md5-cache/app-dicts/duali-data-0.1b
 1401060406 metadata/md5-cache/app-dicts/sword-luther-1.1
 1506162107 metadata/md5-cache/sci-electronics/qelectrotech-9999
-1506160039 metadata/md5-cache/sci-electronics/electric-8.10
+1506171307 metadata/md5-cache/sci-electronics/electric-8.10
 1506030739 metadata/md5-cache/sci-electronics/xoscope-2.0
 1506160039 metadata/md5-cache/sci-electronics/klayout-0.23.10
 1506071607 metadata/md5-cache/sci-electronics/xcircuit-3.7.50
@@ -48622,7 +48566,7 @@
 1506071607 metadata/md5-cache/sci-electronics/xcircuit-3.8.40
 1505281124 metadata/md5-cache/sci-electronics/puff-20100127
 1505281124 metadata/md5-cache/sci-electronics/irsim-9.7.79
-1506160039 metadata/md5-cache/sci-electronics/electric-9.02
+1506171307 metadata/md5-cache/sci-electronics/electric-9.02
 1506030739 metadata/md5-cache/sci-electronics/xnec2c-3.2
 1301041706 metadata/md5-cache/sci-electronics/gerbv-2.6.0
 1505281124 metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
@@ -48632,7 +48576,7 @@
 1505281124 metadata/md5-cache/sci-electronics/gspiceui-0.9.99-r1
 1506030739 metadata/md5-cache/sci-electronics/magic-8.0.138
 1505281124 metadata/md5-cache/sci-electronics/gresistor-0.0.1-r1
-1506160039 metadata/md5-cache/sci-electronics/electric-8.11
+1506171307 metadata/md5-cache/sci-electronics/electric-8.11
 1505281124 metadata/md5-cache/sci-electronics/gspiceui-1.0.0
 1506030739 metadata/md5-cache/sci-electronics/gspeakers-0.11-r1
 1506162107 metadata/md5-cache/sci-electronics/qelectrotech-0.30
@@ -48647,7 +48591,7 @@
 1505281124 metadata/md5-cache/sci-electronics/gtkwave-3.3.45
 1505281124 metadata/md5-cache/sci-electronics/geda-1.8.2
 1506071607 metadata/md5-cache/sci-electronics/qucs-0.0.17.130503
-1506160039 metadata/md5-cache/sci-electronics/electric-8.09
+1506171307 metadata/md5-cache/sci-electronics/electric-8.09
 1506030739 metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
 1505281124 metadata/md5-cache/sci-electronics/gresistor-0.0.1-r2
 1506142206 metadata/md5-cache/sci-electronics/eagle-7.1.0
@@ -48656,7 +48600,7 @@
 1211091749 metadata/md5-cache/sci-electronics/gplcver-2.11a
 1506030739 metadata/md5-cache/sci-electronics/xnec2c-2.8
 1506030739 metadata/md5-cache/sci-electronics/balsa-4.0-r1
-1506160039 metadata/md5-cache/sci-electronics/electric-9.00
+1506171307 metadata/md5-cache/sci-electronics/electric-9.00
 1506071607 metadata/md5-cache/sci-electronics/xcircuit-3.8.77
 1506142206 metadata/md5-cache/sci-electronics/eagle-5.12.0
 1505281124 metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -48678,7 +48622,7 @@
 1506030739 metadata/md5-cache/sci-electronics/pcb-20140316
 1501280906 metadata/md5-cache/sci-electronics/gplcver-2.12a
 1505281124 metadata/md5-cache/sci-electronics/pulseview-0.2.0
-1506160039 metadata/md5-cache/sci-electronics/electric-9.03
+1506171307 metadata/md5-cache/sci-electronics/electric-9.03
 1506071607 metadata/md5-cache/sci-electronics/xcircuit-3.7.48
 1505281124 metadata/md5-cache/sci-electronics/netgen-1.4.52
 1505281124 metadata/md5-cache/sci-electronics/electronics-menu-1.0
@@ -48705,14 +48649,14 @@
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.8
 1505121837 metadata/md5-cache/www-apps/drupal-6.35
 1506160039 metadata/md5-cache/www-apps/nanoc-3.8.0
-1505281128 metadata/md5-cache/www-apps/davical-1.0.2-r2
-1505281128 metadata/md5-cache/www-apps/tt-rss-1.15.3
+1506172337 metadata/md5-cache/www-apps/davical-1.0.2-r2
+1506172337 metadata/md5-cache/www-apps/tt-rss-1.15.3
 1506160039 metadata/md5-cache/www-apps/nanoc-3.7.5-r1
 1505281128 metadata/md5-cache/www-apps/horde-nag-2.3.4
 1505281128 metadata/md5-cache/www-apps/mediawiki-1.24.1
-1505281128 metadata/md5-cache/www-apps/mantisbt-1.2.15-r1
+1506172337 metadata/md5-cache/www-apps/mantisbt-1.2.15-r1
 1506131237 metadata/md5-cache/www-apps/guacamole-0.9.7
-1505281128 metadata/md5-cache/www-apps/tt-rss-20150304
+1506172337 metadata/md5-cache/www-apps/tt-rss-20150304
 1505281128 metadata/md5-cache/www-apps/blohg-9999
 1505281128 metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
 1505121837 metadata/md5-cache/www-apps/groupoffice-4.0.144
@@ -48724,12 +48668,12 @@
 1505281128 metadata/md5-cache/www-apps/horde-3.3.11
 1505281128 metadata/md5-cache/www-apps/mediawiki-1.22.15
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.2.0
-1505281128 metadata/md5-cache/www-apps/websvn-2.3.3
+1506172337 metadata/md5-cache/www-apps/websvn-2.3.3
 1505281128 metadata/md5-cache/www-apps/roundup-1.4.20
 1410180036 metadata/md5-cache/www-apps/hiawatha-monitor-1.0
-1505281128 metadata/md5-cache/www-apps/agendav-1.2.6.2
+1506172337 metadata/md5-cache/www-apps/agendav-1.2.6.2
 1505281128 metadata/md5-cache/www-apps/mythweb-0.27
-1505281128 metadata/md5-cache/www-apps/gallery-2.3.2
+1506172337 metadata/md5-cache/www-apps/gallery-2.3.2
 1505121837 metadata/md5-cache/www-apps/wordpress-3.9.3
 1505281128 metadata/md5-cache/www-apps/blohg-tumblelog-9999
 1505281128 metadata/md5-cache/www-apps/horde-ingo-1.2.5
@@ -48755,7 +48699,7 @@
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.17
 1506160039 metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
 1505121837 metadata/md5-cache/www-apps/phpwebsite-1.7.2
-1505281128 metadata/md5-cache/www-apps/davical-1.1.1-r2
+1506172337 metadata/md5-cache/www-apps/davical-1.1.1-r2
 1505281128 metadata/md5-cache/www-apps/wiliki-0.6.1
 1505121837 metadata/md5-cache/www-apps/dragonflycms-9.3.3.1
 1505281128 metadata/md5-cache/www-apps/rocketwiki-lqfb-0.4
@@ -48769,21 +48713,21 @@
 1506132238 metadata/md5-cache/www-apps/ikiwiki-3.20150107
 1505281128 metadata/md5-cache/www-apps/trac-tags-0.6
 1505121837 metadata/md5-cache/www-apps/phpBB-3.0.11
-1505281128 metadata/md5-cache/www-apps/davical-1.1.3.1-r2
+1506172337 metadata/md5-cache/www-apps/davical-1.1.3.1-r2
 1506160039 metadata/md5-cache/www-apps/redmine-2.4.6
 1505281128 metadata/md5-cache/www-apps/cgit-0.10.1
 1505281128 metadata/md5-cache/www-apps/cgit-9999
 1505281128 metadata/md5-cache/www-apps/mediawiki-1.23.8
 1505281128 metadata/md5-cache/www-apps/cgit-0.11.2
 1505281128 metadata/md5-cache/www-apps/mythweb-0.26.0
-1505281128 metadata/md5-cache/www-apps/owncloud-7.0.5
+1506172337 metadata/md5-cache/www-apps/owncloud-7.0.5
 1505121837 metadata/md5-cache/www-apps/phpBB-3.0.10
 1505281128 metadata/md5-cache/www-apps/mypictures-20040202-r1
-1505281128 metadata/md5-cache/www-apps/joomla-3.3.3
-1505281128 metadata/md5-cache/www-apps/joomla-3.3.6
+1506172337 metadata/md5-cache/www-apps/joomla-3.3.3
+1506172337 metadata/md5-cache/www-apps/joomla-3.3.6
 1505281128 metadata/md5-cache/www-apps/horde-3.3.9
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.12
-1505281128 metadata/md5-cache/www-apps/eyeos-2.5
+1506172337 metadata/md5-cache/www-apps/eyeos-2.5
 1505281128 metadata/md5-cache/www-apps/scgi-1.14
 1506132036 metadata/md5-cache/www-apps/otrs-3.2.9
 1505121837 metadata/md5-cache/www-apps/postfixadmin-2.3.7
@@ -48800,7 +48744,7 @@
 1505281128 metadata/md5-cache/www-apps/horde-mimp-1.0.1
 1505121837 metadata/md5-cache/www-apps/wordpress-4.1.1
 1505281128 metadata/md5-cache/www-apps/nanoblogger-3.2.3
-1506101636 metadata/md5-cache/www-apps/owncloud-6.0.8
+1506172337 metadata/md5-cache/www-apps/owncloud-6.0.8
 1505121837 metadata/md5-cache/www-apps/metadot-6.4.5.4
 1505281128 metadata/md5-cache/www-apps/owncloud-8.0.3
 1505281128 metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
@@ -48816,25 +48760,25 @@
 1408110037 metadata/md5-cache/www-apps/horde-pear-1.3-r3
 1506132036 metadata/md5-cache/www-apps/otrs-3.2.10
 1506132036 metadata/md5-cache/www-apps/bugzilla-4.0.15
-1505281128 metadata/md5-cache/www-apps/owncloud-6.0.7
-1506101636 metadata/md5-cache/www-apps/owncloud-7.0.6
-1505281128 metadata/md5-cache/www-apps/ampache-3.4.3
+1506172337 metadata/md5-cache/www-apps/owncloud-6.0.7
+1506172337 metadata/md5-cache/www-apps/owncloud-7.0.6
+1506172337 metadata/md5-cache/www-apps/ampache-3.4.3
 1505281128 metadata/md5-cache/www-apps/gnopaste-0.5.5
-1505281128 metadata/md5-cache/www-apps/phpmp-0.11.0
-1505281128 metadata/md5-cache/www-apps/baikal-0.2.7
+1506172337 metadata/md5-cache/www-apps/phpmp-0.11.0
+1506172337 metadata/md5-cache/www-apps/baikal-0.2.7
 1505281128 metadata/md5-cache/www-apps/nanoblogger-3.5_rc1
 1505281128 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.3
 1506160039 metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
 1505281128 metadata/md5-cache/www-apps/horde-chora-2.0.2
 1505281128 metadata/md5-cache/www-apps/freeradius-dialupadmin-1.70.3
-1505281128 metadata/md5-cache/www-apps/davical-1.1.0-r1
+1506172337 metadata/md5-cache/www-apps/davical-1.1.0-r1
 1505121837 metadata/md5-cache/www-apps/wordpress-3.8.5
 1506132036 metadata/md5-cache/www-apps/mod_survey-3.2.5
 1505121837 metadata/md5-cache/www-apps/groupoffice-3.7.52
 1505281128 metadata/md5-cache/www-apps/moodle-2.7.8
 1505281128 metadata/md5-cache/www-apps/bitten-0.6-r1
 1505281128 metadata/md5-cache/www-apps/horde-turba-2.3.5
-1505281128 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
+1506172337 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
 1505281128 metadata/md5-cache/www-apps/guacamole-0.8.3
 1505281128 metadata/md5-cache/www-apps/horde-kronolith-2.1.8
 1506101636 metadata/md5-cache/www-apps/owncloud-8.0.4
@@ -48860,16 +48804,16 @@
 1506160039 metadata/md5-cache/www-apps/jekyll-sass-converter-1.3.0
 1505281128 metadata/md5-cache/www-apps/cgit-0.10.2
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.11
-1505281128 metadata/md5-cache/www-apps/dokuwiki-20140505e
-1505281128 metadata/md5-cache/www-apps/baikal-0.2.4
-1505281128 metadata/md5-cache/www-apps/dokuwiki-20140929d
+1506172337 metadata/md5-cache/www-apps/dokuwiki-20140505e
+1506172337 metadata/md5-cache/www-apps/baikal-0.2.4
+1506172337 metadata/md5-cache/www-apps/dokuwiki-20140929d
 1506160039 metadata/md5-cache/www-apps/jekyll-sitemap-0.8.1
-1505281128 metadata/md5-cache/www-apps/websvn-2.3.2
+1506172337 metadata/md5-cache/www-apps/websvn-2.3.2
 1505121837 metadata/md5-cache/www-apps/wordpress-4.1
 1505281128 metadata/md5-cache/www-apps/trac-1.0.3
 1506132238 metadata/md5-cache/www-apps/ikiwiki-3.20140227
 1505281128 metadata/md5-cache/www-apps/mypictures-20040202
-1505281128 metadata/md5-cache/www-apps/rutorrent-3.4-r1
+1506172337 metadata/md5-cache/www-apps/rutorrent-3.4-r1
 1505281128 metadata/md5-cache/www-apps/trac-downloads-0.3_p9282
 1411201908 metadata/md5-cache/www-apps/novnc-9999
 1505281128 metadata/md5-cache/www-apps/mediawiki-1.24.2
@@ -48912,7 +48856,7 @@
 1506160039 metadata/md5-cache/www-apps/jekyll-2.5.3
 1506132036 metadata/md5-cache/www-apps/bugzilla-4.4.6
 1505281128 metadata/md5-cache/www-apps/trac-1.0.2
-1505281128 metadata/md5-cache/www-apps/owncloud-5.0.19
+1506172337 metadata/md5-cache/www-apps/owncloud-5.0.19
 1408110037 metadata/md5-cache/www-apps/cgisysinfo-0.4.1
 1505121837 metadata/md5-cache/www-apps/wordpress-4.2.1
 1505281128 metadata/md5-cache/www-apps/sugarcrm-6.5.9
@@ -48920,7 +48864,7 @@
 1211091752 metadata/md5-cache/www-apps/cvsweb-1.112
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.3
 1505281128 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.6
-1505281128 metadata/md5-cache/www-apps/joomla-3.4.0_alpha
+1506172337 metadata/md5-cache/www-apps/joomla-3.4.0_alpha
 1505121837 metadata/md5-cache/www-apps/phpBB-3.0.12
 1505121837 metadata/md5-cache/www-apps/wordpress-4.0.1
 1505121837 metadata/md5-cache/www-apps/phpsysinfo-3.1.9
@@ -49834,7 +49778,6 @@
 1505281115 metadata/md5-cache/dev-python/pycparser-2.13
 1505281114 metadata/md5-cache/dev-python/keyring-3.1
 1505281114 metadata/md5-cache/dev-python/astor-0.4.1
-1505281114 metadata/md5-cache/dev-python/bokeh-0.5.0
 1505281114 metadata/md5-cache/dev-python/adodb-py-2.20
 1505281115 metadata/md5-cache/dev-python/pythonutils-0.4.0-r1
 1505281114 metadata/md5-cache/dev-python/mccabe-0.3
@@ -49851,6 +49794,7 @@
 1505281114 metadata/md5-cache/dev-python/behave-1.2.4
 1505281115 metadata/md5-cache/dev-python/transmissionrpc-0.11
 1506160137 metadata/md5-cache/dev-python/ijson-2.2
+1506171036 metadata/md5-cache/dev-python/nltk-3.0.3
 1505281114 metadata/md5-cache/dev-python/blessings-1.6
 1506071306 metadata/md5-cache/dev-python/mako-1.0.0
 1505281114 metadata/md5-cache/dev-python/flask-openid-1.2.4
@@ -49918,7 +49862,6 @@
 1505281114 metadata/md5-cache/dev-python/bjoern-1.3.2
 1505281115 metadata/md5-cache/dev-python/wsgiintercept-0.9.0
 1505281114 metadata/md5-cache/dev-python/cddb-py-1.4-r1
-1505281115 metadata/md5-cache/dev-python/sip-4.16.7
 1505311436 metadata/md5-cache/dev-python/webtest-2.0.16
 1505281115 metadata/md5-cache/dev-python/shortuuid-0.4.2
 1505281115 metadata/md5-cache/dev-python/twitter-1.14.3
@@ -49949,6 +49892,7 @@
 1505281114 metadata/md5-cache/dev-python/SaltTesting-2015.2.16
 1505281115 metadata/md5-cache/dev-python/yenc-0.4.0-r1
 1505281115 metadata/md5-cache/dev-python/statsmodels-0.5.0
+1506171136 metadata/md5-cache/dev-python/hgtools-6.3
 1505281114 metadata/md5-cache/dev-python/colorama-0.3.3
 1505281114 metadata/md5-cache/dev-python/parsley-1.2
 1505281114 metadata/md5-cache/dev-python/django-crispy-forms-1.4.0
@@ -49993,7 +49937,6 @@
 1505281115 metadata/md5-cache/dev-python/python-sqlparse-0.1.15
 1505281115 metadata/md5-cache/dev-python/pycollada-0.4
 1505281115 metadata/md5-cache/dev-python/pystatgrab-0.6
-1505281114 metadata/md5-cache/dev-python/hgtools-3.0.2
 1505281115 metadata/md5-cache/dev-python/timelib-0.2.4-r1
 1506071606 metadata/md5-cache/dev-python/subunit-0.0.10-r1
 1505281115 metadata/md5-cache/dev-python/tdaemon-0.1.6
@@ -50019,7 +49962,6 @@
 1505281115 metadata/md5-cache/dev-python/python-biggles-1.6.6-r1
 1505281115 metadata/md5-cache/dev-python/sympy-0.7.6
 1505281114 metadata/md5-cache/dev-python/flask-babel-0.9
-1505281114 metadata/md5-cache/dev-python/hgtools-2.0.2
 1505281114 metadata/md5-cache/dev-python/argh-0.25.0
 1505281114 metadata/md5-cache/dev-python/bashate-0.3.1
 1505281115 metadata/md5-cache/dev-python/twisted-conch-15.2.1
@@ -50115,7 +50057,6 @@
 1505281114 metadata/md5-cache/dev-python/apsw-3.8.5_p1
 1505281114 metadata/md5-cache/dev-python/alabaster-0.7.4
 1505281114 metadata/md5-cache/dev-python/json-rpc-1.7.0
-1505281114 metadata/md5-cache/dev-python/bokeh-0.4.1
 1505281114 metadata/md5-cache/dev-python/geopy-1.9.1
 1505281115 metadata/md5-cache/dev-python/pytables-3.2.0
 1505281114 metadata/md5-cache/dev-python/cfgparse-1.3-r1
@@ -50273,7 +50214,7 @@
 1505281114 metadata/md5-cache/dev-python/configargparse-0.9.3
 1505281114 metadata/md5-cache/dev-python/blosc-1.2.0
 1505281115 metadata/md5-cache/dev-python/rpy-2.5.6
-1506161036 metadata/md5-cache/dev-python/paste-2.0.2
+1506171106 metadata/md5-cache/dev-python/paste-2.0.2
 1505281114 metadata/md5-cache/dev-python/asyncio-3.4.2
 1505281114 metadata/md5-cache/dev-python/markdown-2.5.1
 1505281114 metadata/md5-cache/dev-python/nltk-3.0.2
@@ -50407,6 +50348,7 @@
 1505281115 metadata/md5-cache/dev-python/turbojson-1.3.2-r1
 1505281114 metadata/md5-cache/dev-python/eventlet-0.15.2
 1505281114 metadata/md5-cache/dev-python/nose-testconfig-0.9
+1506171106 metadata/md5-cache/dev-python/sqlalchemy-1.0.5
 1505281115 metadata/md5-cache/dev-python/pyclamav-0.4.1-r2
 1505281114 metadata/md5-cache/dev-python/jenkinsapi-0.2.26
 1505281114 metadata/md5-cache/dev-python/myghty-1.2-r1
@@ -50496,7 +50438,7 @@
 1505281115 metadata/md5-cache/dev-python/south-0.8.4
 1505281115 metadata/md5-cache/dev-python/pyid3lib-0.5.1-r1
 1505281115 metadata/md5-cache/dev-python/pyocr-0.2.4
-1506131436 metadata/md5-cache/dev-python/eyeD3-0.7.5
+1506171207 metadata/md5-cache/dev-python/eyeD3-0.7.5
 1505281115 metadata/md5-cache/dev-python/pydiff-0.2
 1505281114 metadata/md5-cache/dev-python/google-apitools-0.4.6
 1505281115 metadata/md5-cache/dev-python/pycadf-0.6.0
@@ -50573,10 +50515,11 @@
 1505281114 metadata/md5-cache/dev-python/markdown2-2.2.1
 1505281114 metadata/md5-cache/dev-python/oslo-config-1.6.1
 1505281114 metadata/md5-cache/dev-python/paisley-0.3.1-r1
-1506151136 metadata/md5-cache/dev-python/pillow-2.8.1
+1506171207 metadata/md5-cache/dev-python/pillow-2.8.1
 1505281115 metadata/md5-cache/dev-python/pycountry-1.8
 1505281114 metadata/md5-cache/dev-python/ipcalc-1.1.2
 1505281114 metadata/md5-cache/dev-python/llvmpy-0.12.3
+1506180806 metadata/md5-cache/dev-python/psutil-3.0.1
 1505281115 metadata/md5-cache/dev-python/pyquery-1.2.4
 1506040936 metadata/md5-cache/dev-python/django-nose-1.4
 1505281115 metadata/md5-cache/dev-python/scientificpython-2.9.4
@@ -50643,6 +50586,7 @@
 1505281115 metadata/md5-cache/dev-python/pyid3lib-0.5.1-r2
 1506020836 metadata/md5-cache/dev-python/waitress-0.8.9
 1505281114 metadata/md5-cache/dev-python/llvmlite-0.2.2
+1506171036 metadata/md5-cache/dev-python/gevent-websocket-0.9.5
 1505281115 metadata/md5-cache/dev-python/translate-toolkit-1.12.0
 1505281114 metadata/md5-cache/dev-python/oslo-config-1.11.0
 1505281114 metadata/md5-cache/dev-python/django-extensions-1.5.5
@@ -50877,6 +50821,7 @@
 1505281115 metadata/md5-cache/dev-python/pycdio-0.20-r1
 1505281114 metadata/md5-cache/dev-python/pep8-1.4.5
 1506141706 metadata/md5-cache/dev-python/sip-4.16.8
+1506180537 metadata/md5-cache/dev-python/into-0.2.2
 1506071236 metadata/md5-cache/dev-python/defusedxml-0.4.1-r1
 1505281115 metadata/md5-cache/dev-python/python-ldap-2.4.18
 1505281114 metadata/md5-cache/dev-python/numpydoc-0.5
@@ -50949,7 +50894,7 @@
 1505281114 metadata/md5-cache/dev-python/odfpy-0.9.6-r1
 1506071236 metadata/md5-cache/dev-python/egenix-mx-base-3.2.5
 1505281115 metadata/md5-cache/dev-python/python-barbicanclient-3.0.1
-1506161036 metadata/md5-cache/dev-python/pypam-0.5.0-r3
+1506171106 metadata/md5-cache/dev-python/pypam-0.5.0-r3
 1505281115 metadata/md5-cache/dev-python/wtforms-2.0.2
 1505281114 metadata/md5-cache/dev-python/alabaster-0.6.0
 1505281114 metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.21
@@ -51003,7 +50948,6 @@
 1505281114 metadata/md5-cache/dev-python/ldappool-1.0
 1505281114 metadata/md5-cache/dev-python/flask-sqlalchemy-1.0-r1
 1506021207 metadata/md5-cache/dev-python/pip-7.0.3
-1505281115 metadata/md5-cache/dev-python/pypam-0.5.0-r2
 1506071306 metadata/md5-cache/dev-python/sparql-wrapper-1.6.4
 1505281114 metadata/md5-cache/dev-python/oslo-serialization-1.4.0
 1505281115 metadata/md5-cache/dev-python/pygui-2.5.3-r1
@@ -51078,7 +51022,6 @@
 1505281115 metadata/md5-cache/dev-python/sympy-0.7.4.1
 1505281114 metadata/md5-cache/dev-python/llvmlite-0.2.0
 1505281114 metadata/md5-cache/dev-python/fpconst-0.7.3-r1
-1505281114 metadata/md5-cache/dev-python/hgtools-2.0.2-r1
 1505281114 metadata/md5-cache/dev-python/encore-0.4.0
 1505281115 metadata/md5-cache/dev-python/rax-default-network-flags-python-novaclient-ext-0.1.3
 1505281115 metadata/md5-cache/dev-python/twisted-lore-13.0.0-r1
@@ -51099,7 +51042,6 @@
 1506130306 metadata/md5-cache/dev-python/doit-py-0.3.0
 1505281115 metadata/md5-cache/dev-python/twisted-names-15.2.1
 1505281114 metadata/md5-cache/dev-python/dap-2.2.6.7-r1
-1505281114 metadata/md5-cache/dev-python/bokeh-0.4
 1505281115 metadata/md5-cache/dev-python/venusian-1.0
 1505281115 metadata/md5-cache/dev-python/routes-2.0
 1505281114 metadata/md5-cache/dev-python/execnet-1.3.0
@@ -51243,7 +51185,6 @@
 1505281114 metadata/md5-cache/dev-python/formencode-1.2.6-r1
 1505281115 metadata/md5-cache/dev-python/stevedore-1.4.0-r1
 1505281115 metadata/md5-cache/dev-python/venusian-1.0_alpha8
-1505281114 metadata/md5-cache/dev-python/hgtools-4.0
 1505281115 metadata/md5-cache/dev-python/subunit-0.0.21-r1
 1505281115 metadata/md5-cache/dev-python/webhelpers-1.3-r1
 1505281115 metadata/md5-cache/dev-python/watchdog-0.8.1
@@ -51292,6 +51233,7 @@
 1505281114 metadata/md5-cache/dev-python/pkipplib-0.07-r1
 1505281114 metadata/md5-cache/dev-python/enum34-1.0.4
 1505281114 metadata/md5-cache/dev-python/hcs-utils-1.4
+1506171207 metadata/md5-cache/dev-python/flask-admin-1.2.0
 1505281115 metadata/md5-cache/dev-python/pyalsa-1.0.26-r1
 1505281114 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-1.7
 1505281114 metadata/md5-cache/dev-python/greenlet-0.4.2
@@ -51410,7 +51352,6 @@
 1505281114 metadata/md5-cache/dev-python/flask-pymongo-0.3.0
 1505281114 metadata/md5-cache/dev-python/pmw-2.0.1
 1506071306 metadata/md5-cache/dev-python/twisted-core-13.2.0
-1505281114 metadata/md5-cache/dev-python/bokeh-0.4.2
 1505281114 metadata/md5-cache/dev-python/cddb-py-1.4
 1505281114 metadata/md5-cache/dev-python/apptools-4.2.0-r1
 1505281115 metadata/md5-cache/dev-python/pyasn1-modules-0.0.5-r1
@@ -51449,6 +51390,7 @@
 1505281115 metadata/md5-cache/dev-python/whirlpool-0.3-r1
 1505281115 metadata/md5-cache/dev-python/twisted-core-14.0.2
 1506162106 metadata/md5-cache/dev-python/PyQt4-4.11.4
+1506171436 metadata/md5-cache/dev-python/mistune-0.6
 1505281115 metadata/md5-cache/dev-python/pyGPG-9999
 1505281114 metadata/md5-cache/dev-python/fabric-1.10.0-r1
 1506020836 metadata/md5-cache/dev-python/setuptools-12.0.1
@@ -51618,7 +51560,6 @@
 1505281114 metadata/md5-cache/dev-python/dugong-3.5
 1505281114 metadata/md5-cache/dev-python/flask-9999
 1505281114 metadata/md5-cache/dev-python/pep8-1.5.6
-1505281114 metadata/md5-cache/dev-python/gevent-websocket-0.9.2
 1505281115 metadata/md5-cache/dev-python/python-augeas-0.5.0
 1505281114 metadata/md5-cache/dev-python/jaraco-utils-10.0.2
 1505281115 metadata/md5-cache/dev-python/pyamazon-0.65
@@ -51715,7 +51656,6 @@
 1505281114 metadata/md5-cache/dev-python/bcrypt-1.0.2-r1
 1505281114 metadata/md5-cache/dev-python/astroid-1.1.1
 1506080136 metadata/md5-cache/dev-python/wrapt-1.10.4
-1505281114 metadata/md5-cache/dev-python/bokeh-0.4.4
 1505281114 metadata/md5-cache/dev-python/mockldap-0.2.4
 1505281115 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.3.0
 1505281114 metadata/md5-cache/dev-python/more-itertools-2.2
@@ -51770,6 +51710,7 @@
 1505281114 metadata/md5-cache/dev-python/keyring-3.7
 1505281114 metadata/md5-cache/dev-python/polib-1.0.4
 1505281114 metadata/md5-cache/dev-python/oslo-config-1.7.0
+1506171436 metadata/md5-cache/dev-python/alabaster-0.7.5
 1505281115 metadata/md5-cache/dev-python/pyzor-0.7.0
 1505281114 metadata/md5-cache/dev-python/anyjson-0.3.3
 1505281114 metadata/md5-cache/dev-python/libvirt-python-1.2.10
@@ -51802,7 +51743,7 @@
 1505281115 metadata/md5-cache/dev-python/python-mpd-0.5.4
 1505281115 metadata/md5-cache/dev-python/pyplusplus-1.0.0_p20131206
 1505281115 metadata/md5-cache/dev-python/pyfltk-1.3.0
-1506161036 metadata/md5-cache/dev-python/pastescript-2.0.2
+1506171106 metadata/md5-cache/dev-python/pastescript-2.0.2
 1505281114 metadata/md5-cache/dev-python/openpyxl-2.2.2
 1505281115 metadata/md5-cache/dev-python/twython-3.2.0
 1505281114 metadata/md5-cache/dev-python/peppercorn-0.4-r1
@@ -51874,12 +51815,10 @@
 1505281115 metadata/md5-cache/dev-python/pyvorbis-1.4-r4
 1505281115 metadata/md5-cache/dev-python/twisted-lore-15.2.1
 1505281114 metadata/md5-cache/dev-python/oslo-messaging-1.8.2
-1506162106 metadata/md5-cache/dev-python/PyQt4-4.11.3
 1505281114 metadata/md5-cache/dev-python/argcomplete-0.8.1
 1505281506 metadata/md5-cache/dev-python/py-1.4.28
 1505281114 metadata/md5-cache/dev-python/feedgenerator-1.6
 1505281115 metadata/md5-cache/dev-python/python-distutils-extra-2.33-r1
-1505281114 metadata/md5-cache/dev-python/pastescript-1.7.5-r2
 1505281114 metadata/md5-cache/dev-python/flask-restful-0.2.12
 1505281115 metadata/md5-cache/dev-python/sqlalchemy-1.0.0
 1505281115 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.9.1
@@ -53505,7 +53444,7 @@
 1503031406 metadata/md5-cache/x11-base/xorg-drivers-1.17
 1506071607 metadata/md5-cache/x11-base/xorg-server-1.12.4-r4
 1506071607 metadata/md5-cache/x11-base/xorg-server-1.17.1-r1
-1506142306 metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
+1506171207 metadata/md5-cache/x11-base/xorg-server-1.12.4-r5
 1505281128 metadata/md5-cache/x11-base/xorg-x11-7.4-r2
 1310080936 metadata/md5-cache/x11-base/xorg-drivers-1.14
 1506021107 metadata/md5-cache/x11-base/nouveau-drm-20110820
@@ -53722,11 +53661,11 @@
 1505281125 metadata/md5-cache/sci-misc/nco-4.3.1
 1505281125 metadata/md5-cache/sci-misc/mendeleydesktop-1.13.8
 1506030739 metadata/md5-cache/sci-misc/repsnapper-2.3.2a_p3
-1506160039 metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
+1506171307 metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
 1506071607 metadata/md5-cache/sci-misc/boinc-7.2.0
 1506030739 metadata/md5-cache/sci-misc/lttoolbox-3.2.0
 1505281125 metadata/md5-cache/sci-misc/ncview-2.1.2
-1506160039 metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
+1506171307 metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
 1506030739 metadata/md5-cache/sci-misc/repsnapper-9999
 1504021936 metadata/md5-cache/sci-misc/ViSP-images-2.10.0
 1506071607 metadata/md5-cache/sci-misc/boinc-7.2.0-r1
@@ -53738,7 +53677,7 @@
 1506030739 metadata/md5-cache/sci-misc/repsnapper-2.2.0b_p3
 1505281125 metadata/md5-cache/sci-misc/fitsverify-4.17
 1506071607 metadata/md5-cache/sci-misc/oww-0.86.4
-1506160039 metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
+1506171307 metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
 1506071607 metadata/md5-cache/sci-misc/h5utils-1.12.1-r2
 1506020836 metadata/md5-cache/app-portage/pfl-2.4-r4
 1505281108 metadata/md5-cache/app-portage/pms-test-suite-9999
@@ -53980,7 +53919,7 @@
 1506160039 metadata/md5-cache/net-irc/epic5-1.1.10
 1505281123 metadata/md5-cache/net-irc/rhapsody-0.28b
 1506132237 metadata/md5-cache/net-irc/atheme-services-6.0.11-r1
-1506160039 metadata/md5-cache/net-irc/jircii-41
+1506171307 metadata/md5-cache/net-irc/jircii-41
 1506071607 metadata/md5-cache/net-irc/bobotpp-2.2.3
 1506030738 metadata/md5-cache/net-irc/eiwic-1.1.4
 1505281123 metadata/md5-cache/net-irc/znc-1.4-r1
@@ -54110,7 +54049,7 @@
 1505281117 metadata/md5-cache/dev-tcltk/itk-3.4_pre20090417
 1506071606 metadata/md5-cache/dev-tcltk/tkdnd-2.2
 1506160037 metadata/md5-cache/dev-lang/yap-6.3.2
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.5.0
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.5.0
 1506160037 metadata/md5-cache/dev-lang/xsb-3.5.0
 1505281111 metadata/md5-cache/dev-lang/path64-1.0.0_pre20110924
 1505281111 metadata/md5-cache/dev-lang/rakudo-2015.03
@@ -54129,13 +54068,12 @@
 1505281111 metadata/md5-cache/dev-lang/rebol-bin-3_pre111
 1506030737 metadata/md5-cache/dev-lang/python-3.4.2
 1506152236 metadata/md5-cache/dev-lang/icc-14.0.1.106
-1506160037 metadata/md5-cache/dev-lang/swi-prolog-7.1.36
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.6.0
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.6.0
 1505281111 metadata/md5-cache/dev-lang/lua-5.1.4-r8
 1505281111 metadata/md5-cache/dev-lang/elixir-1.0.0
 1505281111 metadata/md5-cache/dev-lang/pasm-1.7
 1506152236 metadata/md5-cache/dev-lang/idb-13.0.2.146
-1506160037 metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
+1506171307 metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
 1401070936 metadata/md5-cache/dev-lang/opendylan-bin-2013.2
 1505281111 metadata/md5-cache/dev-lang/lua-5.1.5
 1506030737 metadata/md5-cache/dev-lang/php-5.4.40
@@ -54143,7 +54081,7 @@
 1506152236 metadata/md5-cache/dev-lang/ifc-14.0.2.144
 1505281111 metadata/md5-cache/dev-lang/srf-1.0-r1
 1506030737 metadata/md5-cache/dev-lang/squirrel-2.2.4-r2
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
 1505281111 metadata/md5-cache/dev-lang/lua-5.1.5-r2
 1506030736 metadata/md5-cache/dev-lang/gnat-gcc-4.6.4
 1505281111 metadata/md5-cache/dev-lang/lfe-0.7
@@ -54160,6 +54098,7 @@
 1505281111 metadata/md5-cache/dev-lang/nacl-toolchain-newlib-0_p11846
 1503171906 metadata/md5-cache/dev-lang/pocl-0.11
 1505281111 metadata/md5-cache/dev-lang/dmd-bin-2.008-r1
+1506171736 metadata/md5-cache/dev-lang/swi-prolog-7.2.0
 1506030737 metadata/md5-cache/dev-lang/opendylan-2013.1-r1
 1506030736 metadata/md5-cache/dev-lang/cilk-5.4.6-r1
 1505281111 metadata/md5-cache/dev-lang/lua-5.1.5-r100
@@ -54177,9 +54116,9 @@
 1505281111 metadata/md5-cache/dev-lang/smlnj-110.75
 1506071606 metadata/md5-cache/dev-lang/fsharp-3.1.1.31
 1505281111 metadata/md5-cache/dev-lang/parrot-6.10.0
-1506160037 metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
+1506171307 metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
 1505281111 metadata/md5-cache/dev-lang/go-bootstrap-1.4.2
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.7.0
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.7.0
 1506030736 metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
 1506030737 metadata/md5-cache/dev-lang/python-3.2.5-r6
 1505281111 metadata/md5-cache/dev-lang/lua-5.1.5-r3
@@ -54214,7 +54153,7 @@
 1506030737 metadata/md5-cache/dev-lang/tcl-8.5.15-r1
 1505281111 metadata/md5-cache/dev-lang/rakudo-2015.02
 1505281111 metadata/md5-cache/dev-lang/hy-0.9.12
-1506160037 metadata/md5-cache/dev-lang/scala-2.9.2-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.9.2-r1
 1505281111 metadata/md5-cache/dev-lang/moarvm-2015.01
 1211091737 metadata/md5-cache/dev-lang/gwydion-dylan-bin-2.4.0-r1
 1506152236 metadata/md5-cache/dev-lang/idb-13.0.0.079
@@ -54224,7 +54163,7 @@
 1505281111 metadata/md5-cache/dev-lang/whitespace-0.3
 1506021106 metadata/md5-cache/dev-lang/mono-2.10.9-r2
 1505281111 metadata/md5-cache/dev-lang/elixir-1.0.1
-1506160037 metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
+1506171307 metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
 1505281111 metadata/md5-cache/dev-lang/luajit-2.0.2
 1505281111 metadata/md5-cache/dev-lang/julia-0.3.0
 1505281111 metadata/md5-cache/dev-lang/open-cobol-1.1
@@ -54239,7 +54178,7 @@
 1506091336 metadata/md5-cache/dev-lang/vala-0.28.0
 1506162106 metadata/md5-cache/dev-lang/qu-prolog-9.1-r1
 1506030737 metadata/md5-cache/dev-lang/tk-8.5.17-r100
-1506160037 metadata/md5-cache/dev-lang/scala-bin-2.11.6
+1506171307 metadata/md5-cache/dev-lang/scala-bin-2.11.6
 1505281111 metadata/md5-cache/dev-lang/parrot-6.9.0
 1505281111 metadata/md5-cache/dev-lang/niecza-9999
 1506030736 metadata/md5-cache/dev-lang/R-3.2.0-r1
@@ -54256,7 +54195,7 @@
 1506152236 metadata/md5-cache/dev-lang/icc-13.1.3.163
 1505281111 metadata/md5-cache/dev-lang/f2c-20060507
 1506151236 metadata/md5-cache/dev-lang/tcl-8.5.17-r100
-1506160037 metadata/md5-cache/dev-lang/scala-2.11.1-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.11.1-r1
 1506030736 metadata/md5-cache/dev-lang/R-3.0.1
 1505281111 metadata/md5-cache/dev-lang/moarvm-2015.02
 1505281111 metadata/md5-cache/dev-lang/luajit-2.0.4
@@ -54270,14 +54209,14 @@
 1505281111 metadata/md5-cache/dev-lang/mono-basic-2.10
 1506162106 metadata/md5-cache/dev-lang/qu-prolog-9.5
 1505281111 metadata/md5-cache/dev-lang/ucblogo-5.5
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.9.0
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.9.0
 1506030737 metadata/md5-cache/dev-lang/ruby-2.2.2-r1
 1501170436 metadata/md5-cache/dev-lang/swig-3.0.4
 1505281111 metadata/md5-cache/dev-lang/gdl-0.9.5
 1506030737 metadata/md5-cache/dev-lang/php-5.5.23
 1506160037 metadata/md5-cache/dev-lang/mercury-11.07
 1506030737 metadata/md5-cache/dev-lang/opendylan-9999
-1506160037 metadata/md5-cache/dev-lang/tuprolog-2.7.2
+1506171307 metadata/md5-cache/dev-lang/tuprolog-2.7.2
 1505290736 metadata/md5-cache/dev-lang/rakudo-2015.05-r1
 1506160037 metadata/md5-cache/dev-lang/erlang-17.5
 1505281111 metadata/md5-cache/dev-lang/mercury-extras-11.01
@@ -54305,7 +54244,7 @@
 1505281111 metadata/md5-cache/dev-lang/niecza-bin-24
 1506160037 metadata/md5-cache/dev-lang/mercury-13.05
 1505281111 metadata/md5-cache/dev-lang/hy-0.10.0
-1506160037 metadata/md5-cache/dev-lang/clojure-1.5.1
+1506171307 metadata/md5-cache/dev-lang/clojure-1.5.1
 1505281111 metadata/md5-cache/dev-lang/ekopath-5.0.5_pre20150226
 1506020036 metadata/md5-cache/dev-lang/epic-0.9.3.3
 1506160037 metadata/md5-cache/dev-lang/swi-prolog-6.6.6
@@ -54332,16 +54271,17 @@
 1505281111 metadata/md5-cache/dev-lang/niecza-bin-22
 1506071606 metadata/md5-cache/dev-lang/mono-3.2.3
 1506152236 metadata/md5-cache/dev-lang/idb-14.0.0.080
+1506171806 metadata/md5-cache/dev-lang/swi-prolog-7.3.2
 1506030737 metadata/md5-cache/dev-lang/php-5.6.8
 1505281111 metadata/md5-cache/dev-lang/execline-2.0.2.1
 1506071606 metadata/md5-cache/dev-lang/mono-3.0.7
 1505281111 metadata/md5-cache/dev-lang/jimtcl-0.75
-1506160037 metadata/md5-cache/dev-lang/scala-2.10.3-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.10.3-r1
 1506030736 metadata/md5-cache/dev-lang/helium-1.6
 1506152236 metadata/md5-cache/dev-lang/ifc-13.1.3.163
 1506030737 metadata/md5-cache/dev-lang/yasm-1.2.0
 1505281111 metadata/md5-cache/dev-lang/mercury-extras-11.07.1
-1506160037 metadata/md5-cache/dev-lang/interprolog-2.1.2
+1506171307 metadata/md5-cache/dev-lang/interprolog-2.1.2
 1505281111 metadata/md5-cache/dev-lang/moarvm-9999
 1505281111 metadata/md5-cache/dev-lang/ucblogo-5.5-r1
 1506030737 metadata/md5-cache/dev-lang/ruby-2.1.6-r1
@@ -54368,7 +54308,7 @@
 1505281111 metadata/md5-cache/dev-lang/hy-0.10.1
 1506030736 metadata/md5-cache/dev-lang/ferite-1.1.17-r1
 1505281111 metadata/md5-cache/dev-lang/moarvm-2015.03
-1506160037 metadata/md5-cache/dev-lang/scala-2.11.2-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.11.2-r1
 1505281111 metadata/md5-cache/dev-lang/cfortran-4.4-r3
 1506030737 metadata/md5-cache/dev-lang/tk-8.6.4-r1
 1505281111 metadata/md5-cache/dev-lang/mozart-stdlib-1.4.0-r1
@@ -54381,7 +54321,7 @@
 1505281111 metadata/md5-cache/dev-lang/tcc-0.9.26-r1
 1505281111 metadata/md5-cache/dev-lang/elixir-0.11.2
 1505281111 metadata/md5-cache/dev-lang/nqp-2015.01
-1506160037 metadata/md5-cache/dev-lang/scala-2.11.6
+1506171307 metadata/md5-cache/dev-lang/scala-2.11.6
 1506152236 metadata/md5-cache/dev-lang/icc-14.0.3.174
 1506152236 metadata/md5-cache/dev-lang/idb-14.0.1.106
 1506030736 metadata/md5-cache/dev-lang/R-3.1.0
@@ -54420,17 +54360,17 @@
 1505281111 metadata/md5-cache/dev-lang/fpc-2.6.2
 1505281111 metadata/md5-cache/dev-lang/niecza-bin-20
 1505281111 metadata/md5-cache/dev-lang/path64-1.0.0_pre20111108
-1506160037 metadata/md5-cache/dev-lang/scala-2.10.4-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.10.4-r1
 1505281111 metadata/md5-cache/dev-lang/yasm-1.3.0
 1506071606 metadata/md5-cache/dev-lang/mono-3.2.8
 1211091737 metadata/md5-cache/dev-lang/opendylan-bin-2011.1
 1506030737 metadata/md5-cache/dev-lang/opendylan-2013.2
 1506030737 metadata/md5-cache/dev-lang/polyml-5.4.1
 1211091737 metadata/md5-cache/dev-lang/falcon-0.9.4.4
-1506160037 metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
+1506171307 metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
 1505281111 metadata/md5-cache/dev-lang/ekopath-5.0.1_pre20131115
 1505281111 metadata/md5-cache/dev-lang/parrot-7.0.2
-1506160037 metadata/md5-cache/dev-lang/clojure-1.6.0
+1506171307 metadata/md5-cache/dev-lang/clojure-1.6.0
 1505281111 metadata/md5-cache/dev-lang/c-intercal-29.0
 1506030737 metadata/md5-cache/dev-lang/pcc-9999
 1505281111 metadata/md5-cache/dev-lang/io-2011.09.12-r2
@@ -54450,11 +54390,11 @@
 1506160037 metadata/md5-cache/dev-lang/erlang-16.3.1
 1506030736 metadata/md5-cache/dev-lang/blassic-0.10.2
 1505281111 metadata/md5-cache/dev-lang/elixir-1.0.2
-1506160037 metadata/md5-cache/dev-lang/scala-2.10.2-r2
-1506160037 metadata/md5-cache/dev-lang/scala-2.11.4-r1
+1506171307 metadata/md5-cache/dev-lang/scala-2.10.2-r2
+1506171307 metadata/md5-cache/dev-lang/scala-2.11.4-r1
 1506030736 metadata/md5-cache/dev-lang/ghc-7.8.3
 1506152236 metadata/md5-cache/dev-lang/ifc-15.0.1.133
-1506160037 metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
+1506171307 metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
 1506152236 metadata/md5-cache/dev-lang/ifc-13.0.0.079-r1
 1505281111 metadata/md5-cache/dev-lang/nqp-2015.04
 1505281111 metadata/md5-cache/dev-lang/elixir-0.14.3
@@ -54469,7 +54409,6 @@
 1505281111 metadata/md5-cache/dev-lang/open-cobol-1.0
 1505281111 metadata/md5-cache/dev-lang/execline-2.1.1.0
 1506061906 metadata/md5-cache/dev-lang/rust-bin-1.0.0
-1506160037 metadata/md5-cache/dev-lang/swi-prolog-7.1.37
 1505281111 metadata/md5-cache/dev-lang/niecza-21
 1505281111 metadata/md5-cache/dev-lang/parrot-6.11.0
 1506030737 metadata/md5-cache/dev-lang/python-3.3.5-r1
@@ -54648,6 +54587,7 @@
 1505281123 metadata/md5-cache/net-libs/gnome-online-accounts-3.14.4
 1505281123 metadata/md5-cache/net-libs/canlock-2b
 1506030738 metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+1506172207 metadata/md5-cache/net-libs/gnutls-3.3.15-r1
 1506030738 metadata/md5-cache/net-libs/liblockfile-1.09
 1505281123 metadata/md5-cache/net-libs/libpri-1.4.14
 1505281123 metadata/md5-cache/net-libs/libasr-1.0.1.201505061057
@@ -54678,7 +54618,7 @@
 1211091747 metadata/md5-cache/net-libs/libtirpc-0.1.10
 1506030738 metadata/md5-cache/net-libs/webkit-gtk-2.4.9-r200
 1506071408 metadata/md5-cache/net-libs/libnice-0.1.10
-1506030738 metadata/md5-cache/net-libs/gnutls-3.3.15
+1506171207 metadata/md5-cache/net-libs/gnutls-3.3.15
 1505281123 metadata/md5-cache/net-libs/netembryo-0.1.1
 1506030738 metadata/md5-cache/net-libs/gsoap-2.8.22
 1506151737 metadata/md5-cache/net-libs/libkvkontakte-4.7.0
@@ -54715,7 +54655,7 @@
 1505281123 metadata/md5-cache/net-libs/libhackrf-2014.04.1
 1506071607 metadata/md5-cache/net-libs/rb_libtorrent-1.0.5
 1211091747 metadata/md5-cache/net-libs/libnxml-0.18.3
-1506160039 metadata/md5-cache/net-libs/nativebiginteger-0.8.7
+1506171307 metadata/md5-cache/net-libs/nativebiginteger-0.8.7
 1506151737 metadata/md5-cache/net-libs/libmediawiki-4.10.0
 1505281123 metadata/md5-cache/net-libs/libopkele-2.0.4-r1
 1505281123 metadata/md5-cache/net-libs/libzapojit-0.0.3
@@ -54741,6 +54681,7 @@
 1505281123 metadata/md5-cache/net-libs/libzrtpcpp-2.3.4
 1506030738 metadata/md5-cache/net-libs/libupnp-1.6.18
 1506112236 metadata/md5-cache/net-libs/libqmi-1.12.6
+1506172106 metadata/md5-cache/net-libs/nghttp2-1.0.2
 1506071607 metadata/md5-cache/net-libs/czmq-2.2.0-r2
 1211091747 metadata/md5-cache/net-libs/iax-0.2.2
 1506030738 metadata/md5-cache/net-libs/libbitcoinconsensus-0.10.0
@@ -54768,6 +54709,7 @@
 1506030738 metadata/md5-cache/net-libs/libmapi-1.0
 1506091336 metadata/md5-cache/net-libs/telepathy-glib-0.24.1
 1407150206 metadata/md5-cache/net-libs/dhcpcd-dbus-0.6.1
+1506172206 metadata/md5-cache/net-libs/gnutls-3.4.2-r1
 1506030738 metadata/md5-cache/net-libs/libpcap-1.5.3
 1506021106 metadata/md5-cache/net-libs/libnfnetlink-1.0.1
 1505281123 metadata/md5-cache/net-libs/libqmi-1.8.0
@@ -54787,7 +54729,7 @@
 1506071607 metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.4
 1505281123 metadata/md5-cache/net-libs/libkolabxml-1.0.1
 1506071607 metadata/md5-cache/net-libs/libiscsi-1.9.0-r1
-1506160039 metadata/md5-cache/net-libs/NativeThread-0_pre20080330
+1506171307 metadata/md5-cache/net-libs/NativeThread-0_pre20080330
 1506071607 metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0
 1506151737 metadata/md5-cache/net-libs/libmm-qt-1.0.1-r1
 1505281123 metadata/md5-cache/net-libs/stem-1.4.0
@@ -54798,10 +54740,10 @@
 1506091307 metadata/md5-cache/net-libs/glib-networking-2.44.0
 1506030738 metadata/md5-cache/net-libs/libgrss-0.5.0-r1
 1506162106 metadata/md5-cache/net-libs/qmf-4.0.3
-1506130836 metadata/md5-cache/net-libs/libssh2-1.6.0
+1506172137 metadata/md5-cache/net-libs/libssh2-1.6.0
 1506091336 metadata/md5-cache/net-libs/gupnp-0.20.14
 1505281123 metadata/md5-cache/net-libs/rabbitmq-c-0.5.0
-1506160039 metadata/md5-cache/net-libs/nativebiginteger-0.6.4
+1506171307 metadata/md5-cache/net-libs/nativebiginteger-0.6.4
 1505281123 metadata/md5-cache/net-libs/adns-1.4
 1505281123 metadata/md5-cache/net-libs/libgmail-0.1.11-r1
 1506162107 metadata/md5-cache/net-libs/qxmpp-0.7.6
@@ -54823,6 +54765,7 @@
 1505281123 metadata/md5-cache/net-libs/ortp-0.22.0
 1505281123 metadata/md5-cache/net-libs/libmbim-1.10.0
 1505281123 metadata/md5-cache/net-libs/obby-0.4.8
+1506180736 metadata/md5-cache/net-libs/vanessa-socket-0.0.13
 1506062336 metadata/md5-cache/net-libs/cppzmq-0_pre150606
 1506071607 metadata/md5-cache/net-libs/libcapi-3.0.7-r1
 1506030738 metadata/md5-cache/net-libs/liboping-1.8.0
@@ -54833,7 +54776,7 @@
 1506091336 metadata/md5-cache/net-libs/gtk-vnc-0.5.3
 1506151737 metadata/md5-cache/net-libs/libkolab-0.5.3
 1505281123 metadata/md5-cache/net-libs/libpcapnav-0.8
-1506160039 metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
+1506171307 metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
 1505281123 metadata/md5-cache/net-libs/rest-0.7.93
 1211091747 metadata/md5-cache/net-libs/libident-0.32
 1505071806 metadata/md5-cache/net-libs/libblkmaker-0.5.0
@@ -54998,12 +54941,11 @@
 1505281123 metadata/md5-cache/net-libs/telepathy-farstream-0.6.2
 1505281123 metadata/md5-cache/net-libs/libsmi-0.4.8-r1
 1506071607 metadata/md5-cache/net-libs/libgadu-1.12.0
-1506170007 metadata/md5-cache/net-libs/gnutls-3.4.2
 1506160039 metadata/md5-cache/net-libs/opal-3.12.4
 1506030738 metadata/md5-cache/net-libs/libosip-3.6.0
 1506030738 metadata/md5-cache/net-libs/gnutls-3.3.12
 1506030738 metadata/md5-cache/net-libs/libsoup-gnome-2.46.0-r1
-1505281123 metadata/md5-cache/net-libs/nghttp2-9999
+1506172106 metadata/md5-cache/net-libs/nghttp2-9999
 1506151737 metadata/md5-cache/net-libs/libkolab-0.5.2
 1506090136 metadata/md5-cache/net-libs/phodav-2.0-r1
 1505281123 metadata/md5-cache/net-libs/rabbitmq-c-0.3.0
@@ -55569,10 +55511,10 @@
 1505281124 metadata/md5-cache/sci-biology/iqpnni-3.3.1
 1505281124 metadata/md5-cache/sci-biology/foldingathome-7.4.4
 1506071607 metadata/md5-cache/sci-biology/cufflinks-1.3.0-r1
-1506160039 metadata/md5-cache/sci-biology/goby-1.9.8.1
+1506171307 metadata/md5-cache/sci-biology/goby-1.9.8.1
 1505281124 metadata/md5-cache/sci-biology/velvet-1.0.18-r1
 1506071607 metadata/md5-cache/sci-biology/embassy-mse-3.0.0.650
-1506160039 metadata/md5-cache/sci-biology/beast-mcmc-1.5.2
+1506171307 metadata/md5-cache/sci-biology/beast-mcmc-1.5.2
 1505281124 metadata/md5-cache/sci-biology/embassy-domsearch-0.1.0-r3
 1211091749 metadata/md5-cache/sci-biology/kalign-2.03
 1506071607 metadata/md5-cache/sci-biology/tophat-2.0.9
@@ -55585,7 +55527,7 @@
 1505281124 metadata/md5-cache/sci-biology/lagan-2.0-r1
 1505281124 metadata/md5-cache/sci-biology/primer3-2.3.5
 1505281124 metadata/md5-cache/sci-biology/recon-1.06-r1
-1506160039 metadata/md5-cache/sci-biology/beast-mcmc-9999
+1506171307 metadata/md5-cache/sci-biology/beast-mcmc-9999
 1505281124 metadata/md5-cache/sci-biology/trf-4.04
 1505281124 metadata/md5-cache/sci-biology/embassy-iprscan-4.3.1
 1506071607 metadata/md5-cache/sci-biology/tophat-2.0.8
@@ -55636,7 +55578,7 @@
 1211091749 metadata/md5-cache/sci-biology/prosite-20.36
 1505281124 metadata/md5-cache/sci-biology/phylip-3.69-r1
 1211091749 metadata/md5-cache/sci-biology/phred-071220
-1506160039 metadata/md5-cache/sci-biology/picard-1.103
+1506171307 metadata/md5-cache/sci-biology/picard-1.103
 1506071607 metadata/md5-cache/sci-biology/embassy-signature-0.1.650
 1505281124 metadata/md5-cache/sci-biology/paml-4.4c-r1
 1505281124 metadata/md5-cache/sci-biology/blat-34
@@ -55693,7 +55635,7 @@
 1506071607 metadata/md5-cache/sci-biology/embassy-cbstools-1.0.0.650
 1506071607 metadata/md5-cache/sci-biology/abyss-1.3.6
 1505281124 metadata/md5-cache/sci-biology/embassy-mse-1.0.0-r6
-1506160039 metadata/md5-cache/sci-biology/mauve-9999
+1506171307 metadata/md5-cache/sci-biology/mauve-9999
 1505281124 metadata/md5-cache/sci-biology/seqan-1.3.1-r1
 1505281124 metadata/md5-cache/sci-biology/embassy-esim4-1.0.0-r5
 1506132237 metadata/md5-cache/sci-biology/bioperl-run-1.6.9
@@ -55714,7 +55656,7 @@
 1506030739 metadata/md5-cache/sci-biology/maq-0.7.1-r1
 1506161206 metadata/md5-cache/sci-biology/rmblast-1.2-r1
 1505281124 metadata/md5-cache/sci-biology/elph-0.1.5
-1506160039 metadata/md5-cache/sci-biology/goby-1.9.7.3
+1506171307 metadata/md5-cache/sci-biology/goby-1.9.7.3
 1506030739 metadata/md5-cache/sci-biology/goby-cpp-1.9.8.1
 1506132237 metadata/md5-cache/sci-biology/bioperl-db-1.6.9
 1505281124 metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
@@ -55751,7 +55693,7 @@
 1505281124 metadata/md5-cache/sci-biology/psipred-3.2
 1506030739 metadata/md5-cache/sci-biology/allpathslg-47093
 1505281124 metadata/md5-cache/sci-biology/embassy-memenew-0.1.0-r1
-1506160039 metadata/md5-cache/sci-biology/gatk-9999
+1506171307 metadata/md5-cache/sci-biology/gatk-9999
 1506030739 metadata/md5-cache/sci-biology/eugene-4.1
 1505281124 metadata/md5-cache/sci-biology/arb-5.1-r1
 1211091749 metadata/md5-cache/sci-biology/maq-0.7.1
@@ -55786,7 +55728,7 @@
 1505281124 metadata/md5-cache/sci-biology/mummer-3.20
 1506160039 metadata/md5-cache/sci-biology/amap-2.2-r2
 1312061706 metadata/md5-cache/sci-biology/samtools-0.1.12
-1506160039 metadata/md5-cache/sci-biology/gatk-2.4
+1506171307 metadata/md5-cache/sci-biology/gatk-2.4
 1506030739 metadata/md5-cache/sci-biology/goby-cpp-1.9.7.3
 1505281124 metadata/md5-cache/sci-biology/wgs-assembler-7.0
 1505281124 metadata/md5-cache/sci-biology/express-0.9.5-r1
@@ -55795,10 +55737,10 @@
 1505281124 metadata/md5-cache/sci-biology/trnascan-se-1.23-r2
 1505281124 metadata/md5-cache/sci-biology/profphd-1.0.39
 1211091749 metadata/md5-cache/sci-biology/gmap-2011.10.07
-1506160039 metadata/md5-cache/sci-biology/beast-mcmc-1.7.5
+1506171307 metadata/md5-cache/sci-biology/beast-mcmc-1.7.5
 1506030739 metadata/md5-cache/sci-biology/mammoth-1.0-r1
 1505281124 metadata/md5-cache/sci-biology/embassy-structure-0.1.0-r3
-1506160039 metadata/md5-cache/sci-biology/readseq-20100513
+1506171307 metadata/md5-cache/sci-biology/readseq-20100513
 1505281124 metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
 1505281124 metadata/md5-cache/sci-biology/kalign-2.03-r1
 1211091749 metadata/md5-cache/sci-biology/prosite-19.36
@@ -55832,7 +55774,7 @@
 1505281124 metadata/md5-cache/sci-biology/njplot-2.3-r1
 1506071607 metadata/md5-cache/sci-biology/tophat-2.0.0
 1211091749 metadata/md5-cache/sci-biology/yass-1.14
-1506160039 metadata/md5-cache/sci-biology/readseq-20080420-r1
+1506171307 metadata/md5-cache/sci-biology/readseq-20080420-r1
 1503290106 metadata/md5-cache/sci-biology/cutg-160-r1
 1506071607 metadata/md5-cache/sci-biology/cufflinks-2.2.1-r1
 1506111937 metadata/md5-cache/kde-plasma/kinfocenter-5.3.1
@@ -56035,7 +55977,7 @@
 1505020536 metadata/md5-cache/dev-php/awl-0.55-r1
 1505281113 metadata/md5-cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2
 1505281113 metadata/md5-cache/dev-php/PEAR-SOAP-0.13.0
-1505281113 metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4
+1506172137 metadata/md5-cache/dev-php/PEAR-PEAR-1.9.4
 1505281113 metadata/md5-cache/dev-php/PEAR-Net_CheckIP-1.2.2
 1505281113 metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4
 1505281113 metadata/md5-cache/dev-php/Savant3-Plugin-Form-0.2.1
@@ -56071,7 +56013,6 @@
 1506030737 metadata/md5-cache/dev-php/pecl-ps-1.3.7
 1505281113 metadata/md5-cache/dev-php/twig-1.16.3
 1505281113 metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.4.7
-1505281113 metadata/md5-cache/dev-php/adodb-5.17-r1
 1505281113 metadata/md5-cache/dev-php/PEAR-Log-1.12.8
 1505281113 metadata/md5-cache/dev-php/twig-1.12.3
 1408110136 metadata/md5-cache/dev-php/simpletest-1.1.0
@@ -56115,7 +56056,7 @@
 1506030737 metadata/md5-cache/dev-php/pecl-memcache-3.0.8
 1211091739 metadata/md5-cache/dev-php/mmslib-0.97
 1505281113 metadata/md5-cache/dev-php/agavi-1.0.7
-1506111036 metadata/md5-cache/dev-php/suhosin-0.9.38
+1506171207 metadata/md5-cache/dev-php/suhosin-0.9.38
 1506030737 metadata/md5-cache/dev-php/pecl-haru-1.0.4-r1
 1501141936 metadata/md5-cache/dev-php/pear-1.9.4
 1506030737 metadata/md5-cache/dev-php/xdebug-2.2.6
@@ -56173,7 +56114,7 @@
 1505281113 metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.5.0_rc4
 1505281113 metadata/md5-cache/dev-php/PEAR-Crypt_HMAC2-1.0.0
 1505281113 metadata/md5-cache/dev-php/PEAR-Net_FTP-1.3.7-r1
-1505281113 metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5
+1506172136 metadata/md5-cache/dev-php/PEAR-PEAR-1.9.5
 1505281113 metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
 1506030737 metadata/md5-cache/dev-php/pecl-taint-1.2.2-r1
 1506030737 metadata/md5-cache/dev-php/pecl-cairo-0.3.2
@@ -56207,7 +56148,7 @@
 1505281113 metadata/md5-cache/dev-php/PEAR-File_Gettext-0.4.2
 1505281113 metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10
 1408110136 metadata/md5-cache/dev-php/smarty-docs-3.0
-1505281113 metadata/md5-cache/dev-php/ZendFramework-1.12.9
+1506172336 metadata/md5-cache/dev-php/ZendFramework-1.12.9
 1505281113 metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2
 1505281113 metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r1
 1505281118 metadata/md5-cache/games-board/gnuchess-book-1.02
@@ -56221,7 +56162,7 @@
 1505281118 metadata/md5-cache/games-board/xskat-4.0
 1506030737 metadata/md5-cache/games-board/gnugo-3.9.1-r1
 1505281118 metadata/md5-cache/games-board/gtkatlantic-0.5.0
-1506160039 metadata/md5-cache/games-board/megamek-0.34.10
+1506171307 metadata/md5-cache/games-board/megamek-0.34.10
 1505281118 metadata/md5-cache/games-board/grhino-0.16.1
 1505281118 metadata/md5-cache/games-board/natch-2.4
 1505281118 metadata/md5-cache/games-board/mt_gtk_client-0.1.98
@@ -56259,7 +56200,7 @@
 1506030737 metadata/md5-cache/games-board/gmchess-0.29.6-r1
 1506030737 metadata/md5-cache/games-board/ascal-0.1.1
 1506091336 metadata/md5-cache/games-board/gnome-chess-3.14.3
-1506160039 metadata/md5-cache/games-board/domination-1.1.1.5
+1506171307 metadata/md5-cache/games-board/domination-1.1.1.5
 1505281118 metadata/md5-cache/games-board/hexxagon-1.0.2
 1505281118 metadata/md5-cache/games-board/gambit-1.0.3
 1502071906 metadata/md5-cache/games-board/stockfish-6-r1
@@ -56475,7 +56416,7 @@
 1505281117 metadata/md5-cache/dev-util/as11-1.0
 1211160136 metadata/md5-cache/dev-util/obs-service-meta-1
 1506132237 metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
-1506160039 metadata/md5-cache/dev-util/netbeans-8.0.2
+1506171307 metadata/md5-cache/dev-util/netbeans-8.0.2
 1406031536 metadata/md5-cache/dev-util/cloc-1.60
 1505281117 metadata/md5-cache/dev-util/pycharm-community-4.0.5
 1506021106 metadata/md5-cache/dev-util/perf-3.12
@@ -56511,7 +56452,7 @@
 1506030737 metadata/md5-cache/dev-util/valgrind-3.9.0
 1505281117 metadata/md5-cache/dev-util/glade-3.8.5
 1505281117 metadata/md5-cache/dev-util/makepp-2.0.98.5
-1506160039 metadata/md5-cache/dev-util/jconfig-2.8-r2
+1506171307 metadata/md5-cache/dev-util/jconfig-2.8-r2
 1505281117 metadata/md5-cache/dev-util/cppunit-1.13.2-r2
 1506142006 metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
 1505281117 metadata/md5-cache/dev-util/shelltestrunner-1.3.4
@@ -56536,10 +56477,10 @@
 1505281117 metadata/md5-cache/dev-util/geany-1.23.1
 1307242006 metadata/md5-cache/dev-util/android-ndk-8e
 1505281117 metadata/md5-cache/dev-util/debootstrap-1.0.67
-1506160039 metadata/md5-cache/dev-util/jarwizard-2.50
+1506171307 metadata/md5-cache/dev-util/jarwizard-2.50
 1506030737 metadata/md5-cache/dev-util/febootstrap-2.11
 1505281117 metadata/md5-cache/dev-util/buildbot-slave-9999
-1506160039 metadata/md5-cache/dev-util/argouml-0.34
+1506171307 metadata/md5-cache/dev-util/argouml-0.34
 1211091741 metadata/md5-cache/dev-util/ald-0.1.7
 1212170306 metadata/md5-cache/dev-util/cpuinfo-collection-20060720
 1505281117 metadata/md5-cache/dev-util/rats-2.3
@@ -56561,7 +56502,7 @@
 1506071606 metadata/md5-cache/dev-util/difffilter-0.3.1
 1505281117 metadata/md5-cache/dev-util/cutils-1.6-r4
 1505281117 metadata/md5-cache/dev-util/makeheaders-0_p4
-1506160039 metadata/md5-cache/dev-util/pmd-4.2.5
+1506171307 metadata/md5-cache/dev-util/pmd-4.2.5
 1311021206 metadata/md5-cache/dev-util/kup-0.3.4
 1505281117 metadata/md5-cache/dev-util/debugedit-4.4.6
 1506021106 metadata/md5-cache/dev-util/exmap-0.10
@@ -56577,8 +56518,8 @@
 1505281117 metadata/md5-cache/dev-util/mingw64-runtime-2.0.8
 1505281117 metadata/md5-cache/dev-util/boost-build-1.52.0-r1
 1506101336 metadata/md5-cache/dev-util/jenkins-bin-1.617
-1506160039 metadata/md5-cache/dev-util/checkstyle-5.5
-1506160039 metadata/md5-cache/dev-util/visualvm-1.3.8-r1
+1506171307 metadata/md5-cache/dev-util/checkstyle-5.5
+1506171307 metadata/md5-cache/dev-util/visualvm-1.3.8-r1
 1505281117 metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
 1505281117 metadata/md5-cache/dev-util/boost-build-1.57.0
 1505281117 metadata/md5-cache/dev-util/shunit2-2.1.6
@@ -56634,7 +56575,7 @@
 1505281117 metadata/md5-cache/dev-util/bustle-0.2.3
 1505281117 metadata/md5-cache/dev-util/quilt-0.63
 1505281117 metadata/md5-cache/dev-util/apitrace-4.0
-1506160039 metadata/md5-cache/dev-util/weka-3.6.6-r1
+1506171307 metadata/md5-cache/dev-util/weka-3.6.6-r1
 1506021106 metadata/md5-cache/dev-util/fatrace-0.5
 1505281117 metadata/md5-cache/dev-util/crash-7.0.3
 1505281117 metadata/md5-cache/dev-util/gnome-devel-docs-3.14.4
@@ -56651,7 +56592,7 @@
 1505281117 metadata/md5-cache/dev-util/shellcheck-0.3.5-r1
 1505281117 metadata/md5-cache/dev-util/buildbot-0.8.10
 1306251406 metadata/md5-cache/dev-util/obs-service-source_validator-0.3
-1506160039 metadata/md5-cache/dev-util/jif-3.1_rc1
+1506171307 metadata/md5-cache/dev-util/jif-3.1_rc1
 1506030737 metadata/md5-cache/dev-util/kbuild-0.1.9998_pre20120806
 1505281117 metadata/md5-cache/dev-util/pkgconf-0.9.6
 1505281117 metadata/md5-cache/dev-util/debugedit-4.4.6-r2
@@ -56690,16 +56631,16 @@
 1505281117 metadata/md5-cache/dev-util/include-what-you-use-3.3-r1
 1505281117 metadata/md5-cache/dev-util/gtk-doc-am-1.21
 1506162106 metadata/md5-cache/dev-util/beediff-1.9
-1506160039 metadata/md5-cache/dev-util/jconfig-2.8.5
+1506171307 metadata/md5-cache/dev-util/jconfig-2.8.5
 1505281117 metadata/md5-cache/dev-util/ccache-3.1.10
 1506160039 metadata/md5-cache/dev-util/cucumber-rails-1.4.1
 1506151736 metadata/md5-cache/dev-util/kdevplatform-1.6.0-r1
-1506160039 metadata/md5-cache/dev-util/bluej-3.1.1
+1506171307 metadata/md5-cache/dev-util/bluej-3.1.1
 1505281117 metadata/md5-cache/dev-util/xmlindent-0.2.17-r1
-1506160039 metadata/md5-cache/dev-util/checkstyle-4.4
+1506171307 metadata/md5-cache/dev-util/checkstyle-4.4
 1505281117 metadata/md5-cache/dev-util/dejagnu-1.4.4-r2
 1506030737 metadata/md5-cache/dev-util/xfce4-dev-tools-4.10.0
-1506160039 metadata/md5-cache/dev-util/jconfig-2.8-r3
+1506171307 metadata/md5-cache/dev-util/jconfig-2.8-r3
 1506151736 metadata/md5-cache/dev-util/kdevelop-php-1.7.1
 1506030737 metadata/md5-cache/dev-util/global-6.3.1
 1506030737 metadata/md5-cache/dev-util/ltrace-0.7.3
@@ -56728,7 +56669,7 @@
 1505281117 metadata/md5-cache/dev-util/plan9port-20140304
 1506030737 metadata/md5-cache/dev-util/mingw64-runtime-4.0.1
 1506021106 metadata/md5-cache/dev-util/sysdig-0.1.98
-1506160039 metadata/md5-cache/dev-util/findbugs-3.0.1
+1506171307 metadata/md5-cache/dev-util/findbugs-3.0.1
 1407302106 metadata/md5-cache/dev-util/ext4_utils-4.4.4.1
 1505281117 metadata/md5-cache/dev-util/catfish-1.2.2
 1506110006 metadata/md5-cache/dev-util/include-what-you-use-3.6
@@ -56770,7 +56711,7 @@
 1505281117 metadata/md5-cache/dev-util/vdkbuilder-2.4.0
 1505281117 metadata/md5-cache/dev-util/eric-4.5.25-r1
 1506121936 metadata/md5-cache/dev-util/rbtools-0.7.4
-1506160039 metadata/md5-cache/dev-util/jconfig-2.9
+1506171307 metadata/md5-cache/dev-util/jconfig-2.9
 1505281117 metadata/md5-cache/dev-util/lcov-1.9-r1
 1505281117 metadata/md5-cache/dev-util/coccigrep-1.10
 1505281117 metadata/md5-cache/dev-util/cpptest-1.1.2
@@ -56879,10 +56820,10 @@
 1505281117 metadata/md5-cache/dev-util/strace-4.9
 1311021436 metadata/md5-cache/dev-util/obs-service-rearchive-20130802
 1505281117 metadata/md5-cache/dev-util/cmt-1.26
-1506160039 metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
+1506171307 metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
 1401180806 metadata/md5-cache/dev-util/creduce-2.1.0
-1506160039 metadata/md5-cache/dev-util/fujaba-4.2.0
-1506160039 metadata/md5-cache/dev-util/antlrworks-1.2.3
+1506171307 metadata/md5-cache/dev-util/fujaba-4.2.0
+1506171307 metadata/md5-cache/dev-util/antlrworks-1.2.3
 1506021106 metadata/md5-cache/dev-util/fatrace-0.4
 1505281117 metadata/md5-cache/dev-util/sel-0.08.4-r1
 1505281117 metadata/md5-cache/dev-util/bustle-0.4.0
@@ -56916,7 +56857,7 @@
 1505281117 metadata/md5-cache/dev-util/igprof-5.9.11
 1506030737 metadata/md5-cache/dev-util/regexxer-0.10
 1506021106 metadata/md5-cache/dev-util/fatrace-0.9
-1506160039 metadata/md5-cache/dev-util/checkstyle-5.4
+1506171307 metadata/md5-cache/dev-util/checkstyle-5.4
 1506021106 metadata/md5-cache/dev-util/lttng-tools-2.5.0
 1505281117 metadata/md5-cache/dev-util/uncrustify-0.61
 1505281117 metadata/md5-cache/dev-util/skipfish-2.10_beta
@@ -56948,6 +56889,7 @@
 1505281117 metadata/md5-cache/dev-util/mutrace-0.2
 1211091741 metadata/md5-cache/dev-util/appinventor-1.1
 1506071606 metadata/md5-cache/dev-util/google-perftools-2.0-r2
+1506171136 metadata/md5-cache/dev-util/radare2-0.9.9
 1505281117 metadata/md5-cache/dev-util/ccache-3.1.9-r3
 1506030737 metadata/md5-cache/dev-util/bitcoin-tx-0.10.0
 1506111836 metadata/md5-cache/dev-util/lcov-1.11
@@ -56985,7 +56927,7 @@
 1505281117 metadata/md5-cache/dev-util/bam-0.4.0-r1
 1506071606 metadata/md5-cache/dev-util/squashdelta-0.1
 1505281117 metadata/md5-cache/dev-util/debugedit-4.4.6-r1
-1505281117 metadata/md5-cache/dev-util/shellcheck-0.3.6
+1506171236 metadata/md5-cache/dev-util/shellcheck-0.3.6
 1506160039 metadata/md5-cache/dev-util/astyle-2.04
 1505281117 metadata/md5-cache/dev-util/visual-regexp-3.1
 1505281117 metadata/md5-cache/dev-util/ninja-ide-2.2
@@ -57004,6 +56946,7 @@
 1406232036 metadata/md5-cache/dev-util/abi-compliance-checker-1.99.9
 1505281117 metadata/md5-cache/dev-util/cppunit-1.13.1
 1506030737 metadata/md5-cache/dev-util/bless-0.6.0-r2
+1506171406 metadata/md5-cache/dev-util/android-studio-1.2.2.0.141.1980579
 1505281117 metadata/md5-cache/dev-util/bustle-0.4.7-r1
 1212041306 metadata/md5-cache/dev-util/rpmdevtools-8.3
 1506021106 metadata/md5-cache/dev-util/dropwatch-1.4
@@ -57090,7 +57033,7 @@
 1505281117 metadata/md5-cache/dev-util/catalyst-2.9999
 1505281117 metadata/md5-cache/dev-util/idutils-4.2
 1506132237 metadata/md5-cache/dev-util/autodia-2.140.0-r1
-1506030737 metadata/md5-cache/dev-util/cunit-2.1_p2-r1
+1506172136 metadata/md5-cache/dev-util/cunit-2.1_p2-r1
 1506071606 metadata/md5-cache/dev-util/squashdelta-9999
 1505281117 metadata/md5-cache/dev-util/rootstrap-0.3.24
 1506091806 metadata/md5-cache/dev-util/dogtail-0.9.0-r2
@@ -57113,7 +57056,7 @@
 1505281117 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.19
 1505281117 metadata/md5-cache/dev-util/crash-7.0.0
 1406250907 metadata/md5-cache/dev-util/byacc-20140527
-1506160039 metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1
+1506171307 metadata/md5-cache/dev-util/eclipse-sdk-3.5.1-r1
 1505281117 metadata/md5-cache/dev-util/pkgcheck-9999
 1505281117 metadata/md5-cache/dev-util/rebar-2.3.1
 1505281117 metadata/md5-cache/dev-util/colorgcc-1.3.2-r5
@@ -57191,7 +57134,7 @@
 1506131336 metadata/md5-cache/app-office/abiword-3.0.1
 1505281108 metadata/md5-cache/app-office/taskcoach-1.3.32-r1
 1506151736 metadata/md5-cache/app-office/kmymoney-4.7.1
-1506160036 metadata/md5-cache/app-office/borg-1.7.4-r2
+1506171306 metadata/md5-cache/app-office/borg-1.7.4-r2
 1506071806 metadata/md5-cache/app-office/gnucash-2.6.6
 1505281108 metadata/md5-cache/app-office/dia2code-0.8.7
 1505281108 metadata/md5-cache/app-office/taskcoach-1.3.32
@@ -57247,10 +57190,11 @@
 1502121636 metadata/md5-cache/app-office/geierlein-0.7.3
 1505281108 metadata/md5-cache/app-office/taskcoach-1.3.27
 1506030736 metadata/md5-cache/app-office/gnucash-2.6.5
-1506160036 metadata/md5-cache/app-office/hourglass-0.7.2
+1506171306 metadata/md5-cache/app-office/hourglass-0.7.2
 1506030736 metadata/md5-cache/app-office/texmacs-1.99.2
 1506071606 metadata/md5-cache/app-office/mdbtools-0.7.1-r1
 1505281108 metadata/md5-cache/app-office/odeskteam-3.6.1
+1506172206 metadata/md5-cache/app-office/wps-office-9.1.0.4961_alpha18_p1
 1506030736 metadata/md5-cache/app-office/texmacs-1.99.1
 1505281108 metadata/md5-cache/app-office/openerp-6.1.1-r1
 1505281108 metadata/md5-cache/app-office/homebank-4.5.6
@@ -57288,7 +57232,7 @@
 1506162106 metadata/md5-cache/app-office/texmaker-4.3
 1505281108 metadata/md5-cache/app-office/wps-office-9.1.0.4953_alpha18-r1
 1506151736 metadata/md5-cache/app-office/skrooge-1.10.0
-1506160036 metadata/md5-cache/app-office/borg-1.7.4-r1
+1506171306 metadata/md5-cache/app-office/borg-1.7.4-r1
 1505281108 metadata/md5-cache/app-office/openerp-7.0.20130219-r5
 1505281108 metadata/md5-cache/app-office/qcharselect-0.3
 1505281108 metadata/md5-cache/app-office/lyx-2.1.3
@@ -57346,7 +57290,7 @@
 1506162106 metadata/md5-cache/app-text/ansifilter-1.11
 1506030736 metadata/md5-cache/app-text/teckit-2.5.1
 1506071606 metadata/md5-cache/app-text/docbook2X-0.8.8-r4
-1506160036 metadata/md5-cache/app-text/trang-20091111-r1
+1506171306 metadata/md5-cache/app-text/trang-20091111-r1
 1506162106 metadata/md5-cache/app-text/qpdfview-0.4.15
 1505281108 metadata/md5-cache/app-text/libetonyek-0.1.1
 1506030736 metadata/md5-cache/app-text/crf++-0.54
@@ -57362,7 +57306,7 @@
 1505281108 metadata/md5-cache/app-text/gv-3.7.3.90
 1503110006 metadata/md5-cache/app-text/scrollkeeper-9999-r1
 1506071606 metadata/md5-cache/app-text/tesseract-3.03_rc1-r1
-1505271636 metadata/md5-cache/app-text/t1utils-1.39
+1506171206 metadata/md5-cache/app-text/t1utils-1.39
 1408102306 metadata/md5-cache/app-text/xml2-0.5
 1505281108 metadata/md5-cache/app-text/epstool-3.08-r1
 1505281108 metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
@@ -57379,7 +57323,7 @@
 1505281109 metadata/md5-cache/app-text/zathura-ps-0.2.2
 1506162106 metadata/md5-cache/app-text/highlight-3.12
 1501261336 metadata/md5-cache/app-text/html-xml-utils-6.8
-1506160036 metadata/md5-cache/app-text/jing-20091111-r2
+1506171306 metadata/md5-cache/app-text/jing-20091111-r2
 1506011606 metadata/md5-cache/app-text/mupdf-1.7a
 1505281108 metadata/md5-cache/app-text/queequeg-0.91
 1505281108 metadata/md5-cache/app-text/fbless-9999
@@ -57422,7 +57366,7 @@
 1505281108 metadata/md5-cache/app-text/tesseract-2.04-r1
 1505281109 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 1505281108 metadata/md5-cache/app-text/getxbook-1.0-r1
-1506160036 metadata/md5-cache/app-text/jmupdf-0.3.0
+1506171306 metadata/md5-cache/app-text/jmupdf-0.3.0
 1505281108 metadata/md5-cache/app-text/libmwaw-0.3.5
 1505281108 metadata/md5-cache/app-text/qpdf-5.1.2
 1505281108 metadata/md5-cache/app-text/libwpd-0.10.0
@@ -57473,7 +57417,7 @@
 1505281108 metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r2
 1505281108 metadata/md5-cache/app-text/groonga-5.0.3
 1506030736 metadata/md5-cache/app-text/opensp-1.5.2-r4
-1506160036 metadata/md5-cache/app-text/epubcheck-1.1
+1506171306 metadata/md5-cache/app-text/epubcheck-1.1
 1504210237 metadata/md5-cache/app-text/xapian-omega-1.3.2
 1505281109 metadata/md5-cache/app-text/wklej-0.2.0
 1505281108 metadata/md5-cache/app-text/discount-2.1.6-r1
@@ -57495,7 +57439,7 @@
 1505281108 metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r2
 1506012306 metadata/md5-cache/app-text/poppler-0.33.0-r1
 1505281108 metadata/md5-cache/app-text/docbook-sgml-dtd-4.4
-1506160036 metadata/md5-cache/app-text/zemberek-server-0.7.1
+1506171306 metadata/md5-cache/app-text/zemberek-server-0.7.1
 1505281109 metadata/md5-cache/app-text/xdvik-22.87
 1506030736 metadata/md5-cache/app-text/libspectre-0.2.6
 1505281108 metadata/md5-cache/app-text/chm2pdf-0.9.1-r1
@@ -57521,7 +57465,7 @@
 1505281108 metadata/md5-cache/app-text/linuxdoc-tools-0.9.68-r1
 1505281108 metadata/md5-cache/app-text/diction-1.13
 1506160036 metadata/md5-cache/app-text/glark-1.10.5-r1
-1506160036 metadata/md5-cache/app-text/jpdftweak-0.9-r1
+1506171306 metadata/md5-cache/app-text/jpdftweak-0.9-r1
 1302261908 metadata/md5-cache/app-text/dbacl-1.14
 1505230206 metadata/md5-cache/app-text/writerperfect-0.9.3
 1505281108 metadata/md5-cache/app-text/pelican-3.5.0
@@ -57542,7 +57486,7 @@
 1506011636 metadata/md5-cache/app-text/zathura-pdf-mupdf-0.2.8
 1502201636 metadata/md5-cache/app-text/bdf2psf-1.104
 1506030736 metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
-1506160036 metadata/md5-cache/app-text/trang-20091111
+1506171306 metadata/md5-cache/app-text/trang-20091111
 1505281109 metadata/md5-cache/app-text/zpspell-0.4.3-r1
 1505281108 metadata/md5-cache/app-text/pandoc-1.12.1
 1505281108 metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
@@ -57631,6 +57575,7 @@
 1505281108 metadata/md5-cache/app-text/pylize-1.3b-r1
 1505281108 metadata/md5-cache/app-text/rnv-1.7.11
 1506030736 metadata/md5-cache/app-text/djview-4.9
+1506180806 metadata/md5-cache/app-text/restview-2.4.0
 1505281108 metadata/md5-cache/app-text/mupdf-1.3_p20140118
 1305081736 metadata/md5-cache/app-text/lcdf-typetools-2.98
 1505281108 metadata/md5-cache/app-text/docbook-sgml-dtd-4.5
@@ -57703,7 +57648,8 @@
 1505281108 metadata/md5-cache/app-text/libwpd-0.9.9
 1505281108 metadata/md5-cache/app-text/flpsed-0.7.2
 1505281108 metadata/md5-cache/app-text/calibre-2.27.0
-1506160036 metadata/md5-cache/app-text/jmupdf-9999
+1506171306 metadata/md5-cache/app-text/jmupdf-9999
+1506171206 metadata/md5-cache/app-text/html-xml-utils-6.9
 1505281108 metadata/md5-cache/app-text/passivetex-1.25
 1506051636 metadata/md5-cache/app-text/llpp-9999
 1502281636 metadata/md5-cache/app-text/t1utils-1.38
@@ -57742,14 +57688,14 @@
 1505281108 metadata/md5-cache/app-text/sigil-0.8.6
 1505281108 metadata/md5-cache/app-text/texlive-core-2013-r3
 1505281108 metadata/md5-cache/app-text/fbreader-0.99.4-r1
-1506160036 metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
+1506171306 metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
 1505281108 metadata/md5-cache/app-text/pdf2djvu-0.7.21
 1505281108 metadata/md5-cache/app-text/dvipsk-5.993_p20130530
 1506030736 metadata/md5-cache/app-text/a2ps-4.14-r3
 1505281108 metadata/md5-cache/app-text/pep-2.8-r1
 1506162106 metadata/md5-cache/app-text/qpdfview-0.4.13-r1
 1506030736 metadata/md5-cache/app-text/libmspub-9999
-1506160036 metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
+1506171306 metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
 1505281108 metadata/md5-cache/app-text/pdf2djvu-0.7.19
 1506030736 metadata/md5-cache/app-text/paps-0.6.8-r1
 1505281108 metadata/md5-cache/app-text/silvercity-0.9.7-r1
@@ -57780,7 +57726,7 @@
 1506030736 metadata/md5-cache/app-text/mecab-0.98
 1503081906 metadata/md5-cache/app-text/writerperfect-0.8.2
 1505281108 metadata/md5-cache/app-text/restview-2.1.1
-1506160036 metadata/md5-cache/app-text/jmupdf-0.4.1
+1506171306 metadata/md5-cache/app-text/jmupdf-0.4.1
 1505281109 metadata/md5-cache/app-text/wklej-0.2.1
 1505281108 metadata/md5-cache/app-text/wgetpaste-2.25-r2
 1408102306 metadata/md5-cache/app-text/xdvipdfmx-0.7.9_p20130530
@@ -57797,7 +57743,7 @@
 1505281108 metadata/md5-cache/app-text/winefish-1.3.3-r1
 1505281108 metadata/md5-cache/app-text/fbreader-0.99.4-r2
 1506071606 metadata/md5-cache/app-text/tesseract-3.03_rc1
-1506160036 metadata/md5-cache/app-text/jabref-2.10-r2
+1506171306 metadata/md5-cache/app-text/jabref-2.10-r2
 1505281109 metadata/md5-cache/app-text/zathura-cb-9999
 1506030736 metadata/md5-cache/app-text/djview-4.10
 1504281036 metadata/md5-cache/app-text/texlive-2013
@@ -57820,13 +57766,13 @@
 1505281108 metadata/md5-cache/app-text/dos2unix-6.0.6
 1410270236 metadata/md5-cache/app-text/unpaper-5.1
 1506030736 metadata/md5-cache/app-text/hunspell-1.3.3
-1505281108 metadata/md5-cache/app-text/refbase-0.9.5
+1506172336 metadata/md5-cache/app-text/refbase-0.9.5
 1506111836 metadata/md5-cache/app-text/dvisvgm-1.8.1
 1505281108 metadata/md5-cache/app-text/calibre-1.20
 1506030736 metadata/md5-cache/app-text/ghostscript-gpl-9.10-r2
 1403051936 metadata/md5-cache/app-text/xmlstarlet-1.5.0
 1505281109 metadata/md5-cache/app-text/xml2doc-20030510-r1
-1506160036 metadata/md5-cache/app-text/jing-20091111-r1
+1506171306 metadata/md5-cache/app-text/jing-20091111-r1
 1506091836 metadata/md5-cache/app-text/yelp-tools-3.16.1
 1505281108 metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1
 1506071606 metadata/md5-cache/app-text/liblangtag-0.5.6
@@ -57837,6 +57783,7 @@
 1505281108 metadata/md5-cache/app-text/htmlinc-1.0_beta1
 1505281108 metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r3
 1505281108 metadata/md5-cache/app-text/blahtexml-0.9
+1506180806 metadata/md5-cache/app-text/xlsx2csv-0.7.2
 1302080206 metadata/md5-cache/app-text/texi2html-5.0-r1
 1505281108 metadata/md5-cache/app-text/referencer-1.2.1
 1505281108 metadata/md5-cache/app-text/pdfshuffler-0.6.0
@@ -57852,7 +57799,7 @@
 1505281108 metadata/md5-cache/app-text/bibutils-4.11
 1505281108 metadata/md5-cache/app-text/mupdf-1.1_p20121127
 1505281108 metadata/md5-cache/app-text/nfoview-1.15.1
-1506160036 metadata/md5-cache/app-text/jabref-bin-2.10
+1506171306 metadata/md5-cache/app-text/jabref-bin-2.10
 1505281108 metadata/md5-cache/app-text/llpp-20_p20140818
 1505281108 metadata/md5-cache/app-text/multitail-6.2.1
 1505281108 metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r1
@@ -57957,6 +57904,7 @@
 1505281123 metadata/md5-cache/net-mail/libdbx-1.0.3
 1505281123 metadata/md5-cache/net-mail/archivemail-0.9.0
 1408110107 metadata/md5-cache/net-mail/spamcup-1.09
+1506180806 metadata/md5-cache/net-mail/libpst-0.6.64
 1505281123 metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
 1505281123 metadata/md5-cache/net-mail/notmuch-0.17
 1505281123 metadata/md5-cache/net-mail/mailfront-0.98
@@ -57964,6 +57912,7 @@
 1506030738 metadata/md5-cache/net-mail/courier-imap-4.16.0
 1506030738 metadata/md5-cache/net-mail/qmailadmin-1.2.16
 1505281123 metadata/md5-cache/net-mail/asmail-2.1
+1506180336 metadata/md5-cache/net-mail/mlmmj-1.2.19.0
 1505281123 metadata/md5-cache/net-mail/mu-0.9.9
 1505281123 metadata/md5-cache/net-mail/dot-forward-0.71-r2
 1505281123 metadata/md5-cache/net-mail/dbmail-3.2.2
@@ -58000,7 +57949,7 @@
 1505281123 metadata/md5-cache/net-mail/fastforward-0.51-r1
 1506030738 metadata/md5-cache/net-mail/libpst-0.6.58
 1408110107 metadata/md5-cache/net-mail/email-3.1.2
-1506160039 metadata/md5-cache/net-mail/Freemail-9999
+1506171307 metadata/md5-cache/net-mail/Freemail-9999
 1505281123 metadata/md5-cache/net-mail/mboxgrep-0.7.9-r1
 1505281123 metadata/md5-cache/net-mail/qpopper-4.1.0
 1211091747 metadata/md5-cache/net-mail/pop-before-smtp-1.42
@@ -60558,15 +60507,14 @@
 1505281126 metadata/md5-cache/sec-policy/selinux-wireshark-2.20141203-r3
 1505281125 metadata/md5-cache/sec-policy/selinux-mcelog-2.20141203-r4
 1506160039 metadata/md5-cache/www-servers/thin-1.6.3-r1
-1505281128 metadata/md5-cache/www-servers/monkeyd-1.5.3
-1506160039 metadata/md5-cache/www-servers/tomcat-8.0.23-r1
-1505281128 metadata/md5-cache/www-servers/monkeyd-1.5.6
-1506160039 metadata/md5-cache/www-servers/resin-4.0.25
+1506172337 metadata/md5-cache/www-servers/monkeyd-1.5.3
+1506171308 metadata/md5-cache/www-servers/tomcat-8.0.23-r1
+1506171308 metadata/md5-cache/www-servers/resin-4.0.25
 1406072206 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4
 1505281128 metadata/md5-cache/www-servers/tornado-4.0.2
 1212080306 metadata/md5-cache/www-servers/spawn-fcgi-1.6.3-r1
 1505281128 metadata/md5-cache/www-servers/tornado-3.2
-1505281128 metadata/md5-cache/www-servers/monkeyd-1.5.5
+1506172337 metadata/md5-cache/www-servers/monkeyd-1.5.5
 1506030739 metadata/md5-cache/www-servers/thttpd-2.27.0
 1505281128 metadata/md5-cache/www-servers/ocsigenserver-2.2.0
 1505281128 metadata/md5-cache/www-servers/pathod-0.11.1
@@ -60579,18 +60527,18 @@
 1505281128 metadata/md5-cache/www-servers/gunicorn-0.17.4
 1505281128 metadata/md5-cache/www-servers/bozohttpd-20140708
 1506071607 metadata/md5-cache/www-servers/varnish-3.0.6
-1506160039 metadata/md5-cache/www-servers/tomcat-8.0.22-r1
-1506160039 metadata/md5-cache/www-servers/axis-1.4-r2
+1506171308 metadata/md5-cache/www-servers/tomcat-8.0.22-r1
+1506171308 metadata/md5-cache/www-servers/axis-1.4-r2
 1505281128 metadata/md5-cache/www-servers/pound-2.7d
 1506071236 metadata/md5-cache/www-servers/tornado-4.1.0
 1505281128 metadata/md5-cache/www-servers/servefile-0.4.2
-1506160039 metadata/md5-cache/www-servers/tomcat-6.0.44
+1506171308 metadata/md5-cache/www-servers/tomcat-6.0.44
 1505281128 metadata/md5-cache/www-servers/tornado-4.0.1
 1506010736 metadata/md5-cache/www-servers/pathod-0.12.0
 1505281128 metadata/md5-cache/www-servers/tornado-3.1.1
-1506030739 metadata/md5-cache/www-servers/lighttpd-1.4.35-r2
+1506172337 metadata/md5-cache/www-servers/lighttpd-1.4.35-r2
 1506071607 metadata/md5-cache/www-servers/pshs-0.2.6
-1506160039 metadata/md5-cache/www-servers/tomcat-8.0.23
+1506171308 metadata/md5-cache/www-servers/tomcat-8.0.23
 1506071607 metadata/md5-cache/www-servers/varnish-4.0.1-r1
 1505281128 metadata/md5-cache/www-servers/skunkweb-3.4.4
 1506071236 metadata/md5-cache/www-servers/tornado-4.2.0_beta1
@@ -60601,11 +60549,11 @@
 1505281128 metadata/md5-cache/www-servers/boa-0.94.14_rc21-r1
 1506132238 metadata/md5-cache/www-servers/nginx-1.7.6
 1505281128 metadata/md5-cache/www-servers/gunicorn-19.0.0
-1506160039 metadata/md5-cache/www-servers/resin-4.0.26
-1506160039 metadata/md5-cache/www-servers/resin-4.0.22
-1506030739 metadata/md5-cache/www-servers/lighttpd-1.4.35
+1506171308 metadata/md5-cache/www-servers/resin-4.0.26
+1506171308 metadata/md5-cache/www-servers/resin-4.0.22
+1506172337 metadata/md5-cache/www-servers/lighttpd-1.4.35
 1506071607 metadata/md5-cache/www-servers/pshs-0.2
-1506160039 metadata/md5-cache/www-servers/tomcat-7.0.59
+1506171308 metadata/md5-cache/www-servers/tomcat-7.0.59
 1506160039 metadata/md5-cache/www-servers/gorg-0.7.1
 1506030739 metadata/md5-cache/www-servers/thttpd-9999
 1506160039 metadata/md5-cache/www-servers/uwsgi-2.0.10-r1
@@ -60615,9 +60563,9 @@
 1506071607 metadata/md5-cache/www-servers/varnish-4.0.2
 1506071607 metadata/md5-cache/www-servers/pshs-9999
 1505281128 metadata/md5-cache/www-servers/pound-2.6
-1506030739 metadata/md5-cache/www-servers/lighttpd-1.4.35-r1
+1506172337 metadata/md5-cache/www-servers/lighttpd-1.4.35-r1
 1506071236 metadata/md5-cache/www-servers/tornado-4.1.0-r1
-1506160039 metadata/md5-cache/www-servers/tomcat-8.0.22
+1506171308 metadata/md5-cache/www-servers/tomcat-8.0.22
 1506071607 metadata/md5-cache/www-servers/pshs-0.2.3
 1506160039 metadata/md5-cache/www-servers/thin-1.6.3
 1505281128 metadata/md5-cache/www-servers/servefile-0.4.3
@@ -60632,6 +60580,7 @@
 1505281128 metadata/md5-cache/www-servers/ocsigenserver-2.5
 1505281128 metadata/md5-cache/www-servers/tornado-3.2.1
 1505281128 metadata/md5-cache/www-servers/ocsigenserver-2.3.0
+1506180441 metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
 1506072236 metadata/md5-cache/www-servers/apache-2.2.29
 1405121106 metadata/md5-cache/www-servers/spawn-fcgi-1.6.3-r2
 1505281128 metadata/md5-cache/www-servers/hiawatha-9.8
@@ -60639,7 +60588,7 @@
 1505281128 metadata/md5-cache/www-servers/thttpd-2.26.4-r3
 1505281128 metadata/md5-cache/www-servers/fnord-1.11
 1505281128 metadata/md5-cache/www-servers/gunicorn-19.1.1
-1506160039 metadata/md5-cache/www-servers/tomcat-7.0.59-r1
+1506171308 metadata/md5-cache/www-servers/tomcat-7.0.59-r1
 1506072236 metadata/md5-cache/www-servers/apache-2.4.12-r1
 1506160039 metadata/md5-cache/www-servers/gorg-0.7.2
 1505281124 metadata/md5-cache/sci-chemistry/pointless-1.6.14-r1
@@ -60650,7 +60599,6 @@
 1506071607 metadata/md5-cache/sci-chemistry/chemtool-1.6.13
 1505281124 metadata/md5-cache/sci-chemistry/xyza2pipe-20101129
 1505281124 metadata/md5-cache/sci-chemistry/p3d-9999
-1505281124 metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r1
 1505281124 metadata/md5-cache/sci-chemistry/solve-resolve-bin-2.13
 1505281124 metadata/md5-cache/sci-chemistry/ball-1.4.2
 1505281124 metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-1.2.0
@@ -60705,7 +60653,7 @@
 1505281124 metadata/md5-cache/sci-chemistry/molsketch-0.2.0-r1
 1505281124 metadata/md5-cache/sci-chemistry/oasis-4.0-r3
 1505281124 metadata/md5-cache/sci-chemistry/ccpn-2.4.2_p150413
-1506160039 metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
+1506171307 metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
 1505281124 metadata/md5-cache/sci-chemistry/gabedit-2.4.7
 1506030739 metadata/md5-cache/sci-chemistry/ghemical-2.99.2-r2
 1505281124 metadata/md5-cache/sci-chemistry/dssp-2.2.1-r1
@@ -60788,7 +60736,7 @@
 1505281124 metadata/md5-cache/sci-chemistry/xdsi-0.92-r1
 1505281124 metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
 1505281124 metadata/md5-cache/sci-chemistry/ambertools-1.5-r1
-1506160039 metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
+1506171307 metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
 1506071607 metadata/md5-cache/sci-chemistry/numbat-0.999-r1
 1505281124 metadata/md5-cache/sci-chemistry/votca-csg-1.2.4-r1
 1505281124 metadata/md5-cache/sci-chemistry/pymol-plugins-dssp-110430
@@ -60816,7 +60764,7 @@
 1506071607 metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r3
 1505281124 metadata/md5-cache/sci-chemistry/sfcheck-7.03.18-r1
 1506162107 metadata/md5-cache/sci-chemistry/gsim-21.3
-1505281124 metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+1506171806 metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
 1505281124 metadata/md5-cache/sci-chemistry/pymol-1.7.4.0
 1505281124 metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1
 1505281124 metadata/md5-cache/sci-chemistry/votca-csgapps-1.2.4
@@ -62978,7 +62926,7 @@
 1506160038 metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
 1506160037 metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
 1506160038 metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r1
-1506160038 metadata/md5-cache/dev-ruby/rjb-1.5.3
+1506171307 metadata/md5-cache/dev-ruby/rjb-1.5.3
 1506160037 metadata/md5-cache/dev-ruby/bundler-1.7.3
 1506160038 metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
 1506160038 metadata/md5-cache/dev-ruby/psych-2.0.11
@@ -63130,7 +63078,7 @@
 1506160038 metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8
 1506160038 metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
 1506160038 metadata/md5-cache/dev-ruby/sexp_processor-3.2.0-r1
-1506162307 metadata/md5-cache/dev-ruby/rack-1.5.4
+1506171036 metadata/md5-cache/dev-ruby/rack-1.5.4
 1506160037 metadata/md5-cache/dev-ruby/ammeter-1.1.2
 1506160038 metadata/md5-cache/dev-ruby/minitest-5.4.3
 1506160038 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
@@ -63374,7 +63322,7 @@
 1506160038 metadata/md5-cache/dev-ruby/seed-fu-2.2.0
 1506160037 metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
 1506160038 metadata/md5-cache/dev-ruby/facter-2.4.1
-1506160039 metadata/md5-cache/dev-ruby/weakling-0.0.4
+1506171307 metadata/md5-cache/dev-ruby/weakling-0.0.4
 1506160038 metadata/md5-cache/dev-ruby/rest-client-1.8.0
 1506160038 metadata/md5-cache/dev-ruby/letter_opener-1.4.1
 1506160038 metadata/md5-cache/dev-ruby/highline-1.7.2
@@ -63458,7 +63406,7 @@
 1506160038 metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
 1506160038 metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
 1506160038 metadata/md5-cache/dev-ruby/ruby-atk-2.2.2
-1506170036 metadata/md5-cache/dev-ruby/rack-1.4.6
+1506171036 metadata/md5-cache/dev-ruby/rack-1.4.6
 1506160038 metadata/md5-cache/dev-ruby/rqrcode-0.4.2-r1
 1506160038 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.3
 1506160038 metadata/md5-cache/dev-ruby/ruby-gnome2-2.0.2
@@ -63803,7 +63751,7 @@
 1506160038 metadata/md5-cache/dev-ruby/httpauth-0.2.1
 1506160038 metadata/md5-cache/dev-ruby/rspec-its-1.2.0
 1506160038 metadata/md5-cache/dev-ruby/method_source-0.8.2-r2
-1506160037 metadata/md5-cache/dev-ruby/bundler-1.7.13
+1506172306 metadata/md5-cache/dev-ruby/bundler-1.7.13
 1506160038 metadata/md5-cache/dev-ruby/locale-2.1.1
 1506160038 metadata/md5-cache/dev-ruby/ox-2.1.7
 1506160038 metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -64337,7 +64285,7 @@
 1506071606 metadata/md5-cache/dev-tex/chktex-1.7.2
 1505281117 metadata/md5-cache/dev-tex/leaflet-20041222
 1505281117 metadata/md5-cache/dev-tex/csindex-2.11c-r1
-1506160039 metadata/md5-cache/dev-tex/pdfannotextractor-0.1l
+1506171307 metadata/md5-cache/dev-tex/pdfannotextractor-0.1l
 1505281117 metadata/md5-cache/dev-tex/oesch-20080712
 1505281117 metadata/md5-cache/dev-tex/bibtex2html-1.98
 1401020136 metadata/md5-cache/dev-tex/bibtexu-3.71_p20120701
@@ -64519,7 +64467,7 @@
 1506071607 metadata/md5-cache/sci-libs/coinor-flopcpp-1.1.7
 1506071607 metadata/md5-cache/sci-libs/coinor-smi-0.93.4
 1505281124 metadata/md5-cache/sci-libs/ccpn-data-2.3.1_p140425
-1506160039 metadata/md5-cache/sci-libs/naga-2.1
+1506171307 metadata/md5-cache/sci-libs/naga-2.1
 1506030739 metadata/md5-cache/sci-libs/blas-reference-20070226-r2
 1505281124 metadata/md5-cache/sci-libs/Shapely-9999
 1504212106 metadata/md5-cache/sci-libs/fetk-1.5
@@ -64570,7 +64518,7 @@
 1505281124 metadata/md5-cache/sci-libs/armadillo-3.6.2
 1506030739 metadata/md5-cache/sci-libs/camd-2.2.0
 1506160039 metadata/md5-cache/sci-libs/opencascade-6.8.0
-1506160039 metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
+1506171307 metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
 1505281124 metadata/md5-cache/sci-libs/freesteam-2.0
 1506152236 metadata/md5-cache/sci-libs/ipp-7.1.1.117
 1506071607 metadata/md5-cache/sci-libs/netcdf-fortran-4.2
@@ -64829,7 +64777,7 @@
 1505281125 metadata/md5-cache/sci-libs/vtkdata-6.0.0
 1506162107 metadata/md5-cache/sci-libs/liborigin-20100903
 1211091749 metadata/md5-cache/sci-libs/io_lib-1.10.1
-1506160039 metadata/md5-cache/sci-libs/jmol-acme-1.0
+1506171307 metadata/md5-cache/sci-libs/jmol-acme-1.0
 1506160039 metadata/md5-cache/sci-libs/gdal-1.11.1-r2
 1505281125 metadata/md5-cache/sci-libs/pcl-9999
 1505281125 metadata/md5-cache/sci-libs/nemesis-5.24
@@ -64948,7 +64896,8 @@
 1505281120 metadata/md5-cache/media-gfx/paint-mono-0.1.63
 1505281120 metadata/md5-cache/media-gfx/feh-2.12
 1303101806 metadata/md5-cache/media-gfx/splash-themes-gentoo-20101212-r1
-1506160039 metadata/md5-cache/media-gfx/aoi-2.7.2
+1506172206 metadata/md5-cache/media-gfx/potrace-1.12
+1506171307 metadata/md5-cache/media-gfx/aoi-2.7.2
 1505281120 metadata/md5-cache/media-gfx/enblend-4.1.1-r1
 1505281120 metadata/md5-cache/media-gfx/scantailor-0.9.11.1
 1211091744 metadata/md5-cache/media-gfx/igal-2.0
@@ -65161,7 +65110,7 @@
 1506111836 metadata/md5-cache/media-gfx/gifsicle-1.86
 1505281120 metadata/md5-cache/media-gfx/peps-2.0
 1505281120 metadata/md5-cache/media-gfx/gmic-1.6.0.2
-1506160039 metadata/md5-cache/media-gfx/aoi-2.5
+1506171307 metadata/md5-cache/media-gfx/aoi-2.5
 1506071606 metadata/md5-cache/media-gfx/aaphoto-0.43.1
 1506030738 metadata/md5-cache/media-gfx/graphviz-2.26.3-r4
 1505281120 metadata/md5-cache/media-gfx/cptutils-1.52
@@ -65182,7 +65131,7 @@
 1211091745 metadata/md5-cache/media-gfx/qingy-themes-20050816
 1505281120 metadata/md5-cache/media-gfx/mandelbulber-1.21.1
 1505281120 metadata/md5-cache/media-gfx/jpegoptim-1.4.2
-1506160039 metadata/md5-cache/media-gfx/opcion-1.1.1-r2
+1506171307 metadata/md5-cache/media-gfx/opcion-1.1.1-r2
 1506042236 metadata/md5-cache/media-gfx/darktable-1.6.4
 1505281120 metadata/md5-cache/media-gfx/splash-themes-livecd-2007.0-r1
 1505281120 metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
@@ -65233,6 +65182,7 @@
 1211091745 metadata/md5-cache/media-gfx/quat-1.20
 1506030738 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
 1505281120 metadata/md5-cache/media-gfx/dcraw-9.24.4
+1506180137 metadata/md5-cache/media-gfx/darktable-1.6.7
 1506030738 metadata/md5-cache/media-gfx/fontforge-20120731
 1505281120 metadata/md5-cache/media-gfx/splash-themes-livecd-2007.0-r2
 1505281120 metadata/md5-cache/media-gfx/replicatorg-37-r2
@@ -65299,7 +65249,7 @@
 1506030738 metadata/md5-cache/media-gfx/tif22pnm-0.14
 1505281120 metadata/md5-cache/media-gfx/tuxpaint-stamps-20090628
 1505281120 metadata/md5-cache/media-gfx/optipng-0.7.4
-1506160039 metadata/md5-cache/media-gfx/plantuml-7999
+1506171307 metadata/md5-cache/media-gfx/plantuml-7999
 1506030738 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 1506162106 metadata/md5-cache/media-gfx/meshlab-1.3.2
 1506030738 metadata/md5-cache/media-gfx/gnome-specimen-0.4-r1
@@ -65314,7 +65264,7 @@
 1506030738 metadata/md5-cache/media-tv/kodi-14.1
 1506030738 metadata/md5-cache/media-tv/xawtv-3.95-r3
 1502161106 metadata/md5-cache/media-tv/xbmc-9999
-1506160039 metadata/md5-cache/media-tv/tvbrowser-3.4
+1506171307 metadata/md5-cache/media-tv/tvbrowser-3.4
 1505281122 metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7
 1506030738 metadata/md5-cache/media-tv/me-tv-1.4.0.10
 1505281122 metadata/md5-cache/media-tv/dvbtune-0.5-r1
@@ -65342,23 +65292,23 @@
 1505281122 metadata/md5-cache/media-tv/ivtv-utils-1.4.1
 1505281122 metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7.2
 1506030738 metadata/md5-cache/media-tv/kodi-9999
-1506160039 metadata/md5-cache/media-tv/tvbrowser-3.4.1.0
+1506171307 metadata/md5-cache/media-tv/tvbrowser-3.4.1.0
 1506030738 metadata/md5-cache/media-tv/xbmc-13.0_p2
-1505281122 metadata/md5-cache/media-tv/freevo-1.9.0-r1
+1506180537 metadata/md5-cache/media-tv/freevo-1.9.0-r1
 1405011706 metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.09.19
 1505281122 metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.5
-1506160039 metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
+1506171307 metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
 1211091746 metadata/md5-cache/media-tv/dvbstreamer-2.0.0_rc1
 1403021406 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8
 1505281122 metadata/md5-cache/media-tv/mythtv-0.27.4_p20141018
-1506160039 metadata/md5-cache/media-tv/tvbrowser-9999
+1506171307 metadata/md5-cache/media-tv/tvbrowser-9999
 1506030738 metadata/md5-cache/media-tv/xbmc-13.1
 1405011706 metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.07.06-r1
 1505281122 metadata/md5-cache/media-tv/tvnamer-2.3
 1506030738 metadata/md5-cache/media-tv/xbmc-13.2
 1503212206 metadata/md5-cache/media-tv/mythtv-status-0.10.4
 1505281122 metadata/md5-cache/media-tv/mythtv-0.27.4_p20150124
-1506160039 metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1
+1506171307 metadata/md5-cache/media-tv/tvbrowser-3.2.1-r1
 1505281122 metadata/md5-cache/media-tv/tvmovie2vdr-0.5.13
 1505281122 metadata/md5-cache/media-tv/mythtv-0.27_p20140321
 1506021106 metadata/md5-cache/media-tv/tvheadend-9999
@@ -65369,7 +65319,7 @@
 1505281122 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r1
 1506030738 metadata/md5-cache/media-tv/xbmc-12.1-r1
 1404301606 metadata/md5-cache/media-tv/w_scan-20130331
-1505281122 metadata/md5-cache/media-tv/freevo-1.9.0
+1506180537 metadata/md5-cache/media-tv/freevo-1.9.0
 1506021106 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20141109-r1
 1505281122 metadata/md5-cache/media-tv/tvheadend-3.2
 1409271406 metadata/md5-cache/media-tv/w_scan-20140727
@@ -65451,7 +65401,7 @@
 1505281120 metadata/md5-cache/mail-client/sylpheed-3.4.1
 1408110137 metadata/md5-cache/mail-client/clawsker-0.7.10
 1506100436 metadata/md5-cache/mail-client/thunderbird-31.7.0-r1
-1506160039 metadata/md5-cache/net-analyzer/zabbix-2.2.9
+1506172336 metadata/md5-cache/net-analyzer/zabbix-2.2.9
 1506151106 metadata/md5-cache/net-analyzer/graphite-web-0.9.13-r1
 1311060836 metadata/md5-cache/net-analyzer/ifmetric-0.3
 1407122106 metadata/md5-cache/net-analyzer/ibmonitor-1.4
@@ -65619,7 +65569,7 @@
 1505281122 metadata/md5-cache/net-analyzer/icinga2-2.3.3
 1505281122 metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r2
 1505281122 metadata/md5-cache/net-analyzer/openvas-scanner-5.0.3
-1505281122 metadata/md5-cache/net-analyzer/lilac-1.0.3
+1506172336 metadata/md5-cache/net-analyzer/lilac-1.0.3
 1505281122 metadata/md5-cache/net-analyzer/aimsniff-0.9d
 1505281122 metadata/md5-cache/net-analyzer/nagios-check_rbl-1.3.0
 1505281122 metadata/md5-cache/net-analyzer/amap-5.4
@@ -65629,7 +65579,7 @@
 1407110036 metadata/md5-cache/net-analyzer/calamaris-2.59
 1505281122 metadata/md5-cache/net-analyzer/firewalk-5.0-r1
 1505281122 metadata/md5-cache/net-analyzer/ospd-1.0.0
-1505281122 metadata/md5-cache/net-analyzer/nagvis-1.6.6
+1506172336 metadata/md5-cache/net-analyzer/nagvis-1.6.6
 1505281122 metadata/md5-cache/net-analyzer/nmap-6.47-r2
 1506160039 metadata/md5-cache/net-analyzer/munin-2.0.19-r1
 1506030738 metadata/md5-cache/net-analyzer/arping-2.15-r2
@@ -65640,7 +65590,7 @@
 1505281122 metadata/md5-cache/net-analyzer/vnstat-1.14
 1505281122 metadata/md5-cache/net-analyzer/ssmping-0.9.1
 1505281122 metadata/md5-cache/net-analyzer/nagios-sap-ccms-plugin-0.8
-1506162106 metadata/md5-cache/net-analyzer/wireshark-1.12.5
+1506171207 metadata/md5-cache/net-analyzer/wireshark-1.12.5
 1506030738 metadata/md5-cache/net-analyzer/dsniff-2.4_beta1-r8
 1505281122 metadata/md5-cache/net-analyzer/icinga-1.12.2
 1211091746 metadata/md5-cache/net-analyzer/snmptt-1.2
@@ -65653,9 +65603,9 @@
 1505281122 metadata/md5-cache/net-analyzer/webfuzzer-0.2.0-r1
 1505281122 metadata/md5-cache/net-analyzer/tcping-1.3.5
 1505281122 metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r3
-1505281122 metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
+1506172336 metadata/md5-cache/net-analyzer/cacti-0.8.8b-r2
 1505281122 metadata/md5-cache/net-analyzer/iptraf-ng-9999
-1506160039 metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
+1506171307 metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
 1506030738 metadata/md5-cache/net-analyzer/cbm-0.1-r1
 1406060536 metadata/md5-cache/net-analyzer/arp-scan-1.9
 1505281122 metadata/md5-cache/net-analyzer/quidscor-1.2.48-r1
@@ -65780,7 +65730,7 @@
 1506030738 metadata/md5-cache/net-analyzer/tcpstat-1.5-r1
 1505281122 metadata/md5-cache/net-analyzer/w3af-1.1-r1
 1506162106 metadata/md5-cache/net-analyzer/wireshark-99999999
-1506160807 metadata/md5-cache/net-analyzer/cacti-0.8.8d
+1506172336 metadata/md5-cache/net-analyzer/cacti-0.8.8d
 1505281122 metadata/md5-cache/net-analyzer/scapy-2.3.1
 1505281122 metadata/md5-cache/net-analyzer/openvas-cli-1.3.1
 1505281122 metadata/md5-cache/net-analyzer/bsnmp-1.12-r1
@@ -65843,11 +65793,11 @@
 1506030738 metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
 1505281122 metadata/md5-cache/net-analyzer/nessus-bin-4.4.1
 1506071607 metadata/md5-cache/net-analyzer/ssldump-0.9-r2
-1505281122 metadata/md5-cache/net-analyzer/nagtrap-0.1.3
+1506172306 metadata/md5-cache/net-analyzer/nagtrap-0.1.3
 1505281122 metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25
 1506132237 metadata/md5-cache/net-analyzer/net-snmp-5.7.3_pre5-r2
 1311261706 metadata/md5-cache/net-analyzer/snmptt-1.4
-1506160039 metadata/md5-cache/net-analyzer/zabbix-2.4.5
+1506172336 metadata/md5-cache/net-analyzer/zabbix-2.4.5
 1505281122 metadata/md5-cache/net-analyzer/linkchecker-9999
 1505281122 metadata/md5-cache/net-analyzer/netsniff-ng-0.5.9_rc3
 1506030738 metadata/md5-cache/net-analyzer/nstats-0.4-r2
@@ -65890,6 +65840,7 @@
 1505281122 metadata/md5-cache/net-analyzer/hping-3_pre20051105-r3
 1505281122 metadata/md5-cache/net-analyzer/nbwmon-0.5.2
 1411230106 metadata/md5-cache/net-analyzer/nagios-4.0.8
+1506172336 metadata/md5-cache/net-analyzer/icinga2-2.3.5
 1506030738 metadata/md5-cache/net-analyzer/echoping-6.0.2_p434
 1505281122 metadata/md5-cache/net-analyzer/fail2ban-0.9.2
 1506030738 metadata/md5-cache/net-analyzer/nagios-plugins-1.4.16-r3
@@ -65903,7 +65854,7 @@
 1505281122 metadata/md5-cache/net-analyzer/cutter-1.04
 1506030738 metadata/md5-cache/net-analyzer/nfdump-1.6.13
 1505281122 metadata/md5-cache/net-analyzer/thc-ipv6-2.5
-1506160039 metadata/md5-cache/net-analyzer/zabbix-2.2.5
+1506172337 metadata/md5-cache/net-analyzer/zabbix-2.2.5
 1505281122 metadata/md5-cache/net-analyzer/netwox-5.39.0
 1505281122 metadata/md5-cache/net-analyzer/icinga-web-1.10.0-r1
 1505281122 metadata/md5-cache/net-analyzer/ipv6-toolkit-1.4.1
@@ -65958,7 +65909,7 @@
 1506021106 metadata/md5-cache/app-emulation/qemu-2.2.1-r2
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.1.0
 1506021106 metadata/md5-cache/app-emulation/kvm-kmod-3.8
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.3b
 1505281107 metadata/md5-cache/app-emulation/vmware-tools-9.6.2.1744117
 1505281107 metadata/md5-cache/app-emulation/aranym-0.9.16
 1505281107 metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r2
@@ -65982,12 +65933,12 @@
 1505281107 metadata/md5-cache/app-emulation/qemu-guest-agent-1.5.2-r2
 1505281107 metadata/md5-cache/app-emulation/virt-what-1.12
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.0.2
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.1.11
 1506141936 metadata/md5-cache/app-emulation/wine-1.7.9
 1505281107 metadata/md5-cache/app-emulation/qemu-guest-agent-2.3.0
 1505281107 metadata/md5-cache/app-emulation/softgun-0.19
 1506071606 metadata/md5-cache/app-emulation/wine-1.7.44
-1506160036 metadata/md5-cache/app-emulation/edumips64-1.2
+1506171306 metadata/md5-cache/app-emulation/edumips64-1.2
 1506030736 metadata/md5-cache/app-emulation/vice-2.4
 1506142206 metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
 1505281107 metadata/md5-cache/app-emulation/ganeti-instance-image-0.6
@@ -66048,7 +65999,7 @@
 1506141936 metadata/md5-cache/app-emulation/wine-1.6.2
 1505281107 metadata/md5-cache/app-emulation/qtemu-1.0.5
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.0.1
-1506160036 metadata/md5-cache/app-emulation/edumips64-1.1
+1506171306 metadata/md5-cache/app-emulation/edumips64-1.1
 1506031936 metadata/md5-cache/app-emulation/open-vm-tools-2013.09.16.1328054-r3
 1506030736 metadata/md5-cache/app-emulation/fuse-1.1.1
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-9.2.0
@@ -66078,7 +66029,7 @@
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.1.0
 1505281107 metadata/md5-cache/app-emulation/virt-manager-1.1.0-r2
 1505281107 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.12
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.3.0
 1506142006 metadata/md5-cache/app-emulation/crossover-office-bin-6.1.0
 1506030736 metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
 1506030736 metadata/md5-cache/app-emulation/ganeti-2.12.3-r2
@@ -66092,7 +66043,7 @@
 1505281107 metadata/md5-cache/app-emulation/hercules-3.08
 1506141936 metadata/md5-cache/app-emulation/wine-1.7.22
 1505281107 metadata/md5-cache/app-emulation/softgun-0.11
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.1.7-r2
 1506030736 metadata/md5-cache/app-emulation/lxc-1.0.6-r1
 1506142206 metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
 1506030736 metadata/md5-cache/app-emulation/libspectrum-0.5.0.1
@@ -66145,14 +66096,14 @@
 1505281107 metadata/md5-cache/app-emulation/vboxgtk-0.8.2-r1
 1506091336 metadata/md5-cache/app-emulation/libvirt-glib-0.2.0
 1506021106 metadata/md5-cache/app-emulation/open-vm-tools-kmod-9.4.0.1280544
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.4
 1506030736 metadata/md5-cache/app-emulation/ganeti-2.13.0-r2
 1505281107 metadata/md5-cache/app-emulation/vpcs-0.6
 1505281107 metadata/md5-cache/app-emulation/virt-viewer-2.0
 1506141936 metadata/md5-cache/app-emulation/wine-1.7.8
 1506161036 metadata/md5-cache/app-emulation/xen-4.2.5-r11
 1506021106 metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
-1505281107 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
+1506172336 metadata/md5-cache/app-emulation/phpvirtualbox-4.2.7
 1506141936 metadata/md5-cache/app-emulation/wine-1.7.14
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-7.1.0
 1506141836 metadata/md5-cache/app-emulation/crossover-office-pro-bin-6.0.0
@@ -66456,7 +66407,7 @@
 1505281129 metadata/md5-cache/x11-misc/dmenu-9999
 1505281129 metadata/md5-cache/x11-misc/xrmap-2.33-r1
 1505281129 metadata/md5-cache/x11-misc/mixer_app-1.8.0
-1506030740 metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
+1506171207 metadata/md5-cache/x11-misc/x11vnc-0.9.13_p20150111
 1505281129 metadata/md5-cache/x11-misc/xdo-0.4
 1505281129 metadata/md5-cache/x11-misc/x2vnc-1.7.2-r1
 1506030740 metadata/md5-cache/x11-misc/xteddy-2.2
@@ -66725,7 +66676,7 @@
 1506021106 metadata/md5-cache/app-crypt/truecrypt-7.1a
 1506030736 metadata/md5-cache/app-crypt/loop-aes-losetup-2.21
 1505281107 metadata/md5-cache/app-crypt/scl011-bin-2.06
-1506160036 metadata/md5-cache/app-crypt/jacksum-1.7.0
+1506171306 metadata/md5-cache/app-crypt/jacksum-1.7.0
 1506071606 metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
 1409270206 metadata/md5-cache/app-crypt/gpa-0.9.5
 1501301236 metadata/md5-cache/app-crypt/efitools-1.4.1
@@ -66941,6 +66892,7 @@
 1506030739 metadata/md5-cache/sys-fs/gfs2-utils-3.1.2
 1506071607 metadata/md5-cache/sys-fs/snapraid-7.0
 1506021107 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc15
+1506172337 metadata/md5-cache/sys-fs/udev-220-r3
 1505281127 metadata/md5-cache/sys-fs/fuseiso-20070708-r1
 1501302206 metadata/md5-cache/sys-fs/unionfs-fuse-1.0
 1408091636 metadata/md5-cache/sys-fs/genext2fs-1.4.1
@@ -66953,7 +66905,7 @@
 1505281127 metadata/md5-cache/sys-fs/lde-2.6.1
 1211091751 metadata/md5-cache/sys-fs/mtpfs-1.1
 1506030739 metadata/md5-cache/sys-fs/squashfuse-0.1_p20130530
-1506160039 metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
+1506171308 metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
 1506030739 metadata/md5-cache/sys-fs/lvm2-2.02.109
 1505281127 metadata/md5-cache/sys-fs/lufis-0.2
 1505281127 metadata/md5-cache/sys-fs/duperemove-0.09.2
@@ -66979,6 +66931,7 @@
 1505281127 metadata/md5-cache/sys-fs/quotatool-1.4.13
 1506012006 metadata/md5-cache/sys-fs/udev-init-scripts-9999
 1505281127 metadata/md5-cache/sys-fs/go-mtpfs-9999
+1506172306 metadata/md5-cache/sys-fs/owfs-2.7_p21-r4
 1505281127 metadata/md5-cache/sys-fs/dmg2img-1.6.1
 1506030739 metadata/md5-cache/sys-fs/bindfs-1.12.5
 1505281127 metadata/md5-cache/sys-fs/reiserfs-defrag-0.2.2
@@ -66990,6 +66943,7 @@
 1506021107 metadata/md5-cache/sys-fs/vhba-20140928
 1505281127 metadata/md5-cache/sys-fs/pysize-0.2-r1
 1505281127 metadata/md5-cache/sys-fs/btrfs-progs-3.18.2
+1506180736 metadata/md5-cache/sys-fs/avfs-1.0.3
 1506100606 metadata/md5-cache/sys-fs/eudev-1.5.3-r1
 1505281127 metadata/md5-cache/sys-fs/f2fs-tools-1.2.0
 1506142306 metadata/md5-cache/sys-fs/ntfs3g-2014.2.15-r1
@@ -67061,7 +67015,6 @@
 1501181206 metadata/md5-cache/sys-fs/lsscsi-0.28
 1505281127 metadata/md5-cache/sys-fs/xfsdump-3.1.3
 1506030739 metadata/md5-cache/sys-fs/encfs-1.8.1
-1506132238 metadata/md5-cache/sys-fs/owfs-2.7_p21-r3
 1505281127 metadata/md5-cache/sys-fs/mhddfs-0.1.39
 1506021107 metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
 1505281127 metadata/md5-cache/sys-fs/btrfs-progs-3.16.2
@@ -67145,6 +67098,7 @@
 1211091751 metadata/md5-cache/sys-fs/quotatool-1.4.6
 1506021107 metadata/md5-cache/sys-fs/vhba-20130607
 1505281127 metadata/md5-cache/sys-fs/exfat-utils-1.1.0
+1506180736 metadata/md5-cache/sys-fs/fuse-2.9.4
 1505281127 metadata/md5-cache/sys-fs/f2fs-tools-1.3.0
 1506021107 metadata/md5-cache/sys-fs/e4rat-0.2.4_pre20141201
 1505281127 metadata/md5-cache/sys-fs/dfc-3.0.5-r1
@@ -67158,7 +67112,7 @@
 1506021107 metadata/md5-cache/sys-fs/ntfs3g-2014.2.15
 1506021107 metadata/md5-cache/sys-fs/fuse-2.9.3
 1505281127 metadata/md5-cache/sys-fs/unionfs-fuse-0.26
-1506030739 metadata/md5-cache/sys-fs/btrfs-progs-9999
+1506171836 metadata/md5-cache/sys-fs/btrfs-progs-9999
 1506030739 metadata/md5-cache/sys-fs/cryptsetup-1.6.5
 1506071607 metadata/md5-cache/sys-fs/zfs-0.6.0_rc14-r1
 1505281127 metadata/md5-cache/sys-fs/exfat-utils-1.1.1
@@ -67225,7 +67179,7 @@
 1505281127 metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
 1505281127 metadata/md5-cache/sys-fs/davl-1.2.4-r1
 1505281127 metadata/md5-cache/sys-fs/diskdev_cmds-332.14
-1506160039 metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
+1506171308 metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
 1505281127 metadata/md5-cache/sys-fs/exfat-utils-1.0.1
 1505281127 metadata/md5-cache/sys-fs/ext3grep-0.10.2
 1505281127 metadata/md5-cache/sys-fs/mtools-4.0.18
@@ -67253,7 +67207,7 @@
 1505281127 metadata/md5-cache/sys-fs/avfs-1.0.2
 1211091751 metadata/md5-cache/sys-fs/obexfs-0.11
 1506071607 metadata/md5-cache/sys-fs/snapraid-6.2
-1506160039 metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
+1506171308 metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
 1505281127 metadata/md5-cache/sys-fs/traydevice-1.5
 1211091751 metadata/md5-cache/sys-fs/mtpfs-1.0
 1505281127 metadata/md5-cache/sys-fs/s3ql-2.12
@@ -67298,7 +67252,7 @@
 1505301936 metadata/md5-cache/sys-kernel/pf-sources-3.10.1
 1505301936 metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.14
 1505301936 metadata/md5-cache/sys-kernel/pf-sources-3.13.3
-1506070136 metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
+1506172207 metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
 1506100206 metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r6
 1505301936 metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
 1505301936 metadata/md5-cache/sys-kernel/pf-sources-3.7.5
@@ -67476,10 +67430,10 @@
 1505281117 metadata/md5-cache/dev-scheme/gambit-4.6.3
 1505281117 metadata/md5-cache/dev-scheme/scheme48-1.8-r2
 1211091741 metadata/md5-cache/dev-scheme/net-http-0.3.1
-1506160039 metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
+1506171307 metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
 1505281117 metadata/md5-cache/dev-scheme/tinyscheme-1.41
 1505281117 metadata/md5-cache/dev-scheme/scm-5.5.6
-1506160039 metadata/md5-cache/dev-scheme/kawa-1.14
+1506171307 metadata/md5-cache/dev-scheme/kawa-1.14
 1505281117 metadata/md5-cache/dev-scheme/gambit-4.6.5
 1506030737 metadata/md5-cache/dev-scheme/escm-1.1
 1505281117 metadata/md5-cache/dev-scheme/scheme48-1.9.2
@@ -67493,14 +67447,14 @@
 1505281117 metadata/md5-cache/dev-scheme/gambit-4.6.4
 1505281117 metadata/md5-cache/dev-scheme/guile-lib-0.1.6
 1506160039 metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
-1506160039 metadata/md5-cache/dev-scheme/kawa-1.9.1
+1506171307 metadata/md5-cache/dev-scheme/kawa-1.9.1
 1505281117 metadata/md5-cache/dev-scheme/guile-lib-0.1.9
 1506071606 metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
 1505281117 metadata/md5-cache/dev-scheme/guile-www-2.34
 1505281117 metadata/md5-cache/dev-scheme/racket-5.3.2
 1408110137 metadata/md5-cache/dev-scheme/sigscheme-0.8.3
 1505281117 metadata/md5-cache/dev-scheme/racket-6.0.1
-1506160039 metadata/md5-cache/dev-scheme/kawa-1.10
+1506171307 metadata/md5-cache/dev-scheme/kawa-1.10
 1211091741 metadata/md5-cache/dev-scheme/tinyscheme-1.38-r1
 1506030737 metadata/md5-cache/dev-scheme/ikarus-0.0.3_p1870
 1506030737 metadata/md5-cache/dev-scheme/greg-2.0.0
@@ -67524,7 +67478,7 @@
 1505281117 metadata/md5-cache/dev-scheme/guile-lib-0.1.3
 1506131307 metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
 1211091741 metadata/md5-cache/dev-scheme/goosh-1.3
-1506160039 metadata/md5-cache/dev-scheme/jscheme-7.2
+1506171307 metadata/md5-cache/dev-scheme/jscheme-7.2
 1211091741 metadata/md5-cache/dev-scheme/net-http-0.3.1-r1
 1505281117 metadata/md5-cache/dev-scheme/slib-3.2.1
 1505281117 metadata/md5-cache/dev-scheme/guile-2.0.0
@@ -67568,7 +67522,7 @@
 1505281122 metadata/md5-cache/media-video/camorama-0.19-r2
 1504020936 metadata/md5-cache/media-video/movit-1.1.3
 1505281122 metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7
-1506160039 metadata/md5-cache/media-video/google2srt-0.5.3
+1506171307 metadata/md5-cache/media-video/google2srt-0.5.3
 1405030906 metadata/md5-cache/media-video/movit-1.1.1
 1506162106 metadata/md5-cache/media-video/minitube-2.3-r1
 1506021106 metadata/md5-cache/media-video/v4l2loopback-0.8.0
@@ -67633,7 +67587,7 @@
 1505281122 metadata/md5-cache/media-video/transcode-1.1.7-r1
 1506030738 metadata/md5-cache/media-video/cinelerra-20120707
 1505281122 metadata/md5-cache/media-video/cclive-0.9.3-r1
-1506160039 metadata/md5-cache/media-video/google2srt-0.5.6
+1506171307 metadata/md5-cache/media-video/google2srt-0.5.6
 1506162106 metadata/md5-cache/media-video/ffdiaporama-2.1
 1506030738 metadata/md5-cache/media-video/handbrake-0.9.9-r1
 1505281122 metadata/md5-cache/media-video/dvdimagecmp-0.3-r1
@@ -67652,7 +67606,7 @@
 1505281122 metadata/md5-cache/media-video/x264-encoder-9999
 1506142306 metadata/md5-cache/media-video/mplayer-1.2_pre20150214
 1506030738 metadata/md5-cache/media-video/hwdecode-demos-0.9.5
-1506160039 metadata/md5-cache/media-video/aacskeys-0.4.0e
+1506171307 metadata/md5-cache/media-video/aacskeys-0.4.0e
 1506030738 metadata/md5-cache/media-video/xvattr-1.3-r3
 1506030738 metadata/md5-cache/media-video/atomicparsley-wez-0.9.6
 1506151737 metadata/md5-cache/media-video/kaffeine-1.2.2-r1
@@ -67680,7 +67634,7 @@
 1505281122 metadata/md5-cache/media-video/flumotion-0.8.1-r1
 1506151737 metadata/md5-cache/media-video/kplayer-0.7.2-r1
 1505281122 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
-1506160039 metadata/md5-cache/media-video/projectx-0.91.0.10
+1506171307 metadata/md5-cache/media-video/projectx-0.91.0.10
 1506030738 metadata/md5-cache/media-video/parole-0.6.1
 1505281122 metadata/md5-cache/media-video/devede-3.21.0
 1506030738 metadata/md5-cache/media-video/guvcview-2.0.1
@@ -67688,7 +67642,7 @@
 1505281122 metadata/md5-cache/media-video/videotrans-1.6.1
 1505281122 metadata/md5-cache/media-video/ffmpeg2theora-0.29-r2
 1505281122 metadata/md5-cache/media-video/pgcedit-0.8.6
-1506160039 metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
+1506171307 metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
 1506071607 metadata/md5-cache/media-video/aegisub-3.1.2
 1506030738 metadata/md5-cache/media-video/cinelerra-20140710
 1506101136 metadata/md5-cache/media-video/ffmpeg-2.7
@@ -67866,7 +67820,7 @@
 1506021106 metadata/md5-cache/media-video/v4l2loopback-0.6.3-r1
 1505281122 metadata/md5-cache/media-video/mpv-0.9.2-r1
 1505281122 metadata/md5-cache/media-video/dfbsee-0.7.4-r1
-1506160039 metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
+1506171307 metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
 1505281122 metadata/md5-cache/media-video/avidemux-2.6.2-r1
 1505281122 metadata/md5-cache/media-video/mpglen-0.1
 1505281122 metadata/md5-cache/media-video/ushare-1.1a-r6
@@ -67880,7 +67834,7 @@
 1505281122 metadata/md5-cache/media-video/vdrtools-genindex-0.1.3-r1
 1505281122 metadata/md5-cache/media-video/avidemux-2.6.7
 1506030738 metadata/md5-cache/media-video/noad-0.7.3-r1
-1506160039 metadata/md5-cache/media-video/jubler-4.6.1-r3
+1506171307 metadata/md5-cache/media-video/jubler-4.6.1-r3
 1505281122 metadata/md5-cache/media-video/tovid-0.34
 1505281124 metadata/md5-cache/net-voip/telepathy-haze-0.8.0
 1505281124 metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
@@ -68106,7 +68060,7 @@
 1505281126 metadata/md5-cache/sys-apps/razercfg-0.24
 1505281126 metadata/md5-cache/sys-apps/dnotify-0.18.0
 1506030739 metadata/md5-cache/sys-apps/udevil-0.4.3
-1506111736 metadata/md5-cache/sys-apps/hdparm-9.45
+1506172306 metadata/md5-cache/sys-apps/hdparm-9.45
 1505281126 metadata/md5-cache/sys-apps/magneto-core-254
 1505281126 metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1
 1505281126 metadata/md5-cache/sys-apps/install-xattr-0.4
@@ -68274,6 +68228,7 @@
 1505281126 metadata/md5-cache/sys-apps/less-477
 1505281126 metadata/md5-cache/sys-apps/attr-2.4.47-r1
 1505281126 metadata/md5-cache/sys-apps/entropy-server-254
+1506180036 metadata/md5-cache/sys-apps/moreutils-0.56
 1410301236 metadata/md5-cache/sys-apps/systemd-sysv-utils-216
 1505281126 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57
 1506021236 metadata/md5-cache/sys-apps/ethtool-4.0
@@ -68638,7 +68593,7 @@
 1505281120 metadata/md5-cache/mail-mta/mini-qmail-1.06
 1505281120 metadata/md5-cache/mail-mta/courier-0.74.1
 1506122007 metadata/md5-cache/mail-mta/opensmtpd-5.4.6_p1
-1506111736 metadata/md5-cache/mail-mta/postfix-3.0.1-r1
+1506172306 metadata/md5-cache/mail-mta/postfix-3.0.1-r1
 1506151937 metadata/md5-cache/mail-mta/exim-4.86_rc2
 1505281120 metadata/md5-cache/mail-mta/mini-qmail-1.05-r1
 1505281120 metadata/md5-cache/mail-mta/courier-0.74.0
@@ -68758,7 +68713,7 @@
 1503312006 metadata/md5-cache/app-eselect/eselect-lcdfilter-1
 1505281107 metadata/md5-cache/app-eselect/eselect-renpy-0.2
 1505281107 metadata/md5-cache/app-eselect/eselect-gnat-1.4-r1
-1505281107 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
+1506171536 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
 1505281107 metadata/md5-cache/app-eselect/eselect-renpy-0.5
 1506071606 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1
 1503312006 metadata/md5-cache/app-eselect/eselect-pinentry-0.3
@@ -68771,14 +68726,14 @@
 1503312006 metadata/md5-cache/app-eselect/eselect-vdr-0.0.3
 1505281107 metadata/md5-cache/app-eselect/eselect-metasploit-0.16
 1504211436 metadata/md5-cache/app-eselect/eselect-python-20131210
-1506071236 metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
+1506172236 metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
 1505281107 metadata/md5-cache/app-eselect/eselect-opencl-1.1.0
 1505281107 metadata/md5-cache/app-eselect/eselect-pdftex-0.3
 1503312006 metadata/md5-cache/app-eselect/eselect-mesa-0.0.9
 1504211436 metadata/md5-cache/app-eselect/eselect-python-20140125
 1503312006 metadata/md5-cache/app-eselect/eselect-mpg123-0.1
 1503312006 metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
-1505281107 metadata/md5-cache/app-eselect/eselect-opengl-1.2.7
+1506171536 metadata/md5-cache/app-eselect/eselect-opengl-1.2.7
 1505281107 metadata/md5-cache/app-eselect/eselect-mpost-0.1
 1503312006 metadata/md5-cache/app-eselect/eselect-rails-0.18
 1504060006 metadata/md5-cache/app-eselect/eselect-maven-0.2-r1
@@ -68796,7 +68751,6 @@
 1505110006 metadata/md5-cache/app-eselect/eselect-java-0.1.0
 1505281107 metadata/md5-cache/app-eselect/eselect-renpy-0.4
 1503312006 metadata/md5-cache/app-eselect/eselect-awk-0.2
-1505281107 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r2
 1503312006 metadata/md5-cache/app-eselect/eselect-qtgraphicssystem-1.1.1
 1503312006 metadata/md5-cache/app-eselect/eselect-rails-0.21
 1505281107 metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r1
@@ -68863,7 +68817,7 @@
 1505281122 metadata/md5-cache/net-dns/totd-1.5.1
 1505281122 metadata/md5-cache/net-dns/pdns-recursor-3.6.3
 1506092336 metadata/md5-cache/net-dns/pdns-3.3.3
-1505281122 metadata/md5-cache/net-dns/dnsmasq-2.72-r2
+1506172236 metadata/md5-cache/net-dns/dnsmasq-2.72-r2
 1506162106 metadata/md5-cache/net-dns/dnssec-tools-1.14
 1506162106 metadata/md5-cache/net-dns/dnssec-nodes-1.14
 1506162106 metadata/md5-cache/net-dns/dnssec-lookup-1.13
@@ -69002,7 +68956,7 @@
 1505281107 metadata/md5-cache/app-emacs/navi2ch-1.8.3-r1
 1505281107 metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
 1505281107 metadata/md5-cache/app-emacs/ddskk-15.1
-1506160036 metadata/md5-cache/app-emacs/jde-2.4.1
+1506171306 metadata/md5-cache/app-emacs/jde-2.4.1
 1505281107 metadata/md5-cache/app-emacs/haskell-mode-13.07
 1505281107 metadata/md5-cache/app-emacs/ess-15.03.1
 1505281107 metadata/md5-cache/app-emacs/hexrgb-0_p957
@@ -71829,7 +71783,6 @@
 1506030739 metadata/md5-cache/net-proxy/oops-1.5.24_pre20050503-r5
 1505281124 metadata/md5-cache/net-proxy/torsocks-1.2
 1505281124 metadata/md5-cache/net-proxy/c-icap-modules-0.2.4
-1506021106 metadata/md5-cache/net-proxy/sshuttle-0.61-r1
 1505281124 metadata/md5-cache/net-proxy/httpush-0.9_beta11-r1
 1506030739 metadata/md5-cache/net-proxy/squid-3.4.11-r1
 1505281124 metadata/md5-cache/net-proxy/piper-1.14
@@ -71883,7 +71836,7 @@
 1505281124 metadata/md5-cache/net-proxy/wwwoffle-2.9i
 1505281124 metadata/md5-cache/net-proxy/polipo-1.1.1-r1
 1506030739 metadata/md5-cache/net-proxy/dante-1.4.0-r2
-1506021106 metadata/md5-cache/net-proxy/sshuttle-0.61-r3
+1506180806 metadata/md5-cache/net-proxy/sshuttle-0.61-r3
 1505281124 metadata/md5-cache/net-proxy/rejik-3.2.10
 1505281124 metadata/md5-cache/net-proxy/mitmproxy-0.11.3
 1505281124 metadata/md5-cache/net-proxy/haproxy-9999
@@ -72067,7 +72020,7 @@
 1505281118 metadata/md5-cache/games-puzzle/biniax2-1.30
 1505281118 metadata/md5-cache/games-puzzle/meandmyshadow-0.4
 1505281118 metadata/md5-cache/games-puzzle/quadra-1.2.0
-1506160039 metadata/md5-cache/games-puzzle/pauker-1.8
+1506171307 metadata/md5-cache/games-puzzle/pauker-1.8
 1506162106 metadata/md5-cache/games-puzzle/cutemaze-1.1.1
 1505281118 metadata/md5-cache/games-puzzle/xbomb-2.2a
 1505281118 metadata/md5-cache/games-puzzle/anagramarama-0.2
@@ -72107,7 +72060,7 @@
 1505281107 metadata/md5-cache/app-editors/dav-0.8.5-r1
 1506030736 metadata/md5-cache/app-editors/emacs-vcs-24.5.9999
 1211091734 metadata/md5-cache/app-editors/shed-1.13
-1506160036 metadata/md5-cache/app-editors/jext-5.0
+1506171306 metadata/md5-cache/app-editors/jext-5.0
 1505281107 metadata/md5-cache/app-editors/vim-9999
 1506030736 metadata/md5-cache/app-editors/nano-2.3.2
 1505281107 metadata/md5-cache/app-editors/mp-5.2.2
@@ -72165,7 +72118,7 @@
 1505282106 metadata/md5-cache/app-editors/sandy-0.4
 1506082136 metadata/md5-cache/app-editors/gobby-0.4.13
 1505281107 metadata/md5-cache/app-editors/retext-5.0.2
-1506160036 metadata/md5-cache/app-editors/jext-5.0-r1
+1506171306 metadata/md5-cache/app-editors/jext-5.0-r1
 1506030736 metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r1
 1505281107 metadata/md5-cache/app-editors/gobby-0.4.94
 1301041936 metadata/md5-cache/app-editors/jupp-3.1_p23
@@ -72176,7 +72129,7 @@
 1505281107 metadata/md5-cache/app-editors/gummi-0.6.5
 1505281107 metadata/md5-cache/app-editors/gvim-7.4.670
 1307021206 metadata/md5-cache/app-editors/hexedit-1.2.13
-1506160036 metadata/md5-cache/app-editors/jedit-5.0.0
+1506171306 metadata/md5-cache/app-editors/jedit-5.0.0
 1505281107 metadata/md5-cache/app-editors/vim-qt-20150102
 1505281107 metadata/md5-cache/app-editors/emacs-18.59-r10
 1506030736 metadata/md5-cache/app-editors/mousepad-0.3.0
@@ -72551,16 +72504,16 @@
 1505281125 metadata/md5-cache/sci-mathematics/freemat-4.2
 1506160039 metadata/md5-cache/sci-mathematics/yacas-1.3.3
 1506151737 metadata/md5-cache/sci-mathematics/rkward-0.6.1
-1506160039 metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
+1506171307 metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
 1505281125 metadata/md5-cache/sci-mathematics/bertini-1.4
 1506071607 metadata/md5-cache/sci-mathematics/unuran-1.8.1
 1505281125 metadata/md5-cache/sci-mathematics/flint-2.3
 1505281125 metadata/md5-cache/sci-mathematics/coq-8.4_p5
 1505281125 metadata/md5-cache/sci-mathematics/agda-2.4.0.1
 1506071607 metadata/md5-cache/sci-mathematics/4ti2-1.6.5
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
 1505281125 metadata/md5-cache/sci-mathematics/cado-nfs-2.1.1
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
 1505281125 metadata/md5-cache/sci-mathematics/wxmaxima-13.04.2
 1212051436 metadata/md5-cache/sci-mathematics/e-1.5
 1505281125 metadata/md5-cache/sci-mathematics/pari-2.5.4
@@ -72570,7 +72523,7 @@
 1505281125 metadata/md5-cache/sci-mathematics/p9m4-05-r1
 1505281125 metadata/md5-cache/sci-mathematics/xmds-1.6.5
 1506030739 metadata/md5-cache/sci-mathematics/maxima-5.34.1
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
 1506071607 metadata/md5-cache/sci-mathematics/octave-3.6.4
 1506071607 metadata/md5-cache/sci-mathematics/ginac-1.6.2
 1505281125 metadata/md5-cache/sci-mathematics/pari-2.5.0-r3
@@ -72607,15 +72560,15 @@
 1505281125 metadata/md5-cache/sci-mathematics/reduce-20110414-r1
 1506030739 metadata/md5-cache/sci-mathematics/fann-2.1.0_beta-r1
 1505281125 metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r5
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.97.551
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.97.551
 1308231706 metadata/md5-cache/sci-mathematics/e-1.8
 1505281125 metadata/md5-cache/sci-mathematics/mathomatic-16.0.1
-1506160039 metadata/md5-cache/sci-mathematics/kodkod-1.5.2
+1506171307 metadata/md5-cache/sci-mathematics/kodkod-1.5.2
 1505281125 metadata/md5-cache/sci-mathematics/yafu-1.34.3
 1505281125 metadata/md5-cache/sci-mathematics/geogebra-4.1.120.0
 1505281125 metadata/md5-cache/sci-mathematics/agda-stdlib-0.9
 1505281125 metadata/md5-cache/sci-mathematics/otter-3.3-r2
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.953
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.953
 1505281125 metadata/md5-cache/sci-mathematics/agda-stdlib-0.7-r1
 1506071607 metadata/md5-cache/sci-mathematics/glpk-4.48
 1505281125 metadata/md5-cache/sci-mathematics/msieve-9999
@@ -72626,7 +72579,7 @@
 1505281125 metadata/md5-cache/sci-mathematics/frobby-0.9.0-r1
 1506071607 metadata/md5-cache/sci-mathematics/4ti2-1.6.2
 1505281125 metadata/md5-cache/sci-mathematics/agda-stdlib-0.8
-1506160039 metadata/md5-cache/sci-mathematics/isabelle-2013-r2
+1506171307 metadata/md5-cache/sci-mathematics/isabelle-2013-r2
 1505281125 metadata/md5-cache/sci-mathematics/spass-3.7
 1506071607 metadata/md5-cache/sci-mathematics/prng-3.0.2
 1505281125 metadata/md5-cache/sci-mathematics/xmds-1.6.6
@@ -72647,7 +72600,7 @@
 1505281125 metadata/md5-cache/sci-mathematics/agda-2.3.2-r5
 1505281125 metadata/md5-cache/sci-mathematics/normaliz-2.12.2
 1212081636 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
-1506160039 metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
+1506171307 metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
 1505281125 metadata/md5-cache/sci-mathematics/calc-2.12.4.13
 1506071607 metadata/md5-cache/sci-mathematics/topcom-0.17.4-r1
 1505281125 metadata/md5-cache/sci-mathematics/mlpy-3.5.0
@@ -72668,7 +72621,7 @@
 1505281125 metadata/md5-cache/sci-mathematics/gimps-28.6
 1505281125 metadata/md5-cache/sci-mathematics/pari-2.5.2
 1505281125 metadata/md5-cache/sci-mathematics/gretl-1.9.14
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.490
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.490
 1505281125 metadata/md5-cache/sci-mathematics/qtoctave-0.10.1-r1
 1506030739 metadata/md5-cache/sci-mathematics/gmp-ecm-9999
 1505281125 metadata/md5-cache/sci-mathematics/pari-2.3.5
@@ -72676,7 +72629,7 @@
 1506160039 metadata/md5-cache/sci-mathematics/octave-3.8.1
 1505281125 metadata/md5-cache/sci-mathematics/spin-6.2.1
 1505281125 metadata/md5-cache/sci-mathematics/fricas-1.2.5
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.98.932
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.98.932
 1506090906 metadata/md5-cache/sci-mathematics/4ti2-1.6.6
 1505281125 metadata/md5-cache/sci-mathematics/maxima-5.18.1
 1506071607 metadata/md5-cache/sci-mathematics/euler-1.61.0
@@ -72695,21 +72648,22 @@
 1506160039 metadata/md5-cache/sci-mathematics/yacas-1.3.4
 1505281125 metadata/md5-cache/sci-mathematics/flint-2.4.5
 1505281125 metadata/md5-cache/sci-mathematics/relational-0.11
-1506160039 metadata/md5-cache/sci-mathematics/rstudio-0.97.336
-1506160039 metadata/md5-cache/sci-mathematics/isabelle-2012-r1
+1506171307 metadata/md5-cache/sci-mathematics/rstudio-0.97.336
+1506171307 metadata/md5-cache/sci-mathematics/isabelle-2012-r1
 1505281125 metadata/md5-cache/sci-mathematics/coq-8.4_p1
 1506020036 metadata/md5-cache/sci-mathematics/agda-lib-ffi-0.0.2
 1506030739 metadata/md5-cache/sci-mathematics/singular-3.1.6
 1505281125 metadata/md5-cache/sci-mathematics/ginac-1.5.8
 1211091749 metadata/md5-cache/sci-mathematics/pari-data-20120726
 1505281125 metadata/md5-cache/sci-mathematics/octave-epstk-2.3
-1506160039 metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
+1506171307 metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
 1506030739 metadata/md5-cache/sci-mathematics/Macaulay2-1.7_pre
 1505251606 metadata/md5-cache/sci-mathematics/cvc3-2.4.1
 1505281125 metadata/md5-cache/sci-mathematics/pari-2.5.1-r1
 1505281125 metadata/md5-cache/sci-mathematics/fricas-1.2.4
 1505281125 metadata/md5-cache/sci-mathematics/spin-6.2.5
 1505281125 metadata/md5-cache/sci-mathematics/snns-4.2-r9
+1506180736 metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
 1505281106 metadata/md5-cache/app-accessibility/edbrowse-3.5.1
 1311231936 metadata/md5-cache/app-accessibility/perlbox-voice-0.09-r2
 1505281106 metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -72719,9 +72673,9 @@
 1505281106 metadata/md5-cache/app-accessibility/caribou-0.4.18.1
 1505281106 metadata/md5-cache/app-accessibility/espeak-1.48.04
 1506071336 metadata/md5-cache/app-accessibility/at-spi2-atk-2.14.1
-1506160036 metadata/md5-cache/app-accessibility/freetts-1.2.2
+1506171306 metadata/md5-cache/app-accessibility/freetts-1.2.2
 1211282236 metadata/md5-cache/app-accessibility/sphinx3-0.6.3
-1506160036 metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+1506171306 metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
 1505281106 metadata/md5-cache/app-accessibility/nfbtrans-7.74-r1
 1505281106 metadata/md5-cache/app-accessibility/speechd-el-2.5
 1506091306 metadata/md5-cache/app-accessibility/at-spi2-core-2.16.0
@@ -72797,7 +72751,7 @@
 1505281112 metadata/md5-cache/dev-lisp/gcl-2.6.12
 1505281112 metadata/md5-cache/dev-lisp/sbcl-1.0.55-r1
 1505281112 metadata/md5-cache/dev-lisp/sbcl-1.2.11
-1506160037 metadata/md5-cache/dev-lisp/abcl-0.20.0
+1506171307 metadata/md5-cache/dev-lisp/abcl-0.20.0
 1505281112 metadata/md5-cache/dev-lisp/asdf-binary-locations-20061018
 1505281112 metadata/md5-cache/dev-lisp/sbcl-1.2.2
 1505281112 metadata/md5-cache/dev-lisp/ecls-15.3.7
@@ -72812,7 +72766,7 @@
 1408110106 metadata/md5-cache/dev-lisp/gentoo-init-0.1
 1505281112 metadata/md5-cache/dev-lisp/cl-clx-0.7.3
 1505231836 metadata/md5-cache/dev-lisp/gentoo-init-1.0
-1506160037 metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
+1506171307 metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
 1505281112 metadata/md5-cache/dev-lisp/cl-ppcre-1.2.12
 1505281112 metadata/md5-cache/dev-lisp/sbcl-1.2.9
 1505281112 metadata/md5-cache/dev-lisp/cl-ppcre-1.2.14
@@ -73051,7 +73005,7 @@
 1505281125 metadata/md5-cache/sci-physics/root-5.32.03-r2
 1506030739 metadata/md5-cache/sci-physics/clhep-2.0.4.6
 1505281125 metadata/md5-cache/sci-physics/geant-4.10.01
-1506160039 metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
+1506171307 metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
 1505281125 metadata/md5-cache/sci-physics/geant-python-4.10.00
 1505281125 metadata/md5-cache/sci-physics/hepmc-2.06.08
 1505281125 metadata/md5-cache/sci-physics/geant-4.9.6_p02-r1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8b5189e027cb..5a3271281bb9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jun 2015 07:30:01 +0000
+Thu, 18 Jun 2015 05:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 730a93f2febf..94ce1785de90 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1434524701 Wed 17 Jun 2015 07:05:01 AM UTC
+1434603901 Thu 18 Jun 2015 05:05:01 AM UTC
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index f41d2b342078..95a35494e6de 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.204 2015/06/16 04:31:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.205 2015/06/17 08:50:46 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> cacti-0.8.8d.ebuild:
+  Stable for sparc, wrt bug #551728
 
   16 Jun 2015; Jeroen Roovers <jer@gentoo.org> cacti-0.8.8d.ebuild:
   Stable for HPPA (bug #551728).
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 6e39be5e2be7..1b8c74a89c09 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -7,13 +7,23 @@ AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db4
 DIST cacti-0.8.8b.tar.gz 2272130 SHA256 ef0e2a813139e0b4c2e066f0fdae1f4ad086bef0aa23446055df6331cb1af98c SHA512 98b216f3beb8e90dc554a16ca07cc8b3c9e247335786d8b5e76001d7293251a8a6e03bbe2464f7e9f8e0721359e7cd4a40615dd93ac7b1cc0bec507f01fa24c1 WHIRLPOOL 60a1cd0f7b80bf7dbef336a3cf76797ec1d29c10a91bbfabce71be30e23c5f8f1c750ce0f582c45d8bba5498e19dc824fbb0347b56735b842c4fea362086b86c
 DIST cacti-0.8.8d.tar.gz 2470512 SHA256 1e3fb4aa137c0a9cb682fa66956c1f59dfc730040a215c45b7f9a5f9b9714bec SHA512 aaf86bd89b5bba03921d05670badf832c7fe4806696fee7a4fa8b0a4914471b22e0f00eb5b63bf232d56e4f33f1af58f01cb5737232ebb99b8331f814264098a WHIRLPOOL 4cee51d22c6a8dd74bbbfbdcc2d18020d467c403ec0c9db150ccd5ad83f1171c2371ea893665cb93a2c118445e0cac9a92f7c9142b93f9b563894898890fc76c
 EBUILD cacti-0.8.8b-r2.ebuild 2228 SHA256 4609cb820eea446333939eafa949d0b42cda81c12a20deb789d81bb0cffedaba SHA512 993e4cabaa971fe94aab34f2a495bc85c3ed39e5c7c462e17ae2e32dffe4f6c19e447ca03eb6c2351385e6fe49da532ccc9f21ed2f0b7dac77bd80af082e1e57 WHIRLPOOL 60d2aef11815516fee3be3a63b5e94a98c0b0b7cdeccb6cfb03aed18857fedcf190884907f108be01f33431625fd40ed599c3c192d90fe67318a37ccd74fbafa
-EBUILD cacti-0.8.8d.ebuild 1431 SHA256 028b0eb6af26b436bf3703f602c62c66d84910af1f0f5dc3543d7b8b2b8a887f SHA512 04dc4fad093bb6f3b6b0ed673016e6422f10e76698aef51125f033bfc1b888e31801627c13854033d258dabf2a1fb4f1b772d8c144fd82d0d4ba1330b83985b9 WHIRLPOOL 95c98c6ab30f6f7debb09b7164c2382b849f091c6182d562db114e0fa75debe5dde9f3a988511585da783afac86f3249d57538c9534ead0a0896cbdb413ef224
-MISC ChangeLog 29274 SHA256 bf1760feab9b467652d5d2b4e819feae0a98967dd46a6836823b379d6cd463a0 SHA512 a65f0d686e19b0eeb282ee9f2451b011a0f8d7add344bdb21764c30a2e3589ea8c6fc8f7125cecb841ee6a384d1a0e623e8dc0bb8dd57ef56254768e21dc5198 WHIRLPOOL f4e77f86cabb917837de7a230cc377207cca5bbfc02106813b358c6631e0799af8deebc3c6b9d6d093073b5a8c3fa3126db388eca2768b2edb62cda0e4ca3815
+EBUILD cacti-0.8.8d.ebuild 1430 SHA256 1ae55772a676cd6ccbc73cff360e94c504100a4b9c987c79b975e0cd5079c5cb SHA512 45646783c888801c86e28073acd196e580091e80fe1ef131899b950c6306eaaca605c12b49a0a1fdec20ab154da06d11226f23ad02c7112532a2051c3914e3d1 WHIRLPOOL 935d571328a6e90ce38c7137571260cfc11c4b8fd61ddad4a59d63e57667c5fd3de5f7d2f7deac6ba342abbbc0b9404410d42e7cf855605a46c8bc739e5be02b
+MISC ChangeLog 29381 SHA256 405ec5e561e137a4b73051a3c3cc99edad56bc51f1cf80b8f534699cebe2935e SHA512 77d58850e8417586468fce1c31acbdfc8a1b4f410081ac2215d126fe78350fdcf3df6903dfc88ee48041d04ab752cc5b754ffff1d4265191f78140c721899a49 WHIRLPOOL 0f03f8edd39702074703439e3bd9bc92e3f31e8d7105b615f8ed658f09f622910e0f8d43b6e281b5b9f7e6f5525a37de32ffc5b24b31b74cc6b568aa503814b4
 MISC metadata.xml 714 SHA256 87c3b48a554466e6e0a75944751f2e73326aef52d13d16110aaf6df770aca530 SHA512 6476909d8b29f1a56d7c7e26e8bc4edef5c46aee49ab18175f8727812764d1f1ae89781d09cf8de1ea42edc3f022432e6d52d42b75109e95c07998d7250bb40d WHIRLPOOL 6ce5f9fc982b7da218ea2dba530a5971f3acab63a996828c145bcd3c9ba049183ddd249325728fe6613148438e02dc5eafee18659bd6c977c740b35d82fcb6f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV/ppoACgkQVWmRsqeSphMfAACfTPPXAawhTf7fzhVZkxp4jWEB
-Le8An19XjeWe1kBm/BoTBgCFt/FcSkLR
-=Bw1f
+iQIcBAEBCAAGBQJVgTTnAAoJELp701BxlEWfCPMP/jHtvVg/nGUqmfdxNSD26Ffp
+5B2BXrPcsquWHAIJob0af/qF3+NtsMm0ggpVVY/Dpt24uoZMgsyrph+/OFkQHcDT
+8E0VX3VtBkQ+fdkK7twZXTNEs57pDZ6knAj9nbjfzVcHBZhG3rAWiJItR1ljDELA
+tD14BiJ3dtL17qSE/eGceLQwbJKh5N9v1ohMtgVNNa3kGHMvqFd042UH+9aELKR0
+5mOfj0k1Wg9Esd5ps2Gnc6VnrbNIWRtg1ap5VSiyoJx1lvGBXZMGCiRqjvOJ8ZXF
+3SLZRobBe6YHxnvCc9eL4in+LsUkrRCNHR+sJhMVdLZyZ0qInXcVEbBmL4X9eGY9
+rabwhRQ05/jr0xtZrx4WtDM1Tihauc3hOTjbglQKtBQM7k5kPG3S8s/lQDh53WfZ
+hvCwDPpWfjPIudP9c9ohuc4HqXYgwemuRWEyZq2nEIaglqZBdNft9AKpDjOb1my5
+pzUvtggU2VgF2v5IPQ3Pzqmra/FPKPcEwVEQaVBIakkvTRq3L1a4+UkNLoQd3Ssn
+0CVSUjNvcKWxKswqgq/JHpnHgG8gcC8s1POln6NNbqeiB/Yvq3C7g4FikVBO9+nP
+GVyN+ud3dknattg3N++0kmGt/5DcNluQq8YP8uo8LJxShVhGaSzjOZTnGzxIO14E
+Ofz9xgcCBLPxyRfEWlD8
+=bqG2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.8d.ebuild b/net-analyzer/cacti/cacti-0.8.8d.ebuild
index 7e5ec458565f..63c23c6ee71c 100644
--- a/net-analyzer/cacti/cacti-0.8.8d.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.8d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8d.ebuild,v 1.4 2015/06/16 04:31:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8d.ebuild,v 1.5 2015/06/17 08:50:46 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cacti.net/"
 SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
 IUSE="snmp doc"
 
 need_httpd
diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 880761642e99..243a8257b8b9 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.36 2015/05/03 05:25:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.37 2015/06/17 20:11:49 prometheanfire Exp $
+
+*icinga2-2.3.5 (17 Jun 2015)
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.3.5.ebuild:
+  bup
 
   03 May 2015; Matthew Thode <prometheanfire@gentoo.org> files/icinga2.initd:
   fixing reload in init script bug 548302
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8d88ac1510eb..ed0c2a6200e6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -5,25 +5,27 @@ AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e
 AUX icinga2.initd 2275 SHA256 0d1d55bf83141c22390017b5701fd57b4c335ac7f910aaa56723c6cf5d2a64cc SHA512 08cbc7fac5de486b18efb8ee634c1e7b7a9a3352f86176d86bec0d84cdefeeddbbf5f937eee71501004cc5e45e6bc47d1956354b4a2d32219d9726177336788c WHIRLPOOL 7af36f21f6a928523437597f53dc98537801069352f0c777030678ea0f5e55a284bb0f753c61155e73551140f11f7272baa9e1dcec7fc45da3f0a76d15371342
 DIST icinga2-2.3.3.tar.gz 777211 SHA256 c2310acd872adc027b050a55ed98e9891cc3ff19b2c431c8290d005d03a04b1a SHA512 4c483123489ed28f1f8f96b05d200bb6518eb99532c97d8197a76ddfd55f59aa41d0174a20735f5191db65ad6829072698d5fe6caf95e5e364e1d2d7bafaae32 WHIRLPOOL cfa4f5ea6759300af08a9fd7b5ce33285f4332c367fbf52b3e1728519ee6c97d67cd890d31cac927513d81048aeb802acfe681c29ee07ba8fbd3ceec16767aab
 DIST icinga2-2.3.4.tar.gz 782506 SHA256 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa SHA512 dfd12f23561610a4cbe8798c73125a15071f1bcbb22873d06b4e849b94e51383130b3707410646b31f9b0eaa6b2c348e477f393c645c95f26ea53ccfdbc9f4ea WHIRLPOOL 5d9a0fcd5f3e9cf2233f7ef2e064662b07bb14891ec95ce4e291f050089763a5d9b40d5dde238cc9c1a907a91cdc3df56795c8c843aaa91086c5522e973ad432
+DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305f0d3d6792cbebf5fb1558225 SHA512 9302ee2360cbc69ff9bc06092b4ebe9fb77901d9d60eb073f41f781e2917f398ccbddb617bb306631c9d4d0dbe0312cdab6fc1369b2c2691cf116d7af04b1ea7 WHIRLPOOL a73f8ab1136b35283c343281d65e4ea3e78ecdc52a6d1775f3202374a0f5dc9927709e2aa705243243d3c8751e313c60b4d88b1d0f15d1514a50e8a4483d94f6
 EBUILD icinga2-2.3.3.ebuild 4213 SHA256 a0b54152908595fca2174a6134b80158f83651a3d3ab19c9c7473e7ee6914152 SHA512 75dc7e071fad3d1013a2ca0b5444b899df0b41a2f51f0ad6553d0d2027dbbd7ce212e4a8970062c8a28683c59ace9ea19d8666cf2486b4985b9674eb5a53f247 WHIRLPOOL f9a2e6dd653fe3ca7667ad21a3b35d8ec3e32b861757a9bfafe2c634c17b27a3a86309cbba9dc9e0754b0183ee8bde600e9e1a7f6e84546da2e2c1669aa2564b
 EBUILD icinga2-2.3.4.ebuild 4243 SHA256 f60b44c46b439709654f73a7bdaf3c5e4bdbf53281d70b65379d3aa4addf8acc SHA512 21092f7a636df8cc1f5b355dd881a4b479c55539d15d14a49f261fd9db6eb5d2bb3cabcab017f932b96fcf55181e48f4927d95f444e4fa9265318a6ac9589bfc WHIRLPOOL 416ea88c3aa4e7e4ce6929e77efe9a39f24b9b374d1e166d623eb206b1506d3fab4f66a84e58c8060b5af98a45180925502293aaf22576dc7f430b67129dffbf
+EBUILD icinga2-2.3.5.ebuild 4247 SHA256 962f9226cfd366e0db55836989c0b7339a99fa97b28efaf9da88c0c0e59a00fc SHA512 1a99a476c07ac5ab658faf5dee748821d564380fb2b302013ee0785a5c5da130a9ea45f6de56e6f89965d34a2e0b9fd04e19a223b535d64733d2f348eaeed8c0 WHIRLPOOL aa7857d3df2da5ed22610349d5687065ccfe9030cb33199ef43ba4612ea4a2f56f1ea66c29576869d906862c81e9b2e3ed96bc6cf4d3f92160e48cb7e11ed166
 EBUILD icinga2-9999.ebuild 4201 SHA256 1fcd5a04954257675031b3725532b2fdce6dde00a4c23f04d5538b59c8718e64 SHA512 a88103fe685c2c834e6d0e67ee2b1fa9c7775b4ed46395a0060d9e1fc70b454f83628067e51ff115d39306e914a5395e5fb1741370e69b06cacaecf29f0ea3f3 WHIRLPOOL d992c1c4fd8920a3605b0b04185e5384977eda9d594d39e2fbf574dbca03023660ec98021402758ab54ce1b50c26d41fc5dd73c0ed104d61351bbb40b318a06b
-MISC ChangeLog 5847 SHA256 a5c23b6cdb3fa9288d3ff746025ed61eea7c1e326efae3df8b8f49a0d842e464 SHA512 ccdbf4e6612cfa1a9f7677b92448115290609106ce1faa351d0c5bdd0572091aba4c9e1293e3bf0ff1dbcd0805dd73bf73d1c30db5bff94e058395cf57e6dbda WHIRLPOOL 5f393bfecd0381bfd3d2729199d0c84e9474f3e1ab0e8fb802fc1ad492bcc1cea2fb57ce85f87037ba12ea1ee1ed947d03e3749b4b6eda897cc299f3f56396e7
+MISC ChangeLog 5964 SHA256 959640d36ea6c04b28ebaaa3af55418196a0af366fcda94e5622dd0ff98cd476 SHA512 e83f85fc303072a6da0b8eb3ef7b5557bec6bad4f05580f6b5e34cd5179b9656ab63cbbc9f9f6e00009303ad80b24865a6b8599dc11376e8aa34e56e0abb0cb7 WHIRLPOOL 86b7a65d7ecf57a9ecdc6fc6b96006bc3580e5d2e6c4d73b3ce55ab62770c1a99d6e2f315df450ab10f7c485e282da06adc59a11384e33af56dd7bbf2f6dd152
 MISC metadata.xml 460 SHA256 54f38cf1099a4bcab2120d5802f1915549718b4ac2b20b1b0245754919659101 SHA512 c860be59be0782980a7546f1d5e324a33b8310bf6c5e473457bdaa99bbdef52397c05d5f264c77e329ef7b2d1776bd2a027569946d787e04d2aa475b82cc33c6 WHIRLPOOL b37e6784f1fb6d06e357529db586311e745e20513f559864993fd640b9df611af0fb8aff57f4b5164596d949f3e428d400fb0cc789d8c1c0135da37deaabcad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVRbFMAAoJEGSje+quGaTopmkQAMp55F628lhgHh7zIL8BLlXT
-rLTKB+mI0XJPqWyf0DbtvDh3Zl1OWqAZvz4IRg79ym9TXm6jCzaesI0EAEUeVVCO
-E5fE3roRi7QNNUuaATcvWumreG/sycjwOHMsT3aj56AkTN7HhaE6C4wtMTOdeDyn
-NG4ASL81HxtewsYjdaQ7m+gqc5ePhJO8vzCgNxhx140AXIdGh5pIW4E/BRFq1Ga/
-X4EH75ADrCL7pf07s3bVJy/CSFZxwLA6AfclvgPov4XSpJG3ntLf7NkE9yLFg/qA
-0D5GK1A7yr3cGRFZ6QEgr2AV+nHnZY6JhDKRjfY/ZUsYXzaEnW9wb+D0mzsJuwXZ
-nLtmjxkNwXfeZrkOExXfERE/zDt+/5TA9Q2jYLGNer6o7kM/XmFoxeEwai+6Rnqs
-Fn6Sv1I9B/V6z1g3fI5z/zUxLc2g6g54fjjV9O5ESyPIYXcvDo+pX1Dcc43pdw3L
-Qi1YItEqddqnJQ6Op7ZjN6QsbSSfljFFOAw3CCUzyQaatDLV9jmOmEEqHUjfzChM
-ur0rCLwVSlcjCWjqFwSGxSn7laQYCFLuwDu/vJRGpmllNCEhg9TnF0b90WlaBIsD
-Q3yTq0cdTbv7p2kRjlez+AuDSDqyD+vaR/O4oUFP1IZQS/akLi5ldUmoBx13fABc
-Q7cni5lCOZjoVyY7bDf8
-=pOid
+iQIcBAEBCAAGBQJVgdTAAAoJEGSje+quGaToAd8P/3FYvBy5IDPNIUu8efhPQbzO
+8pxk5fvcg+ZZZgPjRshbbnVNhAba3Ram/FUzNgOgWWOdVC6r8G+ZwGRh82o8jIwE
+vonp7+b8hLqZnzghpQgNA5qQXKLPoiotxjQsnhwN5KIm/f4IlnyHaiKhWXqPdCra
+OvejEELqTbkbo6RM8lY/6f1+A8+ZOA2Pgufvon2rBrfZ/cLwCnTzjVNJsq1b2q0L
+gYie4HO5g3vbZKVIbwLj+SxERdpB5R57jwMMk+zCCjpheYRWtL9XRPGp/1Kvh2AE
+tdAcUdku+OlqK9cU/D/NOW4NTVYGvJaI00mXEesBdHbFsgqDbuR5V4S7h1v+xS4l
+WOT+vg23PBxc8dGFEgv/D8Fh2PzLJqMBYNg4VBKYFUBBpFJt3lF6LveoQoZcjEGa
+BKfbMzyY4fJZhxTZ13GkkhzolbcdZQhjrXPN1JvirCNj/HoY6/xvwyiShqWd7SBE
+0p0/H+mAfDrXS9R6xcFTXYG/u6QclkKpZ4qosHwf0loPuXwGmtJ8TvtirKY2dxgS
+Pz+P1ex7OvZO4Qe8QZ1DooGrgXuaqa7k0M1IFrtUkR07PelHBRsZN9hJhKUPeWSt
+apbDI3sibtP3oReHufXzlslqb61Whrs+Xt5OzWKi8JClqNALYPcKWZNp4ImD+kFt
+BJ3IFLmK6dfPDygVEaHn
+=Ok5n
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.3.5.ebuild b/net-analyzer/icinga2/icinga2-2.3.5.ebuild
new file mode 100644
index 000000000000..3899214a3205
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.5.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.3.5.ebuild,v 1.1 2015/06/17 20:11:49 prometheanfire Exp $
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-util/cmake
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+
+		emake DESTDIR="${D}" install
+	#fi
+
+	cd "${WORKDIR}"/icinga2-${PV}
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}var/run" || die "failed to remove /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/nagtrap/ChangeLog b/net-analyzer/nagtrap/ChangeLog
index cb0c9c6d6095..0942e021fb3e 100644
--- a/net-analyzer/nagtrap/ChangeLog
+++ b/net-analyzer/nagtrap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nagtrap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagtrap/ChangeLog,v 1.3 2012/02/09 10:42:22 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagtrap/ChangeLog,v 1.4 2015/06/17 20:00:26 grknight Exp $
+
+  17 Jun 2015; Brian Evans <grknight@gentoo.org> nagtrap-0.1.3.ebuild:
+  Remove deprecated need_php_httpd function ; No longer needs depend.php eclass
 
   09 Feb 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #85926
@@ -14,4 +17,3 @@
   23 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org> +metadata.xml,
   +nagtrap-0.1.3.ebuild:
   Initial import
-
diff --git a/net-analyzer/nagtrap/Manifest b/net-analyzer/nagtrap/Manifest
index fe09c695c20d..2808e1622264 100644
--- a/net-analyzer/nagtrap/Manifest
+++ b/net-analyzer/nagtrap/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST nagtrap-0.1.3.tar.gz 141934 RMD160 28f76e04d5dc8011cbab927ba89a9ac3bfb98ed9 SHA1 7b3d19765795a74fbecad72c8b10723a88e8cb83 SHA256 25082a363101a321d46649d4e5afca92acbafa37564470eadcc331235f4656f1
-EBUILD nagtrap-0.1.3.ebuild 1462 RMD160 b4a6e1ba7639fb03023dee00d678e7c1c162c9ae SHA1 0e8ff7d3e150bfadfeef3faf5617f065603e5c97 SHA256 c2b21e6bb8da6205bf585b83f56c25ee8dfcc5734d4bdc62ee0adeeafaa603eb
-MISC ChangeLog 575 RMD160 274de39c987b53d8f2f9b0a8151e0b9ea572d903 SHA1 b38fd60a23d9ae7f97f38c994f34c33f99c80579 SHA256 054a7481e3e436adb7cc8fcb24789b03db1638e9920b07657e7a516da85b03b0
-MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
+DIST nagtrap-0.1.3.tar.gz 141934 SHA256 25082a363101a321d46649d4e5afca92acbafa37564470eadcc331235f4656f1 SHA512 4603157beb35850a6f8b69919cd0ce8f108e6de8e85711b9c18665b69f91082d6703da396b1170633172cef630c2f3d73b717f1893cb4da6b6d15a3f577d445a WHIRLPOOL a17dfe70c6e5fda47347199312e068a1a0429cd1a9880e183f9f31057b70b20282852f48c91fce52435f4a14db90375cc119672087aba13148c04e234b76ad45
+EBUILD nagtrap-0.1.3.ebuild 1470 SHA256 9275d9b11363c2c2684ef05989ba8f8f3edff6172dbf7ba19359057a19abc219 SHA512 031d433bc20f0ae6501064709d1e66f280699fd89f52e21b30be471faf171e7d69fb6c7d18e5b6c40e4055f9594cb0a6dfb53111d4a25fec543189fd83e32752 WHIRLPOOL 17c95428080810b8500930a92d1f9f2767c494a96b9bea0d8d2fd19bac512146e2410297a7be8abe7427d470bc39ab0a68183053a285cc69b0cce1544a22c11b
+MISC ChangeLog 729 SHA256 9839cf1aaba94d6546306867e176ccea1f46981ebd03184fe9aec91c409934b0 SHA512 4c4c3288bf896226b57b0d622b768db805ff946b95f2fda9520ae4251819cbd6a16775694e138a6fe611e4440d28999d8f6e3d0e495be2af4127e32cbc6fc68d WHIRLPOOL 669530e8d1c56a3d52fac32f7c5da4b51047c797abdafb6da0209a421188c5cd4ce1938ee3f83f9f86e34657275534e297d7978b02989cccce7512912c2d40a6
+MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.1
 
-iEYEARECAAYFAk8zoxMACgkQCaWpQKGI+9Q9+gCeMwqUPAyul3im4P3Qtg7qhMCs
-A6cAnjIGx5LsrsUfxbHbGtLk0/0QVfIY
-=a1YG
+iQJ8BAEBCABmBQJVgdJXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2cjQP/2gFdVBP6U50vXGs5+8X0vwb
+aoFG3MKaTSPIKymwzl+rnxM/MuZPjg7Mf/gb0CYrA3vYqGUpT0QA+co9Dn6oN6DE
+4KXH8oQsAtJWg++1nCi0mHyp7alf6Of46Cc4PKn2eKXMcRzAuGaoMmHw9rUNfZ1p
+e9SExWidd77DA24J47QcuiEwvCl7W1wciWLMg22vfdCwMk9Eyms9kxsHj4rAPPjz
+tACMj0BV5y3eFeWgEBO3rSo8TP6BnPF0Do4GUqqbJrqfltIpBJZZWODjbF31Xk3z
+g/EyOfVEQnN1ZfKixHRT8oKEnBFehWP9V2OMqaEVAIxoOgDHLqJ7q147pQJ8L4HV
+pJ/r0Mesa1NNNFwB2GuVPIoy0XNUEqabS88QUE+zuDCNEUBokDnGI9FDokU7Fyx2
+zl4UYst/WkVFUmenm65aqNNN4YmYHCuKFwBZC7EfXytIluUBYe6tYKRH5tpvaaAU
+afYBbJIuoMxRNutqoy6uMqYvZG9EmF9K5J96NjRvIfYGs04XC3LjZhce4tvlGYve
+TZ9KZgvkoxC6dcsZivyrALXZEjm/APbDe9n27ToqVQFbIDYUFZjWEdB1xOXhJ/8+
+3VDvo2TV1ToZoih2gsBHz2fUN3a3fmVUixwALvZuGyc2xb3WnLM08sM5PNsLp5HN
+Es+xON44ra44l940Qylc
+=0QGj
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
index 96333012b9e3..0225064ede9a 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild,v 1.2 2009/02/23 20:41:43 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild,v 1.3 2015/06/17 20:00:26 grknight Exp $
 
 EAPI=2
 
-inherit eutils depend.php multilib
+inherit eutils multilib
 
 DESCRIPTION="NagTrap is an integrated snmptt visualization addon for the Nagios monitoring system"
 HOMEPAGE="http://www.nagtrap.org/"
@@ -15,12 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="virtual/httpd-php"
 RDEPEND="dev-lang/php[mysql]
 		net-analyzer/snmptt[mysql]
-		net-analyzer/nagios-core"
-
-need_php_httpd
+		net-analyzer/nagios-core
+		virtual/httpd-php"
 
 src_install() {
 	dodoc ChangeLog THANKS
diff --git a/net-analyzer/nagvis/ChangeLog b/net-analyzer/nagvis/ChangeLog
index 332b91f26d4b..17be2be1d4ef 100644
--- a/net-analyzer/nagvis/ChangeLog
+++ b/net-analyzer/nagvis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nagvis
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.16 2014/12/16 22:34:42 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.17 2015/06/17 20:07:28 grknight Exp $
+
+  17 Jun 2015; Brian Evans <grknight@gentoo.org> nagvis-1.6.6.ebuild:
+  Remove deprecated need_php_httpd function ; No longer needs depend.php eclass
 
   16 Dec 2014; Pacho Ramos <pacho@gentoo.org> nagvis-1.6.6.ebuild:
   confutils was wrongly set making this unbuildable due missing sqlite3 dep,
diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest
index 4ab7541525bb..913d35dd7dab 100644
--- a/net-analyzer/nagvis/Manifest
+++ b/net-analyzer/nagvis/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nagvis-1.6.6-base-path.patch 799 SHA256 6b82254353595a8aab86bb65b46da0c7d7cfe1b15f69387f039a6049616c6a09 SHA512 54476998b1bf0b8ce25691fff558e3faa0aefaa4c1ba5d9804e809ae862f79cb96ea87fb7368a1100282bbc8d1f89902f8b4bca397df1ea24a840996889de1e0 WHIRLPOOL 01be41d6194945804f7e59401c9ddd703a1f10d9bbbf8b68762bcfa9587d7b6fa93d53c7caced4a33446fd402036305bb5b245c557d62d8e4f19ae3538f87335
 AUX nagvis-1.6.6-global-definitions.patch 1177 SHA256 dbfa2b300ffdf5fb3b8f48b7b5f0f9a577cff816b6323e2489456c6a9767f1ff SHA512 26d53a48852082010c660280ffef786a8713a02ba675b4b455de48c65136816772c8012ead282bd8da879b1696bf811e4ef091765cc3014d5b2fb1445166c79d WHIRLPOOL 75584f403eccbdc84e0a403e96891285e0bd3e1b14f05299fd2190b249e5ca357b8a037c760276c87466b197530d5ae97d7cf6c3710a9552f0d1e836704241a9
 DIST nagvis-1.6.6.tar.gz 3430714 SHA256 8aefe17ea7f43839fd5db4063fbac96eeedddbdcdf3789f4a75e9ca51c2833a8 SHA512 e5858b185dd5d31fc8d414df5b3464941769249ce582b10e155e89ba7aa0c45724550c44de9d7bfb23b96caa737e519f320e45050126feb94593cca2bfc583cb WHIRLPOOL 8af9d6c86ec84cc3630d0d93cd6cc55d2687a8b55f0f3b6eb2cadf946580af3a314daae9d5055ca41fd62f27fe06e188c9c319b42bd9118a1a6976815f2e18ad
-EBUILD nagvis-1.6.6.ebuild 2892 SHA256 06bbcad02a2031ce57dbe64c0f1b7144001665c8eae0c1dab9175876f51132ae SHA512 054b12c119eb9c9d78dcb11d0c2b3c8e5b1925e3101e48257aa617ff13f01a73136bb4e455fb418fb59775be2e11ec901e4f33367d9af33b36afafb8e1f3223d WHIRLPOOL cb311068df500d7fd14316aea21adb696b64a8b903f6e5f0eb098771393350646aef1a53eddbdb5ccad819f8c7806316bb93996506095d65617d3a4efa35d2dd
-MISC ChangeLog 2544 SHA256 5fe2333154599af1f6cc36fa98896d73bdf9fc97e1904865d40f6e16f569ecd3 SHA512 3460a7802d0081598b68a091ad570a2b6b9657cfd58565fbcb8785809bba8b87cff16b3f2c46f19bb9d63753fd59f84b118309013eda3c16a06d6e5f582f9b06 WHIRLPOOL 5cf777bc69bc49d9436419e106be97ddb6a927da04c8936b791e1cf496fe7f790df9e30a317f0ae589cdbf54d6a81d8ebd52a3410b41af0d07756a7acb990f85
+EBUILD nagvis-1.6.6.ebuild 2907 SHA256 20d2077a3ad5f0078d2f0887cc87fd0298bd2604852ccadd29a6227b3d5b2d20 SHA512 b3a2a609e6fe6c76cd67efcf1e853efaad5c40037b1c077e35c9c3d28af4db157bb387f7d34a02b30ce139407dce581dd4eb097815d831dfe7bd024d2c2f0304 WHIRLPOOL d7fa7a6d00831b8f81b1190511dda6ad072628bc2867a9b54c6626e3f214ff23747b6f32196bfd96e391e86c1e151c5d61807fef58e4bef7cd711f53a4f0d1d2
+MISC ChangeLog 2698 SHA256 751354c703c0bd5bf866c7d9d4ed22a90da1bbabf2479bb4430d7a0a34317c64 SHA512 eabd677eca63730035756601ac8083b80fc36cfe12bc693a5b5b98bf8ef7f50b143767c9f7bc9b7bf4d577a152328947384ea05decf299b8cdbc17d16e7a1815 WHIRLPOOL 02e76b4b307f2ecd3e21f9252bac058e1a2594577bdd13b49ee9e7729798f29f3d60478021623b179d15cbb7fba113eef55826252bd896c84639a90b5da042d3
 MISC metadata.xml 415 SHA256 b0b596e9519889e702482e54e7cfaf94c9e89eb12a723aa35e1ebb5276ad158a SHA512 27e7f189fab2ed019b002d43227a4857f9146068810a0bc44764c62a115e14f4b60926398b588fa54084c4d3a46f8f60b720b506b08a86719c95591e922af738 WHIRLPOOL 155ab23b33df07c80632d603e4ad628ed6359a8f22d13c15cca9928992b1230aac465c8300f06d78abdf2bf22d4d3c335a4f636a2f878ef861f959d06daba7e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfwe1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLO8QALERT2VMx8di3bw8tPVZML8t
-jRUaqWlW0w7AKt4nsHC969HxHHO+HVJyTzd9tilwjpD+62TGbHMRGFZm15Vak0//
-iA17MfLEqRrv/L1G73kKhWo5/AKHsy89+EGVpi47eXpQ/KrVaTjqYr63JHDFWGgi
-5aZTRkEMROoH8EmWBs/6KUBcdTjub2unUwVCWQCaTDXslOgfAHw1rh1bnTnYA2jw
-2brXkyxTKU5OT/zR5crlqmU2v8Kfprmd3FFXu62q8HD2n1ksZfSJtRAf89dw/Xut
-JhIaJ6d1/CYzNEgI1Vw9XjFfk36ylR90gLcb8887zGJ6/EYPMQmykJR4v1Fs6rsR
-Unub6fnuSXecZAXfczXEVn3UiUoj2IUFmQgyQQFWo8oEgNnJSX7Xww0ONwBlIH1x
-MHQLw05NP7zlTrZaDd60s+HTQzi8Q/4BBLC0PX8J8vt+P6UubFQOInFrtey+T103
-qUBxdQQsXoxoxgLrnir0XHbtdmNkDeKTsCtrX0aHDJrxZo0RUoDqtIdZHLk7/lpc
-JY4qpeHjdUk80zCU6jcTbfSEiOSzFj3azEYSIMaeQihyJJ3P2qjBEhtqb6UFv9/G
-xnA247P3paFYJhMxWhDhaz+toJlszDdI8bCv8WE4UUYiarMfAljyPT4/ity/6PjH
-iJNG8+OPWeTw7hqc3RNA
-=6r+f
+iQJ8BAEBCABmBQJVgdP9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2dH0P/2wyIn27tAzK6HKhTRB4e3KF
+JUb0bZqcalEPErh2AJc0ZEcFKXhRThG1j27e4XALXHvDvNd8GK10wj0lRKJZCTtU
+w0Hj2F8lCtj9uvq92zEJajgEkhcdgwBC06HUXkEIQBpV6a9oJRxwyEgyKgi6nESI
+ujZRgmUO0+5tC5JTJHDSzz9Ar935rq3XdjsQr/+ct4BiWVFsLXdFNKElGTn4V7nV
+g9myJeiA1ZcSIA2v0qBkgbadzeyluPdKspaZlD2I/6dO4IlMMuEDJkIitZMYTCjN
+IceOPRmuyLuBVP05qquw6cBFsQD4nZHXK0G/9lhmwllGwY13bBv3vVdhn3azGY//
+kk66fq8buyb+XvG40Q9IGkhkAKjlV2P/m/DmXlZQiqNgAt6s5ZDOJeFtdzJGR6iE
+Rdy5HqVYKf40uWLJj/4BPb9c2NAB9+04MYZviBwKHGiZ6sYrW+F5Kbm8SUJuGXPK
+keopxmedLtxI29EkogIL2jGQLJY+YWiJLCQu2ICnB14RSKoZR7739JG7tLg8ee6z
+fFh4iIQA21zGAP16vrVeoVh+QW0YLUPolf5TDf/jqwKlgSCFqufbIp21CnKIvlGD
+nv/gmMXGNZ7KrXMgEXS3S7pv6y01dpzmstjnLPmgVC02yfVmOBPn04ozqXvqwLF5
+0c1LMFPKmbpbyUAQHxcN
+=Pl+y
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
index 3086de7e1353..5091bee46623 100644
--- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild
+++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.5 2014/12/16 22:34:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.6 2015/06/17 20:07:28 grknight Exp $
 
 EAPI=5
 
-inherit eutils depend.php depend.apache
+inherit eutils depend.apache
 
 DESCRIPTION="NagVis is a visualization addon for the well known network managment system Nagios"
 HOMEPAGE="http://www.nagvis.org/"
@@ -15,14 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apache2 automap"
 
-DEPEND=""
+DEPEND="virtual/httpd-php"
 RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga )
 	automap? ( >=media-gfx/graphviz-2.14 )
 	apache2? ( dev-lang/php[apache2] )
 	net-analyzer/mk-livestatus
-	dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml]"
+	dev-lang/php[gd,nls,json,session,pdo,sqlite,sockets,mysql,unicode,xml]
+	virtual/httpd-php:*"
 
-need_php_httpd
 want_apache2
 
 pkg_setup() {
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 55aa26c04db7..1714c1d31421 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.722 2015/06/01 05:54:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.723 2015/06/17 08:51:00 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> wireshark-1.12.5.ebuild:
+  Stable for sparc, wrt bug #549432
 
   01 Jun 2015; Jeroen Roovers <jer@gentoo.org> -wireshark-1.99.5.ebuild,
   -files/wireshark-1.99.0.1975-gcc_option.patch:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 8cba6e1ede5c..22f7bff2fb34 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -14,15 +14,25 @@ DIST wireshark-1.12.4.tar.bz2 29257016 SHA256 de804e98e252e4b795d28d6ac2d48d7f5a
 DIST wireshark-1.12.5.tar.bz2 29208507 SHA256 d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82 SHA512 857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136 WHIRLPOOL 00592ebba59532acfe8c4b77efe87370573d1084395a27de0bdc92ce7aa1d8567d9b3a10697fb9469c890d724dfed7f1c720408230b6f39ff0a0c09670df00b1
 DIST wireshark-1.99.6.tar.bz2 30046495 SHA256 dfd8800f15a531573700703fee32c97f6c1525615c5d2b92a110fd50b259cc1a SHA512 376d7527c97b44da7460be8089110a0179a1c6b773bb9f82db1dc2f77aaa19d053486abfe0f2819ac8b401a7d1df2d37df5caa53c05e5dbb774ca40f5c41426b WHIRLPOOL a63c03b5c42e50558b1325765fa797f31e19512db5bfd89fbe8edcf40f01ef9bc17b2d48f09bbcbf96f8d506f1c08c1d1d9ec6a4b1d2f0d60434d2c4f703f444
 EBUILD wireshark-1.12.4.ebuild 6244 SHA256 02bc56a450370516854f5724a2f6b0ba0a8f8b07160c8262738c10aae3086dfb SHA512 0fd625acf77240de2115c3dfd853deb6aba2061d000ab89a5deebf432a745a44ab12012087e4b20e560036b600fdccaab9640ef852c52abe5e7b2aed0b88ef5c WHIRLPOOL 99269eae2d3cdb600314bfb6f2503f0cc780eb45742784079368e2af99ac57cd38c7685172964e5d6d2aff24d0811e227c5bc6f486e4a339306d0fb51cebbc0a
-EBUILD wireshark-1.12.5.ebuild 6389 SHA256 a415a727ee5625221f43ec1624c6a2a00b7a5acf61a6c244c91a477f2bfb9a62 SHA512 a581776e0283391b23993788f410a04ceb0e2468c57341d37ec3ac9c669590f451062d54495ab587d8ebf67f96ba0c77b8adafdee10a1bb511b3b5b915ab3f7e WHIRLPOOL cf4061a8227e25e49bc79e210adb5975acb4257c3b8c562c07f3fc3466f1666f7b8225fe77cf103898bcca90f772507a10c290ac924a06f9a09b8428e91b292b
+EBUILD wireshark-1.12.5.ebuild 6388 SHA256 de12dc1529b8d1b25c2a55fd00129a4da054af79363dacf1c438ff1486b06977 SHA512 a2227ba42c568d2a4361ceda2e3ec0a63b8205b32ccf7572e80e050963899e62c79e5a2c9412da98576d056c874ba5756083f3f0fbc143ab7a4a42c31f27a31f WHIRLPOOL 4ca10325996473ef1cbaecffdf7861e351fcdc0e78eee6c76d35b7f6921e6b71aa1a5bb02d14d87a07fa34add6cde1352cde6d5b774c6c7392bfc47145b51e12
 EBUILD wireshark-1.99.6.ebuild 6444 SHA256 4c074a0f883b19bbf7f31ef06d2d6ef49118c1e654fb5edd43491181a1b9d4e2 SHA512 ab06f30d4bb16e1ba9069dd8224d6235393c8bee8dba7bf239594e25351bc6eae77175a5160cc1463bba719788fb104d4aa882e2480b07e17fce3df160e364f0 WHIRLPOOL eb05b26b132c1b77e1f8bd2e77ea32820efd6ecc0d3e0fb66e66894ea3028f88e9f3d13b77a05f5cca1ad625df9cf8e84b39d382ef29d8b1569b22e3ffafe671
 EBUILD wireshark-99999999.ebuild 6439 SHA256 b6434994ec2444c70e67c624386f035a04042a00a9062dfe77cb66f8f9df00b6 SHA512 e506a4939851898526cf9244f673b4452a8dcac6ef4413c270d15b90617a45fb645222f8b29e8751a7eaa805464475800edd27eae672e5023b49e9f645f946b8 WHIRLPOOL c0837d148e071db4b0c76f80b546ac097b0fc6c4af9f6397b4a0e91b329168902b72ceccfffa553f859bdba9367db70e21b8fc439e960649500f227569997948
-MISC ChangeLog 104830 SHA256 bc32199e5294731d55b634ad4cdf16dacc25072021132e3ad4506ff5a62021e6 SHA512 deca5be9a3a07a37d16d1bc7bb4dd2b15e10c269f3bd4291ca463deffb6175936b9c4e8e221ab1f201706c3d9533c009a2ba7585808297e02b4c8704136769d9 WHIRLPOOL e376d64349238d2b83b2384bde0251ebda1db05e61e24c11fb82de34d2ab0897f0cb1bda0cf77b2dfa1a2eebf0361b40093b79e5ad67d40b4f4e2b58a9834adf
+MISC ChangeLog 104941 SHA256 cb458944fea9dc96aba7f837fd015b79cbfbf2bb565eeaac60c7820cafc8cdae SHA512 2b3d19d11c496b631de11ec47ca8931c207ef55283ebef0253494889d713c1d3737e4a29d7b65ba9a3e700a11127170835a5754350d16e55dbb7fe4f8cfdb076 WHIRLPOOL 2b736043b1c57eea5b4f3ff171cabb3bfe6a3fbedf5f773e8ea1ce81c2c8b87c3e565511c957d9a6e48971444c63c14d887c06bb75d67d5f7bf6038fbd081cd4
 MISC metadata.xml 2463 SHA256 3b0614691f8157e2d2100f6ff2157575bc890866adc359935448ff59a2a606e3 SHA512 105867cbc7a73f1ea2ab6a1aa78fe680a970b951ac49d481c09b9bae79c5bbb5f1681e222fdb183ec2f226c3f69e9b5c06366d2eadadba73e262c93e460b5cf9 WHIRLPOOL ec61df7c59f0ccdc477dc7ecf996ec29a16e95912f1b019e5ac0faf0b601403e40c5937937f204a91b4a9c28aa5aefec953d742405e4b13972de154206033309
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVr83oACgkQVWmRsqeSphNxIQCdGbvH/kGTnFGWVwQgyT748ezE
-zqIAn0ht6B8FW3KGHLuxGYjQ/Ljg2eAO
-=CCzM
+iQIcBAEBCAAGBQJVgTT1AAoJELp701BxlEWfckkP/R2cidLkpBN6l3h2qHHzHUGi
+VVa4swD83mQmBKsxPmyoEU3uUsXZ9t5dpjo3cVm9AGJn3N5HJsKMq+zexldbIIhq
+u6A7Cssw8ZSRJfpEs6xN6OsDLJ5cqUu4k/3uB5XqKgv9kJFzMMBfeA15MxSm4IPN
+czfd14YFdZ/atmn028UjHOjkDEkAWcFPYgU+HOW+auKvm3P9axpByVh8WZpN0iFB
+2keujL+zaW2IHoGgF4xZ1jt5k4ren4HGr5Zx/Q0yGfhlWlOkEy3EmJ0ibix3P7O6
+mgFJf+e5u8YKwrfBYHVJeKMRT1NOa74GLOlpXfRZefqKY5RxDO7fTXmFoyOMaaea
+qNqHiDiI09A5KaEc1I8BmBTOjETiob64dX1MCK6kAnbv3IRvkDh8Ih+qWR+KvxBt
+cTxiPvEiWmqJoXsWUnZ2y97aib1NYCDoz4sWXiAPkuDQJO6gWrbjo3DLSyAJLY5Q
+XuSsiHLRW3oI6mfynRjJPd5JtzXojLWrHIKS+YdNEymlhUh7xoN74VaHvUYini6k
+TU7uJeA6Ux9A6iTB700e0aFTua42xPZYSSalooyAOxzJask8E6K1o48qvHusxTPi
+jZMu1qQbju2EVzTv3bDFIUzr0SNx63U8B0WRswK7FxFoK4c+yd1nAgeMQH7pCphE
+aDAbNo5TNLEOQ18o5MFu
+=domP
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/wireshark-1.12.5.ebuild b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
index fdbfea570fb8..79607f037240 100644
--- a/net-analyzer/wireshark/wireshark-1.12.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.5.ebuild,v 1.8 2015/06/01 04:20:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.5.ebuild,v 1.9 2015/06/17 08:51:00 ago Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qmake-utils qt4-r2 user
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
 	portaudio +qt4 qt5 sbc selinux smi ssl zlib
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 2f1b061dca2a..bb95da0c6ea8 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.270 2015/06/15 22:05:42 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.274 2015/06/17 19:14:08 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> dnsmasq-2.72-r2.ebuild:
+  arm stable wrt bug #547966
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> dnsmasq-2.72-r2.ebuild:
+  Stable for sparc, wrt bug #547966
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> dnsmasq-2.72-r2.ebuild:
+  Stable for x86, wrt bug #547966
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> dnsmasq-2.72-r2.ebuild:
+  Stable for amd64, wrt bug #547966
 
 *dnsmasq-2.73 (15 Jun 2015)
 
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 3cad2a575277..b015fa0b3283 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -15,25 +15,17 @@ DIST dnsmasq-2.72.tar.xz 454048 SHA256 7d0bd23f5d74b3a6b26a75d5ffcf9db81d461b47c
 DIST dnsmasq-2.73.tar.xz 470420 SHA256 0bff81103e53fcab3a3c4d0fd6df1882f9446dca4fa74ff8270e1d2ab872d8f6 SHA512 bb63538c90d5d83a22d9ef7acc6b6c0d1fc1e7dbb3c626bf06b873758f0ff267f871ca4d5fbd9ac512db523429f2b557a9550e9fd994b78a6705375b94ae1b41 WHIRLPOOL 6f396754a87ca8a0ec2125d05296aa17bf30d24098c86e8c82d10df0d05f41e1d74f92411a53b7342d99f34b89f9195d7faea2261ca649091cf7ba9f48eafb57
 EBUILD dnsmasq-2.66.ebuild 3181 SHA256 2811d53903d109cc344c962bfa49e6c9f857242931663042a74e0778c145da9e SHA512 2efdee54d8dd70be76cbce1e6b729618c1e79170dca1f054cf0f12ca0eca5ab65a5a61471fe913f5851f4d97c36fb83203d5d23fb6512ea30e6d4ea9ab16c124 WHIRLPOOL 8c49095c02073fe3b56fcff2f2333b7724fff270ecf03908b351d902be95d9ad80b1b20dafd9f8739b2c93f38027a62a8bc1580dfba8000b5f1efe29e1f0cb15
 EBUILD dnsmasq-2.72-r1.ebuild 4438 SHA256 5c4f9c49e5153fbda1a40a13f2223e5dd74076e7d4074a2cd59cc0b11d226ad4 SHA512 f32ad3413bf929f6c42ad43972504cc871a07229220eac103a0c4adf4c817aba2120e6239813f0cc43ca39da3b7857c4913a616984a7845b03214e9edd323d26 WHIRLPOOL 3b1b356aea6f9ccc83de4dfb58673d57768a209a49762bdfd784185806140d1eb5a7ba740c6fd238c86fe305a1225c2639cccd58051bae6af3c8edc727798acf
-EBUILD dnsmasq-2.72-r2.ebuild 4446 SHA256 c58dd0cd11b91d3b687c27aaec95b6ef3531e9fe149c5c40810f3b8554f3b9ba SHA512 b4cad9a0b9099dcd5d6712aa7ced8ca6ed47337cbdec984a345aca7d658e874804ee300d474e4ac1914b93341a32efcddca1acf61a13dcb31b82f25992273206 WHIRLPOOL f415bae916dbe8004c1ed83f04dc86db1b07406fdc81e36794bece7ff4b1a48d18a4dfee421ec0c050ffb291d9483962e78863927d287519b75ade995e6e9ffa
+EBUILD dnsmasq-2.72-r2.ebuild 4443 SHA256 2f73dd670b602755ce94420c35d56c99fd118f956a61fbd4e2f04682b1f15f7f SHA512 ea224b163ac6b45e137f80ffe6814fb8d360fb8cec9afc4198a1b3306ac38950eed5e2314c8d2f1d0906cb5abef0862c1423a5e63650da6321a1e6a63853183b WHIRLPOOL 536b77cfe12276504e6102c0789dd440a85cbe26059b866d3f3ce2211f0c9c4f43507fa401fbf8754b1c6527e3c05fe11546ac20eb77bd23a472e9ea971e86ac
 EBUILD dnsmasq-2.72.ebuild 4228 SHA256 8aaf3cbf173910c5adf0d25068289727d9c8eacbd1c5778883d252e6d1670c54 SHA512 31b9d191248ac827dabe6f02558051697f5d9d38a0591891045b87ec8e87062e14575bb95c1b21f88cf4374ed8ad68537c927deac977f2299fda27ba6d279aeb WHIRLPOOL a2a8fd6ffbd0e4da4250ac39a0f0ea1484eee1450c5b3e32d4a6ba702461be7cd1b8ec33efa86b97703c22523dab052da5079c7a1c304afb3dcf2c3990926e62
 EBUILD dnsmasq-2.73.ebuild 4368 SHA256 dc659698cf4fc08fa4b36045acc2fccb5631617b34c198fae0df7d4e51b6a4bb SHA512 ae61fab7ccb0142bb41e82b439797e8a3f5e02a26c9a90cf069ba4321ff0cd828540c274cc0e83e22e27883a9a64dd4919b41e127e4a64790e6b5121572b54ea WHIRLPOOL ca1cd4b4fe5e6fc6bcfe7a8af08239f2357b82ca982b38ff99826cc58ca624690026c31b5ee59ad91f560918828c1025e18a49e847076edb00a06219a1519c18
-MISC ChangeLog 36991 SHA256 0ff31d58092edca1a7c3352573b8d70f81c8f3781b8696e0b9b65ff945166f69 SHA512 f85fabe19b0386a0d6819b8e7aaf8aeec8ddf2e05789df140c3722652ad1f6851483e504cbeb5b4f745872f4a6022790c625d59fc930082108d600411cbb5bac WHIRLPOOL 62cb8f4410a7917d7dbe810c2d8f278e06f172220c5735e68637ac18ac6bc22de25f461321d71a3429ed5ba008b0659e4c246eec8d9425fb0a58a51217cc5d45
+MISC ChangeLog 37422 SHA256 e206bd55b96e32f3e8c7ac2ce628912d75f048101824a5f48f290673e74887df SHA512 d4aa2e3bd698f0a784b746d8d6d92d0a8983cf0189a1bb17198ff4716ea7e3ea34635388f516dfd02bbbcf3e68c6d05dad83c9d5a37f26450a85e86cc492f8d6 WHIRLPOOL be970d3afa41d1a57071607743acd25357a387141bbff6800a194d7d57f12e9ce4b4638de1e732cb27d57e5a1ae0d60e8da891cfba2cc7c26bcdc0b69ee8ff8d
 MISC metadata.xml 890 SHA256 7952192e999afd4942b22e31dbaa1a8cb4972e5a8f7f8596476277c294dbc84d SHA512 7d3f3d84bc34eb57a241c2f6781561a3247ef24def3d22b64b603f490d0ca922223c2a8772b8d728f5ed3c063219ddbf6d03a5e891ca0a71d5497bb6068017b6 WHIRLPOOL f3bce03b7bf361f9456b1a342e8c40b71dce5ca0d5e0b9653859d5e4f08e2c44c8ad09e30bc51d1c9d3492fbe8ce42c0532bda3b8b8de1b693c1a8557cd75aad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf0w9AAoJEHy/RO9cNQiDXVoQAJn+Vp3nyUJeDICQ1LNWCbjf
-VJxhpYKolAkjATdcbJCd4TQwpBGMDcsLQKWZf8xny783+9Wn/iPa12CAyy13SMLN
-UhmifHSFREVrgaeyQ94iv7CHZevXHmaWMUnsBZGurUz1+PK2AFXm5KhPX2U5EQ5x
-xmXjxMTyg+UpDucjF9wSeEYv7q1GmHARPoUY+UHAToYwkJWQJAkDQiWoqzfxopkD
-OR44tuam7nJKNYRjkiF0PKRS0UxVwnE4dULS1oExEtNSz2cCfiLbYDJ6fwDj44+i
-ULZBQSQ0/MEn472FpqWRYAgt85xvveq54Sw6TCfebswtfcbzHgoPzaX4nD2oIXOL
-KdEvIJ89abzMV1FBt2hIAyVp3paFPYZt0FCzEWnZ7w+bNl08OWcyfB1N0s3DpJOp
-ChS+IP7NmOOGT+sq3y/wBGLVIJUeKDZLmECTk5d7VV/p2KyRgPQqszkseL4gx1EI
-NcVHcQCHkR/BPS83jel7DY1k8zE7nPV7KHPXvPJhqW1ckwNo1MoVLW8xdjPRz4zZ
-n8mrWxVjxCPI47qGLU11EU1/DKDLGSsgY2qWrI8NVA9WsjDTz34plJS98cdhE4qx
-M/whIbWoyHda0PVvbmV5tBAafunJmE/3AC/CTc2C2wpcW0LFRGxDJNJ/4AhRgYLO
-P4eNlK3ALBQL3nTw1ZML
-=dEWw
+iJwEAQEIAAYFAlWBxn4ACgkQG9wOWsQutda1wQP9E3jRPk8TKlb4fhSUyIgORqEB
+WZ5f02X8D/lXqGacORtrN9zMjFBDsrPlaZsgce2h9xipoKkTdPA3oHndgA6Owx+i
+dQwQfo+cFgIxAo4iFTh7AcDmVvA6MJFpBRIQHokAEafyAdKy9xz78ZsYW6vp1ngy
+VhBttsAnoQw17jzexNk=
+=533Q
 -----END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
index 1feae28f1899..a1659b8c3369 100644
--- a/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild,v 1.3 2015/05/05 15:32:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild,v 1.7 2015/06/17 19:14:08 zlogene 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-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 027e10fe17ea..de26acf93b5d 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.545 2015/06/16 20:57:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.547 2015/06/17 18:42:05 alonbl Exp $
+
+*gnutls-3.3.15-r1 (17 Jun 2015)
+*gnutls-3.4.2-r1 (17 Jun 2015)
+
+  17 Jun 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.15-r1.ebuild,
+  +gnutls-3.4.2-r1.ebuild, -gnutls-3.4.2.ebuild:
+  Disable pdf doc generation, bug#552356
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> gnutls-3.3.15.ebuild:
+  Stable for sparc, wrt bug #548636
 
 *gnutls-3.4.2 (16 Jun 2015)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 690e405b07b5..0352b53aefec 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -27,15 +27,16 @@ EBUILD gnutls-2.12.23-r6.ebuild 3722 SHA256 543e9e04375cbe220d9fbf4aa55eb1683f6c
 EBUILD gnutls-3.3.10-r2.ebuild 4949 SHA256 be952f52f9e3eb120470204795decc82e39a6817baa78830cd4ac3400d245c4d SHA512 f5d2868ba167048ea66c15828d3bc666f9ecb574f835c7496fc9d186ba75d43cd95138caa11ee07cf3fe372ce6092243bd28698e3e83ef6727b9afa62a8700c6 WHIRLPOOL c2f9ccc038f320551c1ca289f899cc62605c13bc7fca317b2b128ef1701cc517bc75f1075866f335634005805f1e0854682152b3f7dd809c7bab9fcf9b90dbc0
 EBUILD gnutls-3.3.12.ebuild 4962 SHA256 a9e68cd7141cfe5d30112915150b17ecb2825b08fa1ed505964faf18b9ef97d9 SHA512 23279a2b4c2e204edee51d8cf5c9eb5550e622f3987aa874adb757bf3c1b08b21b7bd0025bc67f9b7c4ff619c509b5aed7a7ee0790fbbd8c271c49cee24942d6 WHIRLPOOL c82d0c93a0855bafc8ad0cd795d163d28588f86ff7b95c494a6d101007884ddd4a8e4c3ae495e0d986c0fbedff6ff4d1bb98c09bb8cffe4b19e236d7c2dffff4
 EBUILD gnutls-3.3.14.ebuild 5018 SHA256 5be0a6594c786f5dacfd05071163767039f2df2fb82b5dcd0681717c4ec4e7fb SHA512 20dcd24ad9faa34d5cb419dd201857f411ccb925874037d25e3a5673407b14131b3443d921a577b222603b347577be35af3df052095e32782405ac8e3febb7c6 WHIRLPOOL 9b63d5f566a61961a78d5f83bf915ebbd8a3d10c0ba213616e679c2d168e8ab1ed1305be33b76289b46ac35964a8f12b88d30f5b5003dbae912f6ba78409eb74
-EBUILD gnutls-3.3.15.ebuild 5009 SHA256 4b0fc834b220d61378d4f1a55c74eb5fe81ed74e2caa629428f760d016ab9244 SHA512 328122156dedb81be961305e6f69f39a90d62f1c6e4949beee0b3140bf40242abc4d3c8b7743e10f83a6dd5638cab227960f5a28e47922136156efcd27459c54 WHIRLPOOL 1dbe1ace27751c58c123ea8c49b813e847e69fad8eb67e26ee7237388035d2f93cfe0baf88b7f2dd2dbec9c3882659aed962826467538a17980d8a1c7fcf094b
+EBUILD gnutls-3.3.15-r1.ebuild 4950 SHA256 7f370fbe3b1e7ccb0914cbe5999f7179ea7769523a7d66bc6eab785bb447720d SHA512 efea1c678450dad6c2e6c522334599957e2e85005b9a564cf69172a8c80d32c6affff6e7d285e3412acd0e5f48af81758b6d8da3b466947452503844ceb7c6f3 WHIRLPOOL 6add5ec3e8bb6f4a03bc24adf4130a1de83c12cbd39c868ebfee769e22528c5c31fad9e0f98cc9ce0395f9048df2f332c681f93ba4010e430ac5313db8861389
+EBUILD gnutls-3.3.15.ebuild 5009 SHA256 0fd0d2f50ace49540bbf0ba70ccf6915016ad986e3de2aa9b14e6b19764ee6ba SHA512 c0fd4f5472166007863464a1f02b1f677a029394464e9ebdb5338f13d57465ce64169b25a83acd814563dfd473ff7b7869223c3f8b306ca39dfd99aa4dd8fdcd WHIRLPOOL b0cd8033f9ec73b2c2760a87e9d9a136c877d9fbc5919c5c8dd0709ac1c4595ca7d21c5ae1f3a12650527b6f8ad0dd65ff7a447a203d160569093210c3933260
 EBUILD gnutls-3.4.1.ebuild 4204 SHA256 5a49f3814e0176a15ad3da7c60d5b2fb61e0b0b8ff84edd733b363ac9b6e0a60 SHA512 15cdb71cc56af4ccaa67ff842408b3095bb0f8e8f7b8a7b32171b9b6c4dc3161ecf5068f25d91536b72309821b5f6cb53a6aafcd00241c67353316cec741cca2 WHIRLPOOL d2380a6e59d15b87814adda7c09a5cb97d510d7ee6fda395ae1f2e740bc541b3a37b2aa164dfb20b30ee6657dfa1c9edfba9f141b8fe55e4d68c7a6faf644f63
-EBUILD gnutls-3.4.2.ebuild 4244 SHA256 2539fa7d0f27b487e53931dcc1db7f9038a6871a55a37f02d2d448e0c6ca2e45 SHA512 30164f6f685bface2fa9b0e7c6b1d0555e23032ed26e0b44d939b2b98796426c97115d6c2dcd65a043629c40df96735c4620793703a3b2e8e3c4397d0da640f2 WHIRLPOOL 0b77bb9d48b8da9ebe9834e2c91a17534179c79ed256b6016995b2036754f117caf9a890ce5790d66cd7f0dc2715709b6d555af45c7ccb02c0f0388a8eea9960
-MISC ChangeLog 81545 SHA256 35e6d28e95539ac805e05f008969b33acdcd005c09e1c570cbd9e24ee3732742 SHA512 877b0ce110ed016ca4193c273ff70541006d4cd9d815dc0180c631c6d81627f723055d189713d764364a0f74e4a892a7772ae483c027c0fafe470f03c9fcf287 WHIRLPOOL 865dc553cbf96f588e5d7491fecd0b22acf781899466f91aac4ac46bf9974b40953fdd05a59f6f425cd892c72b9922a98d090b2d4053b6a06c6b2a12af973d94
+EBUILD gnutls-3.4.2-r1.ebuild 4174 SHA256 1c63ba9745872137c22a5faeb40e8a26c213f9d3759e306d3c970c4875e807e6 SHA512 8422fdac61e1e35e8970f340b2e1e67f0d0a65cea543980df3135a9ba7554412c932a2f9828d637dd592dadabd10b1b05d99e48e7426d758c5ebebe02d3bcfde WHIRLPOOL a2edeba5b5b8ac608669fe0776413cba3e2400a210963836ff7a925082abeab942be0b28c05dee7d1c429f3ea84176c142cd32828b2c2c48c1b5bf2312427404
+MISC ChangeLog 81882 SHA256 bcdf9cb15396eb22c01184b674e54f3edc8b2e15cf8e93ce972bbbd3600d3ee3 SHA512 e178d3f29f9de218ea3b03ce974248fbe9af3ca6c365e69112a3204f5fe11b9708c5336718d08f1bebcc3427ee6ce066c94cdd92b5eac2535d0cd0bc3beace42 WHIRLPOOL 5e86e940b450f48afcced6a10c4ed4c3289301241138c7fb24454b266da7c0545d8719ad17df76fe25c41788183bb2b3efa50073d43cb8a3c110e88cfcd633aa
 MISC metadata.xml 1015 SHA256 e3a234ef8cbc938ec33d80cc1dbdaaeae67beb83cd4f6fdc2a4bd0a3db37d7fb SHA512 a96893cf5d5cce516ff082ae1f8dbf6fbf6bc0bbb2a40d824f8086724c827589369f43dc66be34c9b05dff0af029c1aae9b7d96c891fddc495108433bc5e3fb7 WHIRLPOOL fa8d80766ffada287ab122ddda6afa33ee12f48a2c83245fd56700c3fd38c9b4694d1de2bdad6851a2347f3b0e68339373223533930a102a2e7bd6df82e3d893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWAjbAACgkQXYk9GL8g3FGqKQEAgEhbGnrOLBdPr2zvaxHkFP7h
-h2KyYfcw1Blhvk4CTGsBAI7iN3oR3J22N0S5mAKxPs4otgJjNL3jSXRVa43l8eHt
-=1cON
+iF4EAREIAAYFAlWBv4IACgkQXYk9GL8g3FHyWQEAgMb3d13cU5xGW2C/U7wduy53
+zMPs0gkuzrMe5zCLQFUA+wdc5r2Tbfge7sIw848J60rXixYBn33IqTr++xObGVNw
+=w898
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.3.15-r1.ebuild b/net-libs/gnutls/gnutls-3.3.15-r1.ebuild
new file mode 100644
index 000000000000..49beb33b8349
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.15-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15-r1.ebuild,v 1.1 2015/06/17 18:42:05 alonbl Exp $
+
+EAPI=5
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+	<dev-libs/nettle-3[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
+	crywrap? ( net-dns/libidn )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:*[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# force regeneration of makeinfo files
+	# have no idea why on some system these files are not
+	# accepted as-is, see bug#520818
+	for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+		rm "${file}" || die
+	done
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+
+	# bug 497472
+	use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	ECONF_SOURCE=${S} \
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-valgrind-tests \
+		--without-included-libtasn1 \
+		--enable-heartbeat-support \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable crywrap) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm \
+		--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		# symlink certtool for use in other ABIs
+		if use test; then
+			ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+		fi
+	else
+		emake -C gl
+		emake -C lib
+		emake -C extra
+		use dane && emake -C libdane
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		# parallel testing often fails
+		emake -j1 check
+	else
+		# use native ABI tools
+		ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+			"${BUILD_DIR}"/src/ || die
+
+		emake -C gl -j1 check
+		emake -C tests -j1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C extra DESTDIR="${D}" install
+		use dane && emake -C libdane DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	dodoc doc/certtool.cfg
+
+	if use doc; then
+		dohtml doc/gnutls.html
+	else
+		rm -fr "${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild
index fe88e441b9bf..8be683288e24 100644
--- a/net-libs/gnutls/gnutls-3.3.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15.ebuild,v 1.9 2015/05/27 13:00:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.15.ebuild,v 1.10 2015/06/17 08:50:37 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
 # heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/gnutls/gnutls-3.4.2.ebuild b/net-libs/gnutls/gnutls-3.4.2-r1.ebuild
similarity index 95%
rename from net-libs/gnutls/gnutls-3.4.2.ebuild
rename to net-libs/gnutls/gnutls-3.4.2-r1.ebuild
index c688dc185375..01c6598ad9c3 100644
--- a/net-libs/gnutls/gnutls-3.4.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.2.ebuild,v 1.1 2015/06/16 20:57:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.2-r1.ebuild,v 1.1 2015/06/17 18:42:05 alonbl Exp $
 
 EAPI=5
 
@@ -100,7 +100,6 @@ multilib_src_configure() {
 		$(use_enable dane libdane) \
 		$(multilib_native_use_enable tools) \
 		$(multilib_native_use_enable doc gtk-doc) \
-		$(multilib_native_use_enable doc gtk-doc-pdf) \
 		$(multilib_native_use_enable guile) \
 		$(multilib_native_use_enable crywrap) \
 		$(multilib_native_use_enable test tests) \
@@ -121,7 +120,6 @@ multilib_src_install_all() {
 	dodoc doc/certtool.cfg
 
 	if use doc; then
-		dodoc doc/gnutls.pdf
 		dohtml doc/gnutls.html
 	else
 		rm -fr "${ED}/usr/share/doc/${PF}/html"
diff --git a/net-libs/libssh2/ChangeLog b/net-libs/libssh2/ChangeLog
index ef48e48bfda3..8ea71bed0e2a 100644
--- a/net-libs/libssh2/ChangeLog
+++ b/net-libs/libssh2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libssh2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.107 2015/06/13 05:05:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/ChangeLog,v 1.108 2015/06/17 18:10:17 vapier Exp $
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org> libssh2-1.6.0.ebuild:
+  Add arm64 love.
 
 *libssh2-1.6.0 (13 Jun 2015)
 
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 6c95b5b6eb0c..eb87225440bb 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -5,14 +5,24 @@ AUX libssh2-1.4.2-pkgconfig.patch 288 SHA256 0a4fde85a0772a6ecc793493c19f5841684
 DIST libssh2-1.5.0.tar.gz 728222 SHA256 83196badd6868f5b926bdac8017a6f90fb8a90b16652d3bf02df0330d573d0fc SHA512 9dada6d86e962ce35d6d30625d3a8743b5f269b325d4f1e072206e73c4ef87f216fe54c0c5bfc06eb969a07e221c21ce6f7b9e5524afdb3f957a25f714c62f73 WHIRLPOOL 94e897f59a02ca7ab4b3006cc9c84228a202f16a8e898f202e89015275e95324cb7a71c722324134f1b7f5a85a45718a2c7d25de1d806e0534c1d61683da5487
 DIST libssh2-1.6.0.tar.gz 734110 SHA256 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 SHA512 aa28bf782b5de1f09d1b85aa8b480069bf08494ed3505e59ed522799dd710905b8d3464b3447e35393764632d5e43d21990ceab9584a8df17abda4f85dfc2ec7 WHIRLPOOL 0702eb089483b5047e517e89eca0c23719528b3672e24bf3f3a3ff3c0ca5335e1d00ff328f0c6458ae1cdd25d73d222cb3dfb5d95445df80a6bd9d8c4f17b9ff
 EBUILD libssh2-1.5.0.ebuild 1283 SHA256 b52c991a653c0a276bc2260a88a738c51b197579114c58001fe90b6b552440c1 SHA512 e4b8a53b897ea45e10077c489961be429aa38d3e0ea6b24fcca4e1ead44d685d78bf38cb49284fc52992ad9abfaf7d21df7732bbb8e8030634fdf422f8dea43a WHIRLPOOL 6b9a95a0eefd350cf18a6e1290e6d04b6541139e606a729a5a11447c87db488f53371f5194ca33a90e6bdcd642a942ac9845c368594a5a00ae6dda60f7296735
-EBUILD libssh2-1.6.0.ebuild 1291 SHA256 ede4ff2a04174743c6daf63b25dcea0e5554ff3acb80d32008a68d00967a0444 SHA512 048e72fd9c1249219eb349b16dd243e6556d49844cca4f2bfae09d0af2fbdc3a29cf5c08a0499c991ee43d823b4876bcb75a482dd268f8a5d605f2c3930e5ddd WHIRLPOOL 5efb4db7b1887af3a07b124dc09cc498e6000161a460c49d2a29cead2b4546c0b74aa1cf63df924c2f25e8974c1cd0ee9ff94ec8d438b74fe01d203c1b6a890f
+EBUILD libssh2-1.6.0.ebuild 1301 SHA256 70b417ddca15b5c3e63bf6eacacd8800d067044bdb93d014ec95a05653830dbe SHA512 7c362183962e858b28ff4614ff7c08037fd45f63f1f879301c3626f65c15d7cb8aca6636f35a8882ce74864996a1e105678da5b7b25de193d316056a5f5f0aed WHIRLPOOL d49f85b8eb91911a2f2251569fa56014fe581a6c69b3f5aed1a456607dd4f7be0f84f3d2bba894f6ce0f1675417bcfe5770def312ea76732d69d2a88dd939148
 EBUILD libssh2-9999.ebuild 1228 SHA256 32754ed54e7970b1e215f44e972b22db3b6d571a8c301b6d7176d2b9e092f716 SHA512 713328382048d02998c1232e76a153d511d242bd473c5503441f27157f4f4b728f904a2f9515cd5edb81acdc7bbce561e26db755042402728eca7d20bc1f4fc1 WHIRLPOOL d945f50f4103c620a080566e95553d1e52c02bbb2c07c5a58b21cec49c161edefd471618de6f6ba9c28e6acc00c1f083e935140356ff4516850bf039bafa59ab
-MISC ChangeLog 13106 SHA256 670f4319702fcc330e0eca0bbb1061a394ad4f0cccbfe9bfac9c2a39d2d21940 SHA512 4bc1d3490cbd492139974f46f03e6639296d2330548031c979c0252bc5ade80289cb40ad3c14e6e496ca9078010ef10e71647aeed4cb0faa3e2c7cdd96ebee64 WHIRLPOOL e91540bf3ceb7204da6941f3eb5d8ff92ae97b79c15df630687c1b9650b27bc7bd20bbd73a23182f8fffba16cfeabb16cb57fe450868695ba10946eb048e4876
+MISC ChangeLog 13200 SHA256 e10e89aa26a78a2d960378b97493d6d0dba79375533927466a076e480a2b13cb SHA512 81eb0e1dc5c99fc14744d6dd90f51dd2b5c508ab3eff23a3202b1b138d51968da3af87afda7bc371ee92d764cd1c2af140cf637f57412d8ccc8304cb371d74ec WHIRLPOOL 9bba57da3fadabda90218de3829f906aa87830d3c0330cdfbdd6abadca2cfe0797caa0733e60e81ccccd3ac209f673fadfc72413a3fccf2f891cd8dc1ba84fc0
 MISC metadata.xml 272 SHA256 4c07d4717c27b5976aac9ce277542bedc24b5bef17f3cb4c7927fdc24d0fd709 SHA512 7a616c601fc9c21e3c6f96090a84a0c9165751ff67c7df5f22a6a481732a38fc9eaf591c7250f777bd4f7fbf62bdf10cd71f744be4ceb89f33844dc00b63a5aa WHIRLPOOL 08dfebac6c76e121aebce82c9cd160a76481c008a3fb76032a22216d90644279d5af7b02e0fed005d43381e8c1344b5e7edb52a61c060295aaba05787ae2af37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV7ujcACgkQVWmRsqeSphPT9wCcCtQy5Er2itFkhosrFaPz4BMG
-r7gAnj5DYVrsDafUyE9Op8EE3upjQlXu
-=Ypoi
+iQIcBAEBCAAGBQJVgbgKAAoJEPGu1DbS6WIA6ZoQAIdQEQN2GaJNdqSMH2ukzYdO
+Vb767vmgKrBXj0Z6IDj3a5MkrsPpYZUOfc/oLj1cpVqp/EjVY0zN3KxP6IdBMASf
+K4WVURfAvOXY/1agsb+cgFeenx7lS/X6two2WnT1HvYdfcUeum8QLUeC9/JutoVZ
+IO5a9XmNXwkxrcjxzm395eisstBb0q5cq9z3xeqM82xVM265LOlAZmYmKbdoTz2R
+YdrF0Ffyl3orwykUKlZ8xTXyWiV/XjZPZ+dV5LZStx/X4DpyiOHa/60JWgQeFpxq
+3e1PNPyGdQgHQumIjJSOnqHIf3LziBD/pa1EV428Jxt3dHTuxm/Hox4BLkwd6Dvy
+afOj9jOZT/T0toEAPhpW6EbRByctNt7WSSC+4AW5wDQYu4Zs1l0Ss6fQfo2bmWmS
+VxKkgGxcDebwttCIeIMul8BwI7edkQvUWect6DFRv7epT0DErLCBH9OZQuv9CN3a
+ccnGyoV/o5Q4KO74YGvuBKcqEJtzCT+DpkeG3Nlisyp43yL2yFKxM/WFliq9ZNFS
+UswqwnHT6j4BTuNmXG8qHH4c31cLyrlWBAz6KW0nTAt0tpbW2sy6dJe/RcwjlQyo
+g4KN99SY1KLn8CJrb/iLLGiqzHFnavj7CRbcBpJX8iElsqVgr23+Sqm84azZX7IC
+dEurp9u6NWmiNFZzZJ4r
+=2vDh
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh2/libssh2-1.6.0.ebuild b/net-libs/libssh2/libssh2-1.6.0.ebuild
index b4e08138150a..2b25aa27bb97 100644
--- a/net-libs/libssh2/libssh2-1.6.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.6.0.ebuild,v 1.1 2015/06/13 05:05:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh2/libssh2-1.6.0.ebuild,v 1.2 2015/06/17 18:10:17 vapier Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.${PN}.org/download/${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 ~ppc-macos ~x64-macos ~x86-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 ~x64-macos ~x86-solaris"
 IUSE="gcrypt static-libs test zlib"
 
 DEPEND="!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
diff --git a/net-libs/nghttp2/ChangeLog b/net-libs/nghttp2/ChangeLog
index 0825c98bad6d..424e30f9044d 100644
--- a/net-libs/nghttp2/ChangeLog
+++ b/net-libs/nghttp2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/nghttp2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nghttp2/ChangeLog,v 1.2 2015/06/04 04:13:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nghttp2/ChangeLog,v 1.3 2015/06/17 17:45:20 vapier Exp $
+
+*nghttp2-1.0.2 (17 Jun 2015)
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/nghttp2-1.0.2-third-party.patch, +nghttp2-1.0.2.ebuild,
+  nghttp2-9999.ebuild:
+  Version bump.
 
   04 Jun 2015; Mike Frysinger <vapier@gentoo.org> nghttp2-0.7.15.ebuild,
   nghttp2-1.0.1.ebuild:
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 49b17e421caf..679d80be9752 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX nghttp2-1.0.2-third-party.patch 991 SHA256 a13bd387eeef8a431bd6e3f5749460ed3eef8c533372c9d59ffce48366513cbe SHA512 edb993577649ad86c631df22e8f4fc99ac9cd3a459904dd9959c64c7bb51137e143cbbe3cf0871905d77cee020a7fa5da70b8d4450f41dfc8048625fae5e326b WHIRLPOOL 2b118f2f901d6191eee87f660060b10b0f0a09e081faf242d48d70f4e8fa5ef5f03c007f23b8dc5de738d9ac1b7250e66b1aed00798f0ac2fe515f8fe50b9ec5
 DIST nghttp2-0.7.15.tar.gz 1350366 SHA256 d6344bf52ef33de7ea328a93bd307f5f8ee7160562dd54a9e2f5f6916a71fa64 SHA512 199c339e3c0e20d87d644d9b9fd6ffead5fc2eca4958259aa21156b20cf15f7bb6e90a10f2fd0af97ca10cf876eac65bd769179bf60d8423b77eb62549f6040c WHIRLPOOL 5348f64309a7b1aa0ea456b990adc247bd29151512fb7967862f99ad3ad7ba2a8881db178b6915afc5887452192588bc18895203841c7743f2e4cdd2a6c8f449
 DIST nghttp2-1.0.1.tar.gz 1350918 SHA256 0f9eec47eeeed98929fbae3609d708cf9422b0213edd8daaa792db9e31463d89 SHA512 365b52864d8cc0cc0d1cb4a08f6926abd2886b7c5a225414db7a3dc0e8bdfe7afecea89e09a93b6a7034d4fc75a263b82ee0e35684900e71e21110683e1084bf WHIRLPOOL 37279a2612add1c9b88a74c0dd6d60b0ffcf9fc940b8559c8d0748f4f0cf6fa452b1135041c593bac0fc0cc3c3857d2cc40138857c59a55670df25dc66cd7a71
+DIST nghttp2-1.0.2.tar.gz 1355779 SHA256 6746fa7e282cfe631ad4b69f824bf14951b80e9cb952e825c76eefeb6a3806cd SHA512 6dbd4595dd53cf0a2d429ac5ea16d2f29706a240810c1e9a9d76465b44c6410d8f96b262d640f13331f1b5f0ebdd804a9e9f1ef5ca09f2fb898da2d56902cd64 WHIRLPOOL f0e34ecf30d8ebe3f6325eac7396fbe8fe3df77bbc58796e25fcef7c9e06f0566161c919188b562ba04c5ab84a82150307b70a2890597cc8e32b7bc1437696aa
 EBUILD nghttp2-0.7.15.ebuild 1793 SHA256 0294b852f87e34f90c30e1cabf9fbfaa8b7b3828c6d312400e5db3184863a55e SHA512 28c2498d02420abdb213a09eee6deb683d2d2d8dde3963b616de075f6d081a7e7b4e72b4cb1ec6d091c8e3864b573fa77c710273a382e78e88a075b2257a4afa WHIRLPOOL 3715b87352474f7e8960f12d8c33423b5af83f64b147609f046430aa8a3310ac39dd92edb4ae43be759f18735ca8afaec43da95405dc0cfbc492f4c2a200270c
 EBUILD nghttp2-1.0.1.ebuild 1865 SHA256 bcdf54fe4c1b3a7a66dc022abecb06d8d5c633dcfd1d87203f0935d06e34eb78 SHA512 c9e06b82e1b186053d021d4d2dae526d869bfd7812b3afaf5a471a7e849c546cb525f2478b199a1b22ce802508c7a5eb73bd032108911d5d0c54d9160a6bb1a7 WHIRLPOOL b50780de95f95cdd1e41819b5b76044b5ac17cab416d8baaca6a89d452d4104be9e31c8bd4732ad752d94d6dfd0637c1b535ab2386023850362072f8349dbf96
-EBUILD nghttp2-9999.ebuild 1771 SHA256 4a03951af1080fe032604ede3bb9a4821027c60acb96ad139b0fc71e5c6faee7 SHA512 48d726825e1dfbb3e71b72271c75e3354ad97ed506f66360c370bea0c9b45f991e25203923701c9823edf0ff4b5e9bd5af53ed5569e71a757a183335a627d152 WHIRLPOOL c33f73cbf0fb99c72821ae799fa2ef41d76db989cb014bb1766cd5e4e5938a2983e3cf4ecbde29f11b18569c0eda6d7da9a87e5e2c755f3e5a921fd29855f65a
-MISC ChangeLog 612 SHA256 b6a287cee6efe8bc9b4216383406ca2031cf8705bff8069b2d59a5ff7844b705 SHA512 eafcccac3dfc8e61fc6b1832d73822eb19864aea5f811f466510fc56fec4c1bd73ef9017cd949c8c4f91f57ed4c8df795984ae9ca2ce2c9abeafb2afaf399f18 WHIRLPOOL 3f6bbb6a6bcb04d9600762771da3ff61f6edc4daa37d000610c047dc507fded03be890055fb2cfabc8b398cd8b01f56c08d0d02811636e78194f77ceb6b31fc7
+EBUILD nghttp2-1.0.2.ebuild 1771 SHA256 f91e5a5cf0428efda44e09ada9e53b2e5c4e5c26b69ab9bd9ee9602ab901b059 SHA512 4514509a329d6fb3edce97e244b61ed7401f67ee4ab49b040f576500be10e0498c2d9134466b9789317a7cabf405c5ed70ebf0ca0f40ccaba263445f62785586 WHIRLPOOL f764e62df65aea0b1290cb6ee6612470565e8ee3f0b63f6f20cf87bf2aa16db94e0f8b4c287b87ec70c956592c224959cac5352fa6b6a59e2652940ef02c6378
+EBUILD nghttp2-9999.ebuild 1699 SHA256 386cf4997a2a7ece4b1eb309171d0502722d7a930c1c788880129074c433cd33 SHA512 b5595aa58cb8957d08b4cd0d19703601e4449fd0d9edc4471d5ce7e675ee0c552ff939349d3d8c22896e27dfc81a4ad5e1b2ebbf8d6c57db3dba0d08289cfd58 WHIRLPOOL a245cdb5b04c4a91ea112b860398077e60c9dbe0194ffe62aaf41188ca8744304a6cb20a649511e9416a985593298d3ad75ffd3bb4276b93498b550102966b0a
+MISC ChangeLog 797 SHA256 610563fd2bc6e560ba373780991100d7e7a01d1f238cf35494a9d6e41e8fc5df SHA512 0f185099e206f3cc4b362b1644a74be39b3c8ba221c5a3ad22e00d82f0be3563ed73d4404d497e2ba95fa523060366caa3dc726ee64d302835120d9616d0e67f WHIRLPOOL 28e847d565202ca193a74dee7c151ddc5de549bd299d3509cf699b8ddfbb816748a381c51601f8fb933290660c7379126dfb5aaa8e7625b234cc21918f2a8dfc
 MISC metadata.xml 534 SHA256 504e14e48bbe637d6a3b4d170e7507319530601fd638a64693ac3fb761e966c2 SHA512 1cef8544c6d23ee959215825c0e16dd8a5f4f8cd2a2a89e950e4ebfec0cfa5dbd18012d093ce39661d94985b920f5e231af24ca61bb567451dad2951dd735460 WHIRLPOOL 52a02212ab896edfec17e047b7008c73b900216e9a09b1cb733310f0463a00a54ce90d849b968defe0c45c3579c89f32bac4b5b8217297a3a30206d1667997ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfw58XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixQsP/R5B55QXy+9ayAwyDMGvsx+E
-gFx61w2yl6ocMYv1w93sxv9GAfOhLuD9gzMJtdZ/W81R9xjKjPSrkKOVb4OHTQP4
-mBpZJyAU1D8zhJJYh4IlzfhOXbx+B+zI9Ez2dNaArXAzfqAb5zzMbn7gTjQkxxCb
-pNYF6/WvbOSpCJrAo4G7Nudhd3RV0ZBu3Zgwu8Td5e53aHwrWPR6n/YXrEp+Nevd
-nUURab4M0PdomRSkrzJcqkuyzugoeLaZgaYWMQ2dbq8rd6RNUnCV2KJvZKnapzH4
-1iX58yPkOh62hS6RuloUJU5asMsLSQREuU1IL1x1HwuXiw+qTfvBeATeSe92kzPf
-CF+Op0YdtI42fupQkRTBjeibyrxIaAyLyA8LmVKrOWSPQDVTLIzclGb72LM/IoHa
-xPtvwljQ+VmhYAjf02q6sYml8cZuyuQ5EXkexsgd+ly+rW7gJmPozYSe1la/UF9n
-oTS8GoaHZnqgNkZzWNIT0Qe+yDdr6ZDcLC0dsI1YW4tYk8gYU5ECgM2ZRlazm2nT
-G77bqZqrTRbDYJ7Z+jbydo63FMdu3VyUafu4kaIhFXbv8KukcuHn5SWmhL6kvooV
-Sr1auSJBvVQIqpnsXal42tHf/9rTppmUHgZC1ZoM7mdLOfD2sWxyVZ+9Cv3xEAhT
-t3+Jf/DQ97yMJMBzuH6q
-=YuGt
+iQIcBAEBCAAGBQJVgbIxAAoJEPGu1DbS6WIAPs4P/2zxJxbQxQFr6K4kMAMj9Cr/
+NEVx0hkr0gwaZ5QzYMTKl1OznY3v6tWzS3+TfzM09MOG428Xb1KOSH1JgJP5gRcY
+RJnZI+lTZYBcw6YBRs/h9gYLtKbkwhGUItPj0oqUuEQo1tFZ4C2sQ2JTvCRsFlwX
+g4qlKodR+ZPRPcjBHib55eOtgcq+Q6BkHDSOE8xuKB0zIGkzrvlarSU7+qIIh02b
+vQ+j5EwASiqrMy1AWQmcCAA9xGV+koBy8c5YWf44OySdHs/AH+4uB85ygB11pJ1v
+Q+TYF6vYmn3w6rERyKQ+3iIzyYSzsh5cuUpz0uXFcM56I+UuT17Zt81T5gUXo5gG
+WvWu6F11vI15iGvHwbMhcbFcfmsIEnya5DUG0XqbpCB+F72m+g/n//Lr4j820rsd
+WN6txJ5E0wn3BNrPvMiUAIGQIdKJi9hX4RGr4XQvXocyX1rmozune+YG0hQhcjMP
+nN2du78O3zHN82G1erKhi53ZAcarJBZOxDuAarSZwDZUhP5f7xaaqaHtDzywt50w
+Uzn2kCzmKzkH6EjdA+7cFNAPnZW2BOrAvY+xzr6yvJNPQWqFcXX8j5nHyQ0sBl1B
+O3jZC+b5JTVwDqegYC1ve0/dUAoNe4DN9SEp8iep86qGfqlTSzfpASdXpZCoKA18
+sjkk0+jLC4SZ4gBop4xH
+=XSs8
 -----END PGP SIGNATURE-----
diff --git a/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
new file mode 100644
index 000000000000..9e5323bc81e8
--- /dev/null
+++ b/net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch
@@ -0,0 +1,34 @@
+From 19309823aa5e4e9a65436bbc32430c9092e5d233 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 17 Jun 2015 13:29:37 -0400
+Subject: [PATCH] enable third-party for asio_lib too
+
+Since this library uses the third-party subdir, make sure we auto-enable
+it when that lib is turned on.
+---
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index be51a24..8e81741 100644
+--- a/configure
++++ b/configure
+@@ -464,11 +464,12 @@ fi
+ 
+ AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
+ 
+-# third-party only be built if either enable_examples or enable_app is
+-# yes
++# third-party only be built when needed
+ 
+ enable_third_party=no
+-if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then
++if test "x${enable_examples}" = "xyes" ||
++   test "x${enable_app}" = "xyes" ||
++   test "x${enable_asio_lib}" = "xyes"; then
+   enable_third_party=yes
+ fi
+ 
+-- 
+2.4.1
+
diff --git a/net-libs/nghttp2/nghttp2-1.0.2.ebuild b/net-libs/nghttp2/nghttp2-1.0.2.ebuild
new file mode 100644
index 000000000000..7cd63362e1d1
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nghttp2/nghttp2-1.0.2.ebuild,v 1.1 2015/06/17 17:45:20 vapier Exp $
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
+
+RDEPEND="
+	cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc )
+	utils? (
+		>=dev-libs/libev-4.15
+		>=dev-libs/openssl-1.0.2
+		>=sys-libs/zlib-1.2.3
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-third-party.patch
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-examples \
+		--disable-failmalloc \
+		--disable-werror \
+		--without-cython \
+		--disable-python-bindings \
+		--without-spdylay \
+		$(use_enable cxx asio-lib) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable hpack-tools) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(multilib_native_use_enable utils app) \
+		$(multilib_native_use_with jemalloc) \
+		$(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 178e4cc47dc4..900234c99f24 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nghttp2/nghttp2-9999.ebuild,v 1.1 2015/05/24 13:55:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nghttp2/nghttp2-9999.ebuild,v 1.2 2015/06/17 17:45:20 vapier Exp $
 
 # TODO: Add python support.
 
@@ -13,8 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-2
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	# Disabled until new curl & mod_h2 releases are made for the new API.
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/vanessa-socket/ChangeLog b/net-libs/vanessa-socket/ChangeLog
index 59f22885a170..d2b27c598a11 100644
--- a/net-libs/vanessa-socket/ChangeLog
+++ b/net-libs/vanessa-socket/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/vanessa-socket
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/ChangeLog,v 1.21 2014/12/26 08:40:36 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/ChangeLog,v 1.22 2015/06/18 04:09:57 patrick Exp $
+
+*vanessa-socket-0.0.13 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +vanessa-socket-0.0.13.ebuild:
+  Bump
 
   26 Dec 2014; Patrick Lauer <patrick@gentoo.org> -vanessa-socket-0.0.10.ebuild,
   -vanessa-socket-0.0.5_beta4.ebuild, -vanessa-socket-0.0.7.ebuild,
diff --git a/net-libs/vanessa-socket/Manifest b/net-libs/vanessa-socket/Manifest
index 7f66bcd5a4f9..2d20045def78 100644
--- a/net-libs/vanessa-socket/Manifest
+++ b/net-libs/vanessa-socket/Manifest
@@ -1,5 +1,7 @@
 AUX vanessa-socket-0.0.7-version.patch 1104 SHA256 aac30124e5cb304099775ea54fceb532d945ebdda263a4e7356454aa01d98adf SHA512 7294112137fe5baef1053f06c8869c208a09fda491dfac914a07223c5ef79e3918f79e07361673919bfcae35d9a90e4625dd1f345545a3bf4b33ee6d2c448a34 WHIRLPOOL aaf70972e492a25f691a937ffd6589620304dfd5c3d30350721b0e7717b5bea3126537dfcaee61b8a9b1a1834346977750856d4b94b9b823845d9b1ccf56ff63
 DIST vanessa_socket-0.0.12.tar.gz 346375 SHA256 809f11da9507c69d72839e672149d391c036be57cd49cc9a35ac64bdefbf51bc SHA512 24767cd77b6017156eb82df6c76b364bcc379d043562528d389b994497bbc041d29aaf72fc94bb877e7df19f196f8cce8879e203ac679570a92ff0782bef2d42 WHIRLPOOL da6890d4470e74f6bf6759e97886c2d29014fd53d08075b58792d0d33ed735b74772d808f58859cacc44111525bdc382018721570c012dc07959c61394eca9de
+DIST vanessa_socket-0.0.13.tar.gz 384431 SHA256 13f837fd70d3ec0f8ffdf02bb326aa5cb9985167bf06365f8ba228f389ddee15 SHA512 c25ddabb3ead8e88fc924277ed1aac3a932f35f31974ee6340310cb8c6dabbe9ab163ebe475c9eb7b2dc66f79a07b1c70e00b228f57ba2b06bce87e5e0e3ac65 WHIRLPOOL 84848d09d991cf1c393dee48081a507ce62d949a30d28dc8c78b1dca6d0c1a57673a7c74e325a68b5d71016f88336cea94062758441ecd46b4b74d46a5e2758f
 EBUILD vanessa-socket-0.0.12.ebuild 793 SHA256 2a5701815796ff397bf826ccf742b317995c6a46c47c16842ee61cebb5987273 SHA512 e05287e68d51c8cfd3158fb5ed063607140939ca4da1207a90383711748d771ce6fa492fd41c4a33791d40164413103f06ef9e20bc2a6feafeff3381a739deaf WHIRLPOOL d397f544ab181c951bcdba38aefc08aa24e22878dad51d3064baaeebf45f00b83b73ab466173adc8bc0db596f3d5c65ceb6e47a67f7b650105f8a71e2eaf797a
-MISC ChangeLog 2662 SHA256 03c0c750824856ca277c47742e63b2a2af2044b38eaf86dbc60c6714ccab681c SHA512 0af3b9bd784e13b61c8e9c133cd011bd864f9f07b763afabe38df608f57ad0e43e217935d3427d07fd7addde930be8c406e4334e2e6ab82ad639461b22ec7569 WHIRLPOOL c8673d01e1d3b333b9eb12bed6cae66c13a9bc4df956acfd0b41dbd67fc36364e8fd6fe2d91ba8114c833f1a47dd67478c53318ca02107bfcf9822416ec18c70
+EBUILD vanessa-socket-0.0.13.ebuild 719 SHA256 fc3c55c545ec2ac0edc7274da92259c5edaf52106b7edabb0b88c41871c907ad SHA512 76538c7629635a6b34b663a0a266cc6d7014c1754bc93a68a97a7e69a74ba111018f957383931f93d1b5e611300809a000638e2ad6394de84ed8c0e48b030769 WHIRLPOOL 5ec6b0b0a3291658be6f9d678b0bb821a2958d809ed778c144f7048429bc470c82052b98aadf05a0f2dc57c12e69bdc243d562c0087a8b2fa82f2f76865a1042
+MISC ChangeLog 2789 SHA256 3fa1e180f4eb21fb95cacf2829b8b9ea63181b6dc97884ff2e4d04e6dd93964e SHA512 1bf7a48afee69226eb562c5338d0f0cb5b93cd916fb377e6d0f694a6b171d9092040dd235efbbae523e5af645f66cd97f447744b7fecce1d115689fc1e1150a1 WHIRLPOOL 085c101a196488002e4f3c2b5184b8b68efed2c840c979c73c6cb80474159318397233a0fbaf86323af7932ebe292f8efc56406dbf52cc4d67961d8b2a901481
 MISC metadata.xml 275 SHA256 780dae37784989c8c166e00f8a13a1b256c67feb87657016b93db3cec4e755a8 SHA512 c69320f94e1ceecb9199120795acf4ffddb6e972a63f53db1d6dca49449b5f1734b320dbea6fc097edceabc5fed17cf18cef6a917451cbe5e447dd87f8ac3e6e WHIRLPOOL fe8c08375133fe403a057b4499e2c988bfb517193263edfe351abb33ede09cd30a16008cc968886c814230ca61baac2cbbae4e0efbd308f7d0f6abe66590f1be
diff --git a/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild b/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
new file mode 100644
index 000000000000..781357b62f63
--- /dev/null
+++ b/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/vanessa-socket/vanessa-socket-0.0.13.ebuild,v 1.1 2015/06/18 04:09:57 patrick Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Simplifies TCP/IP socket operations"
+HOMEPAGE="http://www.vergenet.net/linux/vanessa/"
+SRC_URI="http://www.vergenet.net/linux/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/vanessa-logger-0.0.6"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	make DESTDIR="${D}" install || die "error installing"
+	dodoc README NEWS AUTHORS TODO
+}
diff --git a/net-mail/libpst/ChangeLog b/net-mail/libpst/ChangeLog
index fe2a88bb85c0..b549638e2969 100644
--- a/net-mail/libpst/ChangeLog
+++ b/net-mail/libpst/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/libpst
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.49 2014/03/04 20:12:19 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.50 2015/06/18 04:45:15 patrick Exp $
+
+*libpst-0.6.64 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +libpst-0.6.64.ebuild:
+  Bump
 
   04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> libpst-0.6.63.ebuild:
   Stable for x86, wrt bug #502890
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index 7d91c8f9f1f3..834b49e017b9 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libpst-0.6.52-no-static-python-lib.patch 449 SHA256 38d477f58bbc4f518cc79dbe322c475bfb3829cc5daa93cb6ccf79da92e36656 SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273 WHIRLPOOL 7cb36c586e9316d0e395a6b69330f80c544f37f7a05a35c73f358334eec883b3637bb5b12c32a416d2a7e9445fff563f3e356e9a006ad25659ac6d592d33af8e
 AUX libpst-0.6.53-pkgconfig-static.patch 211 SHA256 abf4dbfd38287db637a5ad22a498c5decd00f44ad9a0f734f65220a4c94c22fb SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b WHIRLPOOL dcd1e14ee2f8cd7de99ef662704c1a0b6e5856182e0914bbf516dc5072a2c6dfaf3d044826c8e4f864627274b64839ef996b4388040e7ef66dd6704ecc4d1d56
 DIST libpst-0.6.55.tar.gz 13444072 SHA256 ef69d87ae5e28175c2abeb8ae5e714eae218a0c950a5071a16fefb851e2912c5 SHA512 5f797484d70c8a00be1049722809bfa1f879fdda3620c8b01ce1888988aa206ff5a2b71e5d53b5546cef24b8aa10c44b722b1998f9e187493a564318e6c22758 WHIRLPOOL c8dd98ec4904a290d7b42f3d9dc092a6d7d7f48473608f389fa78e8da2f142104a20646feb23c0709740fbcb5b9d0f0eba85fdef3a7e763a9b9950b315fd53a2
@@ -9,28 +6,13 @@ DIST libpst-0.6.59.tar.gz 13904462 SHA256 b02733c95196b81635d088dab2a7e1e1321ef3
 DIST libpst-0.6.60.tar.gz 13851530 SHA256 dc31bb66020ce5f4cfee9d195b37172423614c281b751cd76b8e033c53cfa62f SHA512 b5e4b00d6653c3fecd0127746d64174ec69236b13ab3e9e57964fe4b283aa72ac3d62d6dd4554cdf91e3c0e42a57c6e1947baa4e358804118b763c7daa77d3dc WHIRLPOOL c7948ba6442af236867cd4933b31e6382636f4c19828cec5375b3b9cdf5b504c88ef3efc0be30eb12021abe87dd566fa7dbc72020cd19633b44ac9917bd004c9
 DIST libpst-0.6.61.tar.gz 13852925 SHA256 aad27d0097aa7359b7a839894345fb77f0e22fbac8d5ec0e96fc8ed2f738806e SHA512 46c9a685ba87bd3057754c8dd427230e747d01f42f076b9851cd2ff06e48defb98adaa44c7a905aa6e803daa22057f7f78ca0bc47375a7a5999281ea2365af03 WHIRLPOOL e05a6774ec1a3bf94e1b7fe80b061f4e9cc6a96a1d2a5a216f8a1413b9f4b667ce9c6bef5d5830f98d9132ce3eee7c02d96585491e0717d95c9cbb3ef0d8256a
 DIST libpst-0.6.63.tar.gz 13853290 SHA256 5f522606fb7b97d6e31bc2490dcce77b89ec77e12ade4af4551290f953483062 SHA512 1d45f3a19851e25b8af495c3ceeee34b74c4d14d4a9a723dcf63c009b38e5bcbc4cdb3219d136c234a85992f2d96a74b6069ad5b6cc8eed1963dfd6f7c46e836 WHIRLPOOL 19cac49b72d0fdd787105ffdadf6d8503735b21d1d6f615de4ffa0cdc4d8cb6f50010399a05bc2a101d08268ff25928eb11ece69d774dd2acc2625bf18ad4295
+DIST libpst-0.6.64.tar.gz 13861215 SHA256 13c4f26f422b571c08ec5f602d878527606a435408724b1bf90a11e31dc17fe3 SHA512 28f5ca83c4ede616b2d4d8dfd074a6866932a08594419aa7bb2af49f7871b4c92d97e0a583d8e2ef3be88a26c1a98c10ce9b1c0498073b528b6810d75988ee4a WHIRLPOOL 3f8c264cb1e9cf36992d453d5568af3fe195aef9f67fea529c50f8de71ba6b49e37b9bb95b817e34210f680b87682daaef121540bf5bd2d4388304f37c9dad46
 EBUILD libpst-0.6.55.ebuild 1592 SHA256 1c100b53e22d532e9c5fa6d1d9ef4a59c37338d1b43d2df8e80e97c031d1a69d SHA512 0d9af2f6b74414aea823ce26028fbc5ba4186e4bf31453def5b4012d28a28eb0f3fa135677f59f24f8b0b0b93c250dbc4c729a0455b5e0d4afa1fa2f445bb324 WHIRLPOOL 03eaac795bffc648baf5fbcac4604cec3bef3436135e68ca99ec0c78a5663b7f44232e182ba5c68836250e2eb988f9798a0068ac07ba8101f00bb56c864cbc3d
 EBUILD libpst-0.6.58.ebuild 1612 SHA256 110c8a781502b33302d02de5f89d4eedbbe296932d17a140230191975c7f19a4 SHA512 a9e5a8e25507a3a1486c7bb79a2094245a623a7341f9e82fa309c67435de80aa57a89ea0647aa6b0d26ef977948f16123fe77d32b2fcd4f83708c6f125e39cd1 WHIRLPOOL 3fb1ec2155811558df5605cdf2c202d50fe75def41af9c5363b6a3c2464029ba9590a3916bd44d9bb5ebc49b1c3310d3e9cce18fb27422b19fe5eaa6d714c0ae
 EBUILD libpst-0.6.59.ebuild 1618 SHA256 a9469fcff5e5d87c2dce7b4566aa981cc80e4b47f2e0696f9f844c2dbe312238 SHA512 fa3699ddb27d5dc67f07162f6b4b2a7cba5c3cab6f8079a0936509b53a82155d1f1ea70faf822ba8ff8cde2afa560b7902dd53d4f972db1bb16fb95da3716f09 WHIRLPOOL 3527dc5849680addd7949802b545f1e904125c8823e7f208aaa3b47481dc124aeb8362c161119fe1ae2432f283b48bf17645659d008cf0b7453867404c706d02
 EBUILD libpst-0.6.60.ebuild 1618 SHA256 902b77ad4ed9f5585d0c714c65ac3a71f8c607d2e41241effa30a25cb8f3947f SHA512 8f020978dd11bcb769977f14605e82c8f5d3a0202fa3c052c87dcfdcb9aedd599e4a0c75cace56f7680f3e7d6dcaa40b00a8649215a18605ceffee9f0db57dfc WHIRLPOOL 03b2c045cbf0fc25d69c2f4729b95ddd0f679283631ef421b034899ac9df638dd872e46d427170d74bbe96d3df64a716fad473eafacaaaee81ff8ee9c85ce577
 EBUILD libpst-0.6.61.ebuild 1612 SHA256 92b028c5461bde70e90a783d66733cb7b3ba212c275e6b9b398fd3c573bb92ed SHA512 2a6afd16115f487375c5106c2bed975225955dde80ee01bb82477fca49fb21411a705830d57c3011c0a4ea08d2e8d9b7a63fa778747706b2967c3d5636d4670c WHIRLPOOL fb1300ca0560148eeb9826d02b41352c171765413de0cefb0390647570d13be33f62f484c2150bfee3cfc8d9f25c1e8d4f5a30f6f740fbb35b4f712778487c26
 EBUILD libpst-0.6.63.ebuild 1612 SHA256 29f35d67315fbfe31bae865f540798e62a6ba1b21e3ad57909e4dcf301df981a SHA512 fc88e894faff0fd42e7a8910e4b5980aa343bb9dd17b48114390a0c7c089cc7648f97444fd84505eac7db21c6788ae9bddc8dfd7680588a57d09d39b24054bee WHIRLPOOL 449fa718fd695a16c09f5250f8800490340e094d51dd4d770f9feccb02473068e91f011d2955ed9b9a666645177947155755f32b1948f80661a2723461801444
-MISC ChangeLog 7026 SHA256 2228798f1f42e7cf54399d0d7a26fb32a98c278e9db4ee63b26fc7adc74c9edb SHA512 2ca8be11c491c2bc5c5b0b11dc07586c32730f017f0623f0d6e401ee55211b07fc404b1073c6808965fcafc4f4f0496e7792e7ca6b7b8a06c5c7bfba32e37aa7 WHIRLPOOL 2e262f6fe24783f9cbf8f8c5379bc151940c1e3c145cf97c89efec1949787fc807395ad8f2bd1c3208380a7842d74d2599d65d022aa42421f4db1ee130669c56
+EBUILD libpst-0.6.64.ebuild 1618 SHA256 61a3b920c49324e85d92a043c50ec5697348d297d9c20538b0e84468b21134fb SHA512 dec067880d9963362c7398466032ede3f423d52d5b78ba7ffb76d7ecd4bf4a9be5b4f9d9f7b1a1552940f41c067cd14bdbfcebdf2778e377092e803c5fecbd70 WHIRLPOOL fb29e843209268e9136255c7bb1d510208486882d27e130313e29581af7a0b540942511c6db54839d903d59286e00c94235b3ceb84ea9635a45b088a860a4c6e
+MISC ChangeLog 7141 SHA256 e0a902c202ed2397b21e3ee50c9db89508967ed9f9dc881233982cfd35f29d7d SHA512 b4fb2d9acd02d7fd911d05a06b9f5c0265c88f2e9b92ed0c57c9063ca7795d20149012b7e0b77dff9b974f7215dd6a3d1ddf6183dc40be64ad7236f62ae3de92 WHIRLPOOL 1f78efa88ea058e946ab6f38e6fad6ededffcbc892de1824eb36056344680620af292fb40438e9528e997133871ef81447408cf96388737379047cf72d1ac071
 MISC metadata.xml 227 SHA256 8627e4b3c97288567f379156f258e1e2e76f1570bb6abb583a80631b83b21873 SHA512 38394e6d478ccf56c05a5bcc2d44d1872e3ce3e654a4b9124505cd23c8b063a5529e311344c4214409c0126886a2f4ca69db26d6279889624c4005e1eae889d0 WHIRLPOOL c2a8102ca5fa9340917d08c298fa21965a5e4f07dc90799144e5fbefb66878dddbcb0b68b9e587a1b8138ba51383532f43353cf8365d064a9bc65d9cc1ad0fcf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTFjOkAAoJELp701BxlEWfwoQQAI8ZUxRTHA1rk2HCZBYPMvYX
-bUckMyNGp0Cks3KwIbVlw2c+udYOGC4K6K/48CkhcdJrmMhFxu5DIJ0b2mZbl4bN
-+qNhyFAI47EQYSpLjZNfEt1oTSkCrO1QsZgGfMWmApRrPbC1Pr29mD9gZCEZijOZ
-e2J2bMT2UyL569/c6gYYKIk7E+jy3oIS8/7ldizWwtdlLBBnGU50q4xtfk6aaXj1
-lDhiRXimxBkOeDGZ035eBS5UWIwYaqi+XiDAREVb97/xM1xAyOEvtEjdkM/73c4z
-vFUCXQXkm2eIOk7NO08dSVhEeA9IYmOcjkBytyrwi+5zN8fkO8V/uVLK0c64sSxj
-qX+n8sOIvDNld24eOWQqJF/Rb4m0fuEv0db46ckEfI9mIr6nCpGcAempYgZGYUnR
-ivrVWX+41Vk87u97PUGFoo451LxM91DbE/pz/DxkXETyVhna/a4R8lWa3cXgdRbr
-+qeKq7TviahjW0D/D/76R0rI9yefAonAhrqrHdLUOPzSSvE6pklu7Uj515INB40b
-UL93WihwkekQnNIxt5jOCADGK0IEZ1tOFFADRMt00TNUfHMnT8xdO0Hziyjkg4Sd
-mZzhkdoh3TreviLFAHWzzeGWQdtiIdjmU0ogU9oIwayRuJpBDah2stJS4RL9LhYz
-OJSdb6QhPvXOTyMoyJPG
-=2UKC
------END PGP SIGNATURE-----
diff --git a/net-mail/libpst/libpst-0.6.64.ebuild b/net-mail/libpst/libpst-0.6.64.ebuild
new file mode 100644
index 000000000000..03a44b6b6f6b
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.64.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.64.ebuild,v 1.1 2015/06/18 04:45:15 patrick Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-mail/mlmmj/ChangeLog b/net-mail/mlmmj/ChangeLog
index d3d8bb3c4334..624011c533ec 100644
--- a/net-mail/mlmmj/ChangeLog
+++ b/net-mail/mlmmj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/mlmmj
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.45 2014/02/05 20:38:56 robbat2 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.46 2015/06/18 00:08:33 robbat2 Exp $
+
+*mlmmj-1.2.19.0 (18 Jun 2015)
+
+  18 Jun 2015; Robin H. Johnson <robbat2@gentoo.org> +mlmmj-1.2.19.0.ebuild:
+  Bump.
 
 *mlmmj-1.2.18.1 (05 Feb 2014)
 
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 1de85b1a8e4e..d66f9ef1b30d 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,8 +1,10 @@
 DIST mlmmj-1.2.17.1.tar.bz2 206041 SHA256 45a93fe5c8fc8f987bd3f5b512aea895b7ce6e5c6ccd902d65fec78eeaf56c93 SHA512 4fe0921bb0fa0903e61cffca2b360ae811a186956fee280537c3104caf3efc83a72f57f8fd048b3c2a0da9006f7278d67bc497e2092f6230328cf68560d83b70 WHIRLPOOL dd5bfc91067fc209b485470212e6f63f59c6f49e54c43c19034a88960e526d1e0085eeb21908e8507b35d6cc6a992b198f324c9676571a93310cea200ae71287
 DIST mlmmj-1.2.18.0.tar.bz2 240571 SHA256 6b7072d6f899fcbc8e5d04373e80bb71ffd9c896355285a713630d5f1eeb3341 SHA512 f40fbb8a8ee5312ac6d6baa32065205b768b1ad2a16b8622e6316723d64ceb118cd6d3c0f64929d610596433e1ccb1082c23ea8ad69ca004a6b563da72bd8cc6 WHIRLPOOL 4cbb74866a0351cb2f2b132da18337095da6c79dca96ffc82e5fdbcc56cbd41e49826b83ff5551078b1cbec7ec542970ad4a0b9c9c2c53166a4bafab55eaac22
 DIST mlmmj-1.2.18.1.tar.bz2 240942 SHA256 43d85fbed9bea31728f0c600fd277e553a24ff3bb5d2317a918cf3def87f91ca SHA512 755af623054daac31dfb3de20c017422c40f7fed42c141c5d398c2bd4d5deb8975db556af53f3e5e0711a83a260d7bf3017e27c4fd399a792190de683c470b72 WHIRLPOOL 50c3233950e1a94efe6d528e9684bea3c109f2e12afe292a51bbc2dbb77d9941a942a97955c8880b850043263fa2db02eb4bc794f5d3bd3001bd2444145cea9a
+DIST mlmmj-1.2.19.0.tar.bz2 284701 SHA256 3bcd7f5a17234ef570836f043ea4aacfdaf47d542c4ad4cbe4b2293c3bdb3cde SHA512 c0f23b434941bfb5bfcb9a0f292edcfa62c9bb357014d41f82b03bd8ed1a951e3c8f09293dd333030b024d3da82c514de789b8916cc3c0f493ad8fefbe3a3afb WHIRLPOOL cf68b8718157fb5e21380dd81aa0a8970726232d4026ee75439228a108ec8dfffb1e4673041d1f9dffd27b9b53ce21312af410a7b9a7799e20cde968facb7b17
 EBUILD mlmmj-1.2.17.1.ebuild 1563 SHA256 a6eb5474cc2e81496957d1c9ed424312dd221b1cfd4bcb6f964d9af0afb072e7 SHA512 c9be126bddd703af8d41addff18bec248a6e31d69ff9cacf99daf3e653e071fc03e1cb6585987d4a6d689a61e71bac1acca5cdc400911771000a66bb84f0466a WHIRLPOOL 9d57162a2a13e14f9d4413083e8016799e655de50493575c3617e4563bc64fda42e28dec5331cd93a6cc995825adf2b835e4f5de9f2e6c665c41a14071b3dff6
 EBUILD mlmmj-1.2.18.0.ebuild 1025 SHA256 2a80da82e1c0910dc6b39e687a9a415a74c380e3e91e3abf31f59c1d9b9fc9d4 SHA512 f4ada87bfd3a6411eedde281b31d127efa8adc435031abd58b3a41d0ba36ed35fe4f75aa47b20c144cb01b88e2525be502a1f1356621277cad1624edafbbbdac WHIRLPOOL bb55a13ac569c387e17f19efa6e0158125c4c90c8b4bef4bac327ea6b6e53963e8e07c52a9019c992e241b79294bab5e9a376c73382e67601f977b0699fe534e
 EBUILD mlmmj-1.2.18.1.ebuild 1032 SHA256 76729e7d68191a0f1a9a46dfe779fc1131d9bc1a7827698a9c7b63e7f4e8a091 SHA512 fb6111c18d64087d296b468c52ef314af1a411d71c1367f8280925d569bfa8c12706c0ad1f11450e16c0ef2105d5d54780b473e1ae6d3286f319b40812a897af WHIRLPOOL 2031e0fdfc39fdf5d58f04745ad61cf8a9ff8ccd808e25f3b02a76202c177043e1819749bfba82d52f6e7ee11566f41d08c7ca3a0528d42a9f974804b2e5f219
-MISC ChangeLog 7735 SHA256 58c3a449895a8db88311835c4effa229380d5898154705a00a98350a78f988c7 SHA512 194b99f77a70a97310c5013cd3b5c19f69278a5057b427e4e55e21d7ad6879438917179c65827fac357c65f3fc3dbac4eaee73436356eb27cd48c62656f56149 WHIRLPOOL ad77f95b3235fafeacc903ebd057674b8203d1bbcc00726397c97c843f8d5146b294533e8670486e87428691b791af791a5e3dd54907e42aa495b243bf253505
+EBUILD mlmmj-1.2.19.0.ebuild 1032 SHA256 8c7e819c194f8c7c1a398f99a2fb4f1901ec248e0fedc5180388aa516e5af9a6 SHA512 0b6cf13f2ff09e0703947ab15f070a61eb5e74876e5a0c7093f3edb394cda13e5c46438c28135d9db400eb3cafcfd3a740261f95010731fb52a728a4eaf8d187 WHIRLPOOL 99e315afcfb821ee5e8aab5100ccde05123223c983a7f97f8017e3778297988d256c8a5ec872d388e74d978ee8d94872f23dc94a35bc0c76a71bbd7f2aa6531f
+MISC ChangeLog 7852 SHA256 f6fd02d7de62c646b3dafe764c1004bbb6ae931b478f6be429f9b10109bfa86a SHA512 a5fdfa76fe41b4c411aa9346e3e9171d87806174966161bf7825b3e487c05b1a6ea43bd448da385629148e87003be9d6d7ef8cc1bea61ad018e753c2ded41a0c WHIRLPOOL c00887a73168feecf34dd181beb81c256e13e9355607a3051db0c416e2c27a9f5c5c84598f5981440ac792c1a92b24f036a44f8329141d85329cec0f34dde96b
 MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
new file mode 100644
index 000000000000..8967732e6dae
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild,v 1.1 2015/06/18 00:08:33 robbat2 Exp $
+
+EAPI=4
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.org/"
+SRC_URI="http://mlmmj.org/releases/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="virtual/mta"
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS ChangeLog FAQ README* TODO TUNABLES UPGRADE"
+
+src_configure() {
+	econf --enable-receive-strip
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/mlmmj/texts
+	doins listtexts/*
+
+	insinto /usr/share/mlmmj
+	doins -r contrib/web/*
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index a0cd1452b257..985c57a77ad9 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.414 2015/05/24 13:55:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.417 2015/06/17 17:48:25 vapier Exp $
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org> curl-7.43.0.ebuild:
+  Update nghttp2 dep since this works with the 1.0 series now.
+
+  17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Fix gpg signature.
+
+*curl-7.43.0 (17 Jun 2015)
+
+  17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> +curl-7.43.0.ebuild:
+  Version bump.
 
 *curl-7.42.1-r1 (24 May 2015)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index a1903b941550..ad3873279b01 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,25 +6,27 @@ AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 DIST curl-7.42.0.tar.bz2 3330103 SHA256 32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f SHA512 8a6bf3ad4462ee8b2370e85382275f1d646565bcedded070c4cd5c87a610bae200c5c2803515514796357b82cddcc4c0c82ad04793a3c5ea4f4230c51720aed6 WHIRLPOOL 9da3108732680c26d12dc8f55b6ec6294995cfca53d7fe7be5387c04466d51cd96439b9c0ca30335b1124bc5e287dc18a62c090c71e9f3b4eb084cdd821d5b77
 DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e
+DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527
 EBUILD curl-7.42.0.ebuild 7330 SHA256 7bdd50ea9c9e7585dfe2b4463b2ff22fd6f24537b1599a7e4824afd3f0db3116 SHA512 4acfafb5a42c6032377233c255e1cb3275d72d420a9ad082e988f32b504d33229d0ed6dad674a77e0cadf0e839605057ae6ea4b2ffdf354c7464bbed853f16d7 WHIRLPOOL 4934a2a827d1c9b3852e91d3026aa20a3d56c5bbae43c07548d58577e0f976901814a5001ea694d1d1c01166c458a1b0f3a4b002cf0b2c532a2e35aa045c147d
 EBUILD curl-7.42.1-r1.ebuild 7401 SHA256 0b1135abf5edf63b8f08f7a811f20f7161a8b17671648279e6757ba2bc12cfb9 SHA512 c6a9e4f8c767e96f593aae87f74738f8e1a5884b470b988e1f4254162aeb8708806eddfac179bb14bc2a8ca58b6607ac78e087c43c245cb017eb098d307e6a58 WHIRLPOOL 1132cd993dd50548688d0f7985c1091928df2732401c96311ac1920eb594191b696410d98b560eb3810265deca54c34923e700d04f7888e255bb4aa65e724818
 EBUILD curl-7.42.1.ebuild 7333 SHA256 5a4cf4ec663f9a31700f9e74e3c32c49c9e8c6cd8e69b23dc23a1ff11f256853 SHA512 615940b26d37c96a8cbf865100d9cd6a4bb7a2f86eacd05fe0d0575f4d7d60f3fd91e610f0a43ee7cf50999a9933fa37327936ed76bd43b628a70a76860bc76f WHIRLPOOL 2644fa40e81bda433c97a551710de075504c2101c2ed51d39dfe0e16d30fb40afe4e9d113d5f4afd911bba99d38ae09137aec6cf299e2f38e79dfbef67f72245
-MISC ChangeLog 60487 SHA256 040b1443f539b8d50f701299083c9b6ebc87a6a862fa7fbe43871ca6cd86a705 SHA512 af0eff11754ecba4f1684c7abda5029f3d34e00cb644254b9cdcf8889c899198895d19aafc500fd8786e845327d5bc39722269230da2b5053c64ccaf38b96513 WHIRLPOOL 97cb192621f6d885b175274517d0f9bba10059781c60144758774c451f261c6886f00cf1caef287ec31b95e225af64c3167e5450c1a4faa2a341c630cdf2b0ae
+EBUILD curl-7.43.0.ebuild 7392 SHA256 3553a49352c3236ed9b32146ac052b78b44027684db08ee7cca56602cd328c0d SHA512 642c002ee8568941f1bd20d1c88dc4a6b8908787dda4fe9d57124ace03c2e95f743abe1551c360c3dae5fdf7a9dfc72e53fb6ea6d85eccea0aeeb52952d3dcc2 WHIRLPOOL 285306f59dbb4e6c421b25c9455f1f63df379f5bf498f39c76de6c56be258d5e5e371ffc98534e2c7d705c6ce8f38621f053a47cb8c2882db13b1eaf7bed1e75
+MISC ChangeLog 60830 SHA256 31bd06909ff1a9e439dacca571c6201912073b198ed41b5c68e15a3a480c7c51 SHA512 d1e211051d691274d777e063d51237eec52ca50b95899ece9612dae3bbbf3ad416f7067b14c09fff4b3bfaf792749be18a94c9b65b2063b3f0835d367622612d WHIRLPOOL 5388ba06408f5b3eb35ace2994cca5f46aa409f12e7df3644d3c0f1bb53976465197b2a153da14aee24d987c1a24914ad22ffb7c76a9be8e8bd0e993cfe9f80f
 MISC metadata.xml 921 SHA256 d3c43ab15fa845713c7e6426d90f4275aa040338ca7cff233b23077d69455c32 SHA512 d198f91342ed3225747cf39d90922961eba3610ffd431411957175b5a65fe24d0b61d7094982e8cd9154037fb03eaf27e53696a5148059f62bb21f0ce15a3fb2 WHIRLPOOL 09255be7573f028488bf38ea49cc0bb26820dc5b7c339471cf801bc22445b5a7b939a459a1cbd7a076d7d7805a0c039767b73ff9d2261ec7983c488d6b44cf9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVYdhLAAoJEPGu1DbS6WIAOBgP/1NTE3+G0eh2U3WlRlDt/Lla
-S5GoVaqif+SyJ+p+dR5w4pVQ61mZoKu8dOe5XrpfWgMfJ4EGjSWWIYt1MxpJrvFw
-pNxIRblNrOYS2spTqISxC5Q7fQzwyTxsf9W5ZfCZnbrnqURHWe5wlyb4EbNzeBXq
-WO04F/Zwppbvia5sDgYhqtnZp4ZTBsVTXTk1+za/NJE08sLgd8ExHb1Pv106hGIU
-Z+2yVNSyuPF3MnSZ4vh6YZaTveM0va8y7p2K4kfaQ+9DPk8EtHvyj4EQTgZ/jC8+
-D6pFuVLvZF2GLCz7ISMbFcx+MaUkkCeSa8mm1Tg2HwRt3lRmGMJc0mn8M6em0145
-VVrQyEwjxm+NsdMVynPKr405VgyqvFsF79jLF+AjACs/yaoamKrKkmNo2mfYUjB8
-E4rbOLKqQy0V6wTdahEkUEMEvBURz3+sgLPCunFnvu66BKqNegVDFypUYPyW7cpT
-cV3alulqZc7MuOB0J0Gc2PWs+i9tv732pRtxOjTiepZ5MIX1vtcgWT+FiAKK5+Qv
-Q7zUWfdo7yWA0pqOjWtYcc/5Uc5Ad4adHUhTz5pn00gPw2Y1a/1OVPCNnR8c68Yk
-n/Zw+NM51HfUpKR+W59ef0O1FRIbFuA+wVtOwg96sLwSe99tcJDtnLSE/oKlCSy2
-FgK4B+cii9Cx0TQg5OK7
-=dIiI
+iQIcBAEBCAAGBQJVgbLqAAoJEPGu1DbS6WIA9nEP/2ZcZclq9EuNgWSD6NMjJTLY
+HsgGK+utyTTMmYOetw7yqyLD1ZKb80a5cuO5gGoojYUWzvPBehBhbPCV0U0rOrTk
+7xfwo2uRS9VVmnva//7io4LW8xemE58lnM1o/FFjJIV3GEyr51zSNJBkcyXgjuWb
+es6imd0CtJLReQ3nrNldWn9OqRtRjWQQBtxJlYMuWMW1vh+YT7zv8sTS/JSOuVU1
+cI7LUjhSOzaqMZ7bnBSF+u9ojPejCTnCcSxVm1cQ7WtaiEhMCV+yR4t2jxaOnaI8
+Sqo0gcWX9Tjn8cD1wcgjlbry8KEoUQ+91roFD8VOdE/8WlR6FS/1UyuQFavoFm+O
+/ky/FhH23xdMeXe5vR0WsVzu4Wv+tYwlISBrG9oN6YbVDCG6u7XQO3uJkxlUTeQB
+BfOUIqtOfgH9eBHHOguTCK7JbTepc39QuI54jNE6Gl38i3YcmDcNZuL7M107NIIt
+igowrN6AcAAMYtoMgfiJxcbdGKQ+UIT7DYdRy4weRxxuPxT2dELJJENicRowk9ci
+VuV1XRHRkuNUECjbm5drvTSsPLtVWtWcAZMTn8rOgK2LIf0DE4wWDCSj7/Owidye
+vSnIOBmHFFEsUb2wCtug8Skf/y+/3s2qTvH/3+x3iy9h01kODk0OyCjcjiRH+hlP
+Gzy+qTYK3AK5cAPTBvvi
+=nYKj
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.43.0.ebuild b/net-misc/curl/curl-7.43.0.ebuild
new file mode 100644
index 000000000000..fd7ff114a5ca
--- /dev/null
+++ b/net-misc/curl/curl-7.43.0.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.43.0.ebuild,v 1.2 2015/06/17 17:48:25 vapier Exp $
+
+EAPI="5"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="http://curl.haxx.se/"
+SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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 http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			>=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			|| (
+				(
+					>=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+				)
+				(
+					=net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
+				)
+				(
+					=net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
+				)
+			)
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			>=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			>=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_polarssl? (
+			>=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+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
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
+		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
+		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	epatch_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			einfo "NOTE: axtls is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-axtls )
+		fi
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
+				einfo "gnutls compiled with dev-libs/nettle"
+				myconf+=( --with-gnutls --with-nettle )
+			else
+				einfo "gnutls compiled with dev-libs/libgcrypt"
+				myconf+=( --with-gnutls --without-nettle )
+			fi
+		fi
+		if use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use curl_ssl_polarssl; then
+			einfo "SSL provided by polarssl"
+			einfo "NOTE: polarssl is meant for embedded systems and"
+			einfo "may not be the best choice as an ssl provider"
+			myconf+=( --with-polarssl )
+		fi
+		if use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+	einfo "\033[1;32m**************************************************\033[00m"
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--enable-pop3 \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-proxy \
+		--disable-soname-bump \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		--without-krb4 \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+
+	# https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
+	insinto /usr/share/aclocal
+	doins docs/libcurl/libcurl.m4
+}
diff --git a/net-misc/stunnel/ChangeLog b/net-misc/stunnel/ChangeLog
index f46496ac5fa9..9ced45963e5b 100644
--- a/net-misc/stunnel/ChangeLog
+++ b/net-misc/stunnel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/stunnel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.230 2015/06/16 08:45:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/ChangeLog,v 1.232 2015/06/17 11:34:17 blueness Exp $
+
+  17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> -stunnel-5.08.ebuild,
+  -stunnel-5.16-r1.ebuild:
+  Remove older versions.
+
+*stunnel-5.19 (17 Jun 2015)
+
+  17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> +stunnel-5.19.ebuild:
+  Version bump.
 
   16 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> stunnel-5.17.ebuild:
   amd64/x86 stable wrt bug #551890
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index dba0903dc516..9032c5b3da81 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -4,24 +4,30 @@ Hash: SHA256
 AUX stunnel 1365 SHA256 f5f6007fa87a0465703f7d746514f6ce84199e9c0e37e0f5a6f8c07659e7853c SHA512 cb8774e5d162afad2a0b5f305cc8ce6bbb0a270e0ebeda600ce6aa005bce161582303727fb21eb34eaaf92b41295d705f9134686ee13a7fb1c4151601e891fe2 WHIRLPOOL e83ec23e99a3bdaef68618da04dcae1be0b789d447977f9b8ca1e6fbbd0a47fc5ed5805e4f0dffa4608a542b1d03e22b9cd7930a735aabc804064b0b8e29e209
 AUX stunnel.conf 1419 SHA256 9ae90e10e9cb99e69183d908e6df3b56660eeefba8651988feaa9ab874a83c88 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 WHIRLPOOL c5622e8c7785b9601126446d8b92419d3b671f001363683203bccbffece3b08b762d0db61f7a9ba7cc7de14114623d0ce415909bb957c824b2e7a8b14db5e3d1
 AUX stunnel.tmpfiles.conf 38 SHA256 68c9c963673a3bf0f3ce3f32751c9e36a3299251da12e9bcae929629657df135 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb WHIRLPOOL 5e070b27ed14c06efc8e66d23a9098d60cc16c01331824d910786c6fa7697f96b8704dc02af4f4346b4628dd22b8729a11756c7d85596ffcf916f36f9de8ec05
-DIST stunnel-5.08.tar.gz 608365 SHA256 830b21d24cd237e96f4d7993be43553d4eba4d3cfa2660faa78dec8d41d314fc SHA512 8cbcb11aef85cbfa8bdad15deeeaed1af4e4361ab1bbf0f535fcd8b36bab4c00faec6519cecbf7f18d8c14397f8264ad2e0e2cb84968e0a0c40a41720e064dca WHIRLPOOL e3b4d8531af603b4a8c7f556831e877c7a4bdd0a3a75b00ea65a134e38a2df7faf30b0006d0ec44600c9cd22917eae58a9f98f63dbddd28728ec2fa85304e75c
 DIST stunnel-5.14.tar.gz 608366 SHA256 2197b4fc1db82eba69c8baf1fac30f0767af26e9f8c7e9e1d5a4a8fbb264695a SHA512 f0d074f5c525036d98565c9c315f1761920c2e7cd7687a9a0f0441e7caf5cf3930b14c078f4f158806c557ba8ea0698aa3b23d5e7e03c076ee3b6667140148c8 WHIRLPOOL af8d018ffb74aafafef7bc90c63c2a5c1e4dbe164f71eb7aea7cf5388f60c9f49c19ce4dcbf2e55c2c166ee1be98ff5ef72171d750949e668391a7afeca78224
-DIST stunnel-5.16.tar.gz 613813 SHA256 b6b7e93fb2626eaabae1c8474e1dfa23962cfde8fa35c8602289fcaa4f53608d SHA512 8e3182d0a8103c713d4dae7913e617f10102d69ded9b17abb4b5c937b8fb6f436440b5bbae0a33fd1728205109e1e37bfa4f28f8f2873fbbe2fb214b563b3a4d WHIRLPOOL e3552994c958d53cbb1bb4b9b67fb3423c142509b01a34f00994ba9ba35a040ce0cb0f68a289937a98d6c14bead205d215639304807bbc276f5017b5667a9c58
 DIST stunnel-5.17.tar.gz 613840 SHA256 c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472 SHA512 07064bda6978d94f783fd1c125485f46eadcba0e4a419366149e91cf88333b875eeb86f63848b5dd774f9f01d41206f93905fa5a51a08ade915b4b0bce777419 WHIRLPOOL 832b3cef06ec945d2dae33d3bdba048d93ca85757f149f705d6ff5bf03440dd3d3857a73f1167ae792aedceefcb7df4ea6c31164fa5d7ee8857f5e589b08e257
 DIST stunnel-5.18.tar.gz 624660 SHA256 0532c0a2f8de3da1ab625e384146501ce5936fac63d01561c3a9bf652b692317 SHA512 292d5ef96c6d84c248b75f9e0e9b344c79177ec72f96097281bb37a12e52f4b5e44d363b1c164ee86536dbc492c8e9f899e17a1842c85453c2ef113a5d1862ec WHIRLPOOL 2cea6cc70350fa750e46d09ad28621fe4c0334442829e42d2157344424e6a2437b2642c5219bf4d5be1588f8c91671c805423c13c06b24b73d56686dabb4b412
-EBUILD stunnel-5.08.ebuild 2532 SHA256 c58e9ce1b6fdefb6b1b5df28aba676cbcb6de62a88a22c0c4f6a9b8a9251c30f SHA512 d112614325e87a83f9a478c7138f228811d11ca54accbd17100bd56e230eeb93a71f0653720b335ae6b4b73bbd98de4dc58b8569f000fce426f094b7f685495a WHIRLPOOL d4006021927ff2fd48aa0d02d7e3021d9a6b69335156691156935ba7ddd6fc744848389c2ecb2054c4250cabd65e03f49cac1804153929a1b67a551d0ff380f2
+DIST stunnel-5.19.tar.gz 620810 SHA256 0b543242cf26649acfdd9f00de564c3e8de7ac2237d53935ffdc7eb24f4d556d SHA512 93b1b6f62873610dada98b7d555aafa8495f9d34fd2a9b92e2bc6420edbc087f428ca6d6d47560055b36809fad08ec7eb41e71bc0abe97c84277125484866574 WHIRLPOOL 5fbab7761a7284766b65bac177bd997ac506141627992bc7f8642250a99d6dd7dc09a2a609934aa66ad99ba7faa2cf886edb2d0b1b942d672671aff57cbf3d48
 EBUILD stunnel-5.14.ebuild 2629 SHA256 03d462745f44c9708f82cf3c49fe07824b7449f776a5e87138faf5249bb4b6d3 SHA512 c5feb173797c92184dfd0c10f2b4fd17d1079c64089cd78d1d55e640f941c1936a7536b31ab6c49e97aabceab4caea34b0f00a84935cd724c357361d5d7b10d7 WHIRLPOOL f0e196a3b60f6887fae74f2e9ee009ff5413e97d7e14b0cb377cf24170aab26a371865e81204baeb1ace7a3c9abbe52aeab1bbf91cf645b5e290711be1d1c286
-EBUILD stunnel-5.16-r1.ebuild 2800 SHA256 4119bfdf8e98c52290e5ed939f0c296558313b6dc2509b7cb0da17cd6b5ac171 SHA512 deebcdb43fa63d063c0541701eebf5cb9d91ac949aacbd54f63fa874a0fa3e56e43b5e052157b689b7e9f6fb4f615d7b838225cf9d8ef3e355e42145c01d8bf1 WHIRLPOOL ea9b5d761311beee24f675e085ffe81f839517f2382f2ba424e577d70a1be03beec4b2188832dc069e801a288a6fa09e4da2efd6ab27f53afc395824b4dd390a
 EBUILD stunnel-5.17.ebuild 2793 SHA256 74891c7aff0141e54c048cfe250615322f6a1bcf3f6e4283b01804a04523cd1c SHA512 36f150593e2a9631921a1ebe617bf73c5bffada00bd4da82aa0037f103490f63c1c8843c1b55bf4764743c0aa7884ef8c304c2494c5bd46c2aa13c859a56e6f6 WHIRLPOOL 58c354d5523cbf36f315a0d0eebf491d4577e00dd49e44ad97fc34958b9d3c9f324bb0de9aa52f6d86d79a2634e0b8e186816115244992fa229203387a54c134
 EBUILD stunnel-5.18.ebuild 2794 SHA256 231189300e883c6a2d0e87d1a127e98576626fb7575402819f71eef5ec232642 SHA512 0230041afcb788f251b9b5fd5caae4b302541e3c0fc97f10f445bcf052ae751b2df31c3b467b96f047af706410a1c1e4f64ac925b4415ccf6ae294dd53b828af WHIRLPOOL e2e9a4a36b731b17edbc0970b530eb902a7130d70dfb962875362f2b19cfceb8eec1b9bc08895ca9a76c3c63b67577eb0ade1172347518b56d4a73a842646d2d
-MISC ChangeLog 32515 SHA256 947baa17c5839cecbcb8a3098fb761848dc168c2b9c813d2c4589698e7f9e856 SHA512 851f38ce4826b43828f3e2d6420206ea42c4225fe9ea4c384a7696df24d70a907a57b1ba955ed1f739bcf61e6323462334a23a5a987bf819f86d4d67ae5c5864 WHIRLPOOL c5ebf97d845d9534b39f92ac34d7127e48275b183bb0682aff322d506b3482349ced9b34d035e62619cb45b0aefde0ba2eb3418891d8d3bdd91f8166b232e280
+EBUILD stunnel-5.19.ebuild 2797 SHA256 202bd80813d2f181dc956285b808b30351da2709c0bd553cd84829ca51c62312 SHA512 2fd16a5140a91aa347a94794514c29475f3a080f89cff8d43a31438d765ef32793a00bab23885808121a11b44d9a1f6d5bd94cf5b89ec55d07eaa49bd3f1673c WHIRLPOOL e754935dcc15a056f053f3c437e8d37f8d141be7887ff84a7df50314c01470ee44a4cd37931549bd98ee7ab0ada2c0217ee70b58e03d3198b9c9886ceb004623
+MISC ChangeLog 32769 SHA256 d6a86e2e6f43fc542aad337761df3cbff17c080b432d9d5ec9a5612846b2e40f SHA512 e5fc7ee7b502b9321350c2c86f4fef4ccd27f2c18bae12b1eaeb66d6bd7dcce1edb2799dbd812437cc0be626aeadf0507e0dbd9d6dda998eaf5bb96cf0089e42 WHIRLPOOL 0c4e9fa3172587f6363640a4dfe5d18e4ba55de2be4896063d2f62f750dc0c7c83c5200a8f78f5a9d577be6791c023152f81bfc772cbb00de5a9be52c83389b6
 MISC metadata.xml 622 SHA256 42b6c75bd95fd3f6322e6a6f726a9e07d74f0b46376a6f17718f9043cf6cc225 SHA512 930faf03b0f8e73c0ddb1a9821c04d8e0b0eb49fbf1e70ba439cd810e7aac827490b2036fb9a4bf4d8f2d96b3a2e0c0b2923ed21ae17b08ca09464c7cee54997 WHIRLPOOL a604c6422e399f97c5d701d756eee871438b9bb7fb7195c5b4a35357be9e11b7709d7e77172d85f1e5f1d31987de958e8f0f29f13bd1106afab1bb32b75564e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlV/4cgACgkQG9wOWsQutdarmgP/aFRKsXUtUQ5dRmnLrxPSa4V4
-cXQ2VuuuTJojWy2YtYtDwfstb9gL2a0rxanUkiT6x5b1zS7eD0Qr4s4ZP+sdddj5
-Ycqp9VTQe3wUk/VmAORJXJLkKueI1AiXaGQ60v4s4EQkxrm4QWkFEexn9xVUNZE8
-UeVqgHxoFkDoay4yINg=
-=3yvF
+iQIcBAEBCAAGBQJVgVuvAAoJEJOE+m71LUu6ih0P/3GWhQrePTu5HtJUv3lmaBYB
+u2EO2dKGgRvolf1ZRsjKXXjK8LEK66JFR6kGykqKkUORNHDaJK3tQfVOMp/Ja41C
+DjRd9wDklQz+uF0Mc3ERVGYZH0Znt30OIY74X8zfqo8uLLeSW4Rbk+fWlDPFc3O7
+WqHAoIGAwmCfEWiP0E5x109pO/ZXP6d0pP9kYm+1XmuRNHDQ7BOpYjkSzsiI+XRz
++4SvlHEGaykb5wO3OroQmAuLcYH9/JGCko6p6f1bIIoHNFOz9lsVObV7XqVpESsE
+3Xh8xFvKmJlrLnMpUniFh/rsyqd5j4x6me/aV8yHTPDPUqUg3Ybrs/6QGemPIg47
+N/8gAkH3Xp7cgsFlZuKQHOK3k82iyf7T5C7zEAmTVqQDVELxcDTvEVWJf4A31lIn
+rNZNwjT6cuX+98C7CbgMUv6wecJmciHMMEEkqkybU09XwII3r3nwIxFLgLt+ezWu
+MohSrlIFh1us0DPpng6/nQHPVlt6HCNVsCMbfLLFbfGGKoqmRHV+FDrGAMOfOvEd
+XeaJ7ieMGzMtwVTx9MLMv5S3j1T5v2hPp0c1o3mPhkUqB/ltuTnzpNW5q0ZezHRU
+exr4L+2DPA83bAq52hgeRaTspR+yI+b3JbICo+2HDCW6RQP5cv7/WVsGf3nDVIDr
+JlUoDpLLQdL1vc8BVD1B
+=iAIz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/stunnel/stunnel-5.08.ebuild b/net-misc/stunnel/stunnel-5.08.ebuild
deleted file mode 100644
index 60b7a9e7aaa4..000000000000
--- a/net-misc/stunnel/stunnel-5.08.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.08.ebuild,v 1.10 2015/04/27 00:28:08 blueness Exp $
-
-EAPI="5"
-
-inherit ssl-cert eutils systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha sparc"
-IUSE="ipv6 selinux tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	dev-libs/openssl"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-stunnel )"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	doinitd "${FILESDIR}"/stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.16-r1.ebuild b/net-misc/stunnel/stunnel-5.19.ebuild
similarity index 95%
rename from net-misc/stunnel/stunnel-5.16-r1.ebuild
rename to net-misc/stunnel/stunnel-5.19.ebuild
index fe7ddcdd2088..f73c8da19f1c 100644
--- a/net-misc/stunnel/stunnel-5.16-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.16-r1.ebuild,v 1.2 2015/04/27 02:50:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/stunnel/stunnel-5.19.ebuild,v 1.1 2015/06/17 11:30:51 blueness Exp $
 
 EAPI="5"
 
diff --git a/net-proxy/sshuttle/ChangeLog b/net-proxy/sshuttle/ChangeLog
index d7c68c467c33..602c3b9a6576 100644
--- a/net-proxy/sshuttle/ChangeLog
+++ b/net-proxy/sshuttle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/sshuttle
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/ChangeLog,v 1.21 2015/05/03 03:17:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/ChangeLog,v 1.23 2015/06/18 04:57:10 radhermit Exp $
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> -sshuttle-0.61-r1.ebuild:
+  Remove old.
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> sshuttle-0.61-r3.ebuild:
+  Stabilize for amd64/x86.
 
   03 May 2015; Tim Harder <radhermit@gentoo.org> sshuttle-0.61-r3.ebuild:
   Inherit eutils for make_wrapper.
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 42f6388ea9eb..8256adacb4fb 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST sshuttle-0.61.tar.xz 181528 SHA256 78cea312c4bab6f6baa459131cb7739d9fae7d0df9e54efd48fc4ddd852042f5 SHA512 39687ecf0a9b78cc0f7dc576c3c036f5afb52050f17d793602e50c8a9ab8bb0f9eb3277cb2fffb1e9c0f5f652d96c6915aecf8a8da93697172d8cbef1161a986 WHIRLPOOL 9c8597d98306730fcab750094588310c03bafea473b54a2758e055a7bb4bb851b3edad4d2cf2995893a30ed4148b7fd8437820099042ff6c7c52a0dc279d6ebc
-EBUILD sshuttle-0.61-r1.ebuild 986 SHA256 f958bba87c4e46794d132e389b363845633b5ae8c53dae686de189604f219ac0 SHA512 2dd16abfc0a50f42bc5ab89df8d08040e625956947aedabeb49764fd2cf614ff2982b8ca5f4f1183483a91eb8d7a6fb225065fe444ea4f80bf88765d47f89c81 WHIRLPOOL a6bcdf4f7276f31c2e3ad470730b95b44c6e20befa65556f9200dd8c45710b93227e856c0ece5a0b9716c2d651372e3e19fe2d41dad822c3b38f55e14cb303d0
-EBUILD sshuttle-0.61-r3.ebuild 1009 SHA256 73b1d6a44a1b77dcd66faaff3c9901ecf60b92e83232f21d869761fd28dace3c SHA512 5cbb46a0fa94341782e5f2adca26de076db4d1ccb557671ef4b4111abfbba56ee630361e0c82e100db7e42e3507c7657709799dc76b5039a49ab0c296c4247b4 WHIRLPOOL f3b4ab2cb4c98211ca00b0598404a8866e77f775d4d05fe19244a8f73b9e5638cc584d675672d89d3345b3a70d18a861f4b61e27ca8a368a8d25966e77a77f44
-MISC ChangeLog 2684 SHA256 e2d6bae0680ae98a389670845fc5942307caebdaa9f3439e5c96a80eb77d39cf SHA512 519e5e9e0b16cfb8893f570292b855fea6012ec50b935c59802359d7f09b959615f692aa50ac496a5d1fd83349bbc7e98be377eeb0c32b7865daaa373cd05dfc WHIRLPOOL a9e6fb970a314cbd63883ced2af539322164e8cb857d9060a90c5b9cbbc3f8c9c4a19e550058167c70707076df65c0166045a0812d5a469cfd53fc28dc337bf1
+EBUILD sshuttle-0.61-r3.ebuild 1007 SHA256 2cb0cca0150acaf3b596b79703cbfb61d5effc6ed0dfa2ba4a2e7a13123b88c8 SHA512 223f40a6fe793097bdc2bb95aaf44c4336bd9bac2daf89e8dadd07f87b8ffb9989ad19cad5e0a3d9ec81f612b173ae1a691ad9b4b4e66981fc731270f0b6effc WHIRLPOOL cd2499db8cf358c3ebe06598c03eaea3b6669388fd1fb9ba922187b40ffc3237bd2eb057cd93651deb6d6a4ee4ee4f5fcae70841cdec4abd00b7b830314bc484
+MISC ChangeLog 2876 SHA256 24d5090ebfb7eec8741e33c2bac010e42406b80014f9c430acf58e3fdea45014 SHA512 0306da8621f05e3294434fc71eed238066018f7a77dddcd6f7cc4623cb6c31cc279f71568b0f89a98bb796acb375e40c0aa4698dac1e92f39030692076cc7414 WHIRLPOOL f13db3a074396bba7c5fc4e73acb5eaed488ad50ce07ce98475c0ca76f0359aa1bfca826720c75272fb5173b672e224321b0361cdfd249e8793242a7f1dd6efd
 MISC metadata.xml 324 SHA256 374be1bc5fe407ec7a14f58fd27879146b8623675a8f0e5bb9655d2d32b8aa75 SHA512 4c14d121ec0290406c10191a2fcac049b525e34c38bd88eeb8442d0a5caf8c05590bd6dc18927c534d4e1cade5a8d78680924913a9919b29f68e0d6b20f3a972 WHIRLPOOL f3fd6b1846193944f7e0520a00e672c53c9c9934c8deac68fcfddf16483e59985aa26ddc57420683f7e8acebcae6db7bbf35e3e7805b83d648eea65a10b7f600
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfxjGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNIoP/RkU++xtUk0ahyVblBXUcifE
-vIjYFK7aDYt/e33xSo/j3FLNS9YkHnJaaS4PSCc8PmJLLH9EkzMFcBWC0E6xwYiG
-pKKxy9CUWnY+oZm72/XFmk86FO6kv86/E3bsdQ+iW1dnFEF/j/AosKP12wfwawqx
-wXIRFoe6pXGRvpoFX7qQE/I22zMpT4Hvu68vrWrFDAJ4yrWMEyrGCDw88xpuebki
-bcYTETO+UktI/m4L7hW6O8Hoi4Aawo0POv9Ota8P9DS6y22rR+CwUnBI8N5EsJiH
-0bp29rt3l/e20ZZTVEIxwwrN7ziYaBrGjtKGTy7aCl/xEpZe/WNGHWhDNOT3oEQD
-eXRWBfrE32A8zj7zP7EOyClTBrphvDjcJXwXQ0GMnw+ngTGrGJvUUjP1pICeSAMt
-Zkqf8OatIHQCv7CQVwnk2a7EZEIJkj9kydOCzu+L2JQb48c9pI53yRsevDdumXzM
-pkRxg72XWXQTQS6vmW6xQpcmnKYaLw+3aPrq7EllR9QTentR5CwaCFl358aSmU4t
-DKa6Naa1ZwVu/DGY+2M0HhB+Dq4btRVKHSJOSmsuE5j0rwCHcNKxJxK+gMInC1wu
-SdgI6KjQHG4BqrjwasU1vUPiD+oNcuR0wT120qPDGtVp3PVONVNmrGt7L6LzEyWE
-lesWvvGZpcKkyDs3EsHZ
-=DdZ7
+iQEcBAEBCAAGBQJVgk+nAAoJEEqz6FtPBkyjoIgIALql+NnmRQPc8QZnAXyFSK2t
+q5UoeHAYd2zu/aX6pgpcAfAe8naOn4Jxmo9zZuRKFaDS9NfMJ5bwNkvFGJmfC5wS
+vyfI+ZJAqL3UlSON+LXdomUQtUr3UFUOAwZL4ARBPAtqEg+VH866Ecp8cb4CnhWY
+Pcs9KSfQ3UTqYtDnamajp3NYuBC8maC2x/fgHCPOgdZQSVhW1qpJiahw0RMFdGRU
+sb5OY6zmfjwHgkbFJbSU7rNwiCmGbPatGVRKMjHUEmYwq32NK/0e6lMDmgMiwJIf
+d+PlfIwGB4v7mZBTDLPwsww5QCv+BwUdOnuyEAc2GnIqk9q3kEJs3pnJLrVA25k=
+=28ma
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/sshuttle/sshuttle-0.61-r1.ebuild b/net-proxy/sshuttle/sshuttle-0.61-r1.ebuild
deleted file mode 100644
index 7f374634965f..000000000000
--- a/net-proxy/sshuttle/sshuttle-0.61-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.61-r1.ebuild,v 1.3 2014/03/04 20:14:39 ago Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python linux-info
-
-DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
-HOMEPAGE="https://github.com/apenwarr/sshuttle/"
-SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="net-firewall/iptables"
-
-CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~NF_NAT"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python_pkg_setup
-}
-
-src_compile() { :; }
-
-src_install() {
-	rm stresstest.py || die
-	insinto "$(python_get_sitedir)"/${PN}
-	doins -r *.py compat
-
-	exeinto "$(python_get_sitedir)"/${PN}
-	doexe ${PN}
-	dosym "$(python_get_sitedir)"/${PN}/${PN} /usr/bin/${PN}
-
-	dodoc README.md
-	doman Documentation/${PN}.8
-}
diff --git a/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild b/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
index 1b1093c94404..319def0360fe 100644
--- a/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild,v 1.2 2015/05/03 03:17:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild,v 1.3 2015/06/18 04:56:44 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/xz-utils"
 RDEPEND="net-firewall/iptables"
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index c5debfe766e5..d6831fa17266 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.810 2015/06/09 22:19:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.811 2015/06/18 02:31:14 patrick Exp $
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> package.use.mask:
+  Remove obsolete freevo[directfb] mask
 
   09 Jun 2015; Michael Weber <xmw@gentoo.org> package.use.mask:
   Drop old masks on netsurf.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0f95c4f2adfc..0bb33ac8246e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.686 2015/06/09 22:57:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.687 2015/06/18 02:31:14 patrick Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -41,11 +41,6 @@ dev-java/proguard j2me
 # >=~sys-devel/dragonegg-3.6 is broken (bug #543644)
 sys-devel/byfl dragonegg
 
-# Michał Górny <mgorny@gentoo.org> (02 Apr 2015)
-# DirectFB support was removed from libsdl, mask the relevant flag
-# due to unsolvable deps, bug #545246.
-media-tv/freevo directfb
-
 # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 # No stable qt5 yet.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 01c8da1ddbbb..948d48c533c9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2181,7 +2181,6 @@ dev-python/PyQtMobility:versit - Build bindings for the QtVersit module
 dev-python/amqplib:extras - Install extra tools to generate initial Python mod from an AMQP XML file
 dev-python/anyvc:bazaar - Add support for Bazaar
 dev-python/anyvc:mercurial - Add support for Mercurial
-dev-python/bokeh:chaco - Enable interface for implementing qplot and ggplot like functionality using chaco
 dev-python/celery:redis - Enables redis support
 dev-python/celery:sqs - Enables Amazon SQS transport module for celery
 dev-python/celery:yaml - Enable support of yaml as a configuration file format
@@ -2367,7 +2366,7 @@ dev-qt/qtcore:glib - Enable dev-libs/glib eventloop support
 dev-qt/qtcore:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
 dev-qt/qtdbus:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
 dev-qt/qtdeclarative:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtdeclarative:gles2 - Use OpenGL ES instead of desktop OpenGL
+dev-qt/qtdeclarative:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtdeclarative:localstorage - Build the LocalStorage import for QtQuick (requires QtSql)
 dev-qt/qtdeclarative:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
 dev-qt/qtdeclarative:webkit - Build the WebView QML component
@@ -2387,7 +2386,7 @@ dev-qt/qtgui:egl - Use EGL instead of default GLX to manage OpenGL contexts
 dev-qt/qtgui:eglfs - Compile EGL Full Screen/Single Surface support
 dev-qt/qtgui:evdev - Enable evdev input support
 dev-qt/qtgui:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtgui:gles2 - Use OpenGL ES 2.0 instead of desktop OpenGL
+dev-qt/qtgui:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtgui:glib - Enable dev-libs/glib eventloop support
 dev-qt/qtgui:gtkstyle - Build a Qt style called GTK+ that mimics the active GTK+ theme
 dev-qt/qtgui:harfbuzz - Use media-libs/harfbuzz for text shaping
@@ -2405,7 +2404,7 @@ dev-qt/qtnetwork:connman - Enable net-misc/connman-based bearer plugin
 dev-qt/qtnetwork:networkmanager - Enable net-misc/networkmanager-based bearer plugin
 dev-qt/qtopengl:egl - Use EGL instead of default GLX to manage OpenGL contexts on the desktop
 dev-qt/qtopengl:exceptions - Add support for exceptions - like catching them inside the event loop (recommended by upstream)
-dev-qt/qtopengl:gles2 - Use OpenGL ES 2.0 instead of desktop OpenGL
+dev-qt/qtopengl:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtopengl:qt3support - Enable the Qt3Support libraries for Qt4
 dev-qt/qtopenvg:exceptions - Build with support for exceptions
 dev-qt/qtopenvg:qt3support - Enable the Qt3Support libraries for Qt4
@@ -2413,6 +2412,7 @@ dev-qt/qtphonon:exceptions - Add support for exceptions - like catching them ins
 dev-qt/qtphonon:qt3support - Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4.
 dev-qt/qtpositioning:geoclue - Use enhanced location information from app-misc/geoclue
 dev-qt/qtpositioning:qml - Build QML bindings
+dev-qt/qtprintsupport:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtquick1:designer - Build plugin for dev-qt/designer
 dev-qt/qtquick1:webkit - Build the WebView import for QtQuick1 (requires QtWebKit)
 dev-qt/qtquick1:xml - Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)
@@ -2435,7 +2435,7 @@ dev-qt/qtwebkit:printsupport - Enable printing via dev-qt/qtprintsupport
 dev-qt/qtwebkit:qml - Build QML/QtQuick bindings
 dev-qt/qtwebkit:webp - Add support for WebP image format
 dev-qt/qtwebsockets:qml - Build QML bindings
-dev-qt/qtwidgets:gles2 - Use OpenGL ES 2.0 instead of desktop OpenGL
+dev-qt/qtwidgets:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qtwidgets:gtkstyle - Build a Qt style called GTK+ that mimics the active GTK+ theme
 dev-ruby/barby:cairo - Add support for writing images (PNG, PS, EPS and, if supported, PDF and SVG) using dev-ruby/rcairo. Not available on JRuby.
 dev-ruby/barby:datamatrix - Add support for datamatrix using dev-ruby/semacode.
@@ -7018,6 +7018,7 @@ sys-cluster/charm:tcp - Use TCP (instead of UPD) for socket communication
 sys-cluster/cinder:api - Installs the initscripts for the cinder api service
 sys-cluster/cinder:iscsi - Allow using an iSCSI remote storage server as pool for disk image storage
 sys-cluster/cinder:lvm - Allow using the Logical Volume Manager (sys-apps/lvm2) as pool for disk image storage
+sys-cluster/cinder:memcached - Installs the memcached server
 sys-cluster/cinder:scheduler - Installs the initscripts for the cinder scheduler service
 sys-cluster/cinder:volume - Installs the initscripts for the cinder volume service
 sys-cluster/cluster-glue:large-cluster - Extend messages length limits for resource heavy clusters
@@ -7066,6 +7067,7 @@ sys-cluster/nova:compute - Installs the initscripts for the nova volume service
 sys-cluster/nova:compute-only - only install stuff needed for a compute host
 sys-cluster/nova:iscsi - Installs iscsi helper udev scripts
 sys-cluster/nova:kvm - qemu-kvm hypervisor support
+sys-cluster/nova:memcached - Installs the memcached server
 sys-cluster/nova:network - Installs the initscripts for the nova network service
 sys-cluster/nova:novncproxy - Installs the initscripts for the nova novncproxy service
 sys-cluster/nova:openvswitch - Installs openvswitch for the neutron openvswitch support
@@ -7100,7 +7102,7 @@ sys-cluster/slurm:torque - Enable perl scripts that emulates pbs (qstat, qsub et
 sys-cluster/slurm:ypbind - Enable ypbind based auth
 sys-cluster/swift:account - adds swift account support
 sys-cluster/swift:container - adds swift container support
-sys-cluster/swift:memcache - adds memcached support
+sys-cluster/swift:memcached - adds memcached support
 sys-cluster/swift:object - adds swift object support
 sys-cluster/swift:proxy - adds swift proxy support
 sys-cluster/torque:cpusets - Enable pbs_mom to utilize linux cpusets if available
diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index dac499ca3b9d..2a114fb5e029 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.45 2015/05/18 07:01:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.46 2015/06/17 14:39:33 jlec Exp $
+
+  17 Jun 2015; Justin Lecher <jlec@gentoo.org> -rasmol-2.7.5.2-r1.ebuild,
+  rasmol-2.7.5.2-r2.ebuild:
+  Fix compilation problems on ppc, bug #547318; drop old
 
 *rasmol-2.7.5.2-r2 (18 May 2015)
 
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 8d4b8caeb63b..fc3f00d95d5c 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -6,26 +6,25 @@ AUX rasmol-2.7.5.2-format-security.patch 1617 SHA256 6171a944ac63bcbc18e8d4a1aab
 AUX rasmol-2.7.5.2-glib.h.patch 770 SHA256 4093621678676bdc7c517f6d6c260f495b9d946d57691d8e58371b627cd6c178 SHA512 d743b89817d0ed2aa551f3a6529e5bcc50c811d79c0deddd50d07a59614cb0c2d71500452ff9aec4b4b84e4985d9851f61aafa30196356aa1724212b5159375e WHIRLPOOL 250e59fbafe5d53f1dfd77bc2392cf085b07968578675e61635c8ca2e5de1dd60f060240f2a9afdb088285bac3a94cb695cecd3abbb93214f2d6fcf584fe8a16
 AUX rasmol-2.7.5.2-longlong.patch 396 SHA256 98503ec652d13e62443275536d86a8abefae6f6006441425026d400f40f25607 SHA512 4c3ce01ade36fe8a9512bdac62bcd47268bcc5a0448f4af69b26d8add9cc8495d376bac33a8ae5aeae42fa114a1cba980ce86559bf2d52334257f2e001c011d3 WHIRLPOOL 812ff6f3b2d3a6d5dc4ce1c0a9ebf627998b4df355bf435ff1a2e43b3ba369d29fed8cd8ffeef472a62735f71a4bfa2bf89812dafb7f11ec4be34716793f95a7
 DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 SHA256 b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718 SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f WHIRLPOOL 261c5351e32a67807d2979b73fbdf83b947aa641568c08fd2f2b0e06115330541a56f7bbd8f05313c86554c321e59cfe11bf5ee613c09249b9e149411c61d5ca
-EBUILD rasmol-2.7.5.2-r1.ebuild 2052 SHA256 73e96f2b36a8b484950dea6a738275784c5c210997c4bde99f9fd8d0170d77a7 SHA512 37a7a3603507013c40ed434352b815f2951c8bdb9b5270a72432477cb9136d133feaf0ec20151dffb721b3362be9afbd6c8c549544cf0f517bb4c3bed2d7236b WHIRLPOOL 14a97aed8b0742790c6c596bb2d7216756c9bcf45e8968ebdf960b4ddeffd9c4f269c3ecd75bf7e20a21ee5dbebb3be1d3d82abb95cad40c9c40f6864fc80e20
-EBUILD rasmol-2.7.5.2-r2.ebuild 2177 SHA256 326242065855d0cc34dcc9c3952be825ed98ce715102cd4b810087cb6083a8b6 SHA512 1008288771e12ad2af5dda97817c6fea1803937d46c7e288421757822842bdeeb4c030822d7babcc1b3a3b13ac35ede212e3182dd013193c33d0392f4e6530ef WHIRLPOOL c7b3139fb8087c300bb9ea12e72f02fda6c525ed74357549f8ee49fa25dc9ba2bf8fba004a11580fbc3edd8706e02b8ea99e095ae0010ae7fef5e04051df9d32
-MISC ChangeLog 7865 SHA256 7f1f3782622371b9133a2f7525b79753e86ad153d3f2d47b8956155f0042b946 SHA512 2c2f8c5ef48f22548b88f905abc6c84852fd2109af925bfb97006a8dedfa58eadeb6b3b68bd075f112dbf69129ae4dd1c0749767cebaec68d0fc3303ad63a602 WHIRLPOOL 922dd712ac01a9fb661fbee5b3e0fbd60c7fd79bf0dfd5473e8d85b3cfefaeae121e995166c34d89874b3a575ce3fccdc6a491b555796de9b7837f442611003a
+EBUILD rasmol-2.7.5.2-r2.ebuild 2421 SHA256 e7c3d22c4f8b4eb1fd8612dc94bcf878d9910350b86cd078e060ee46d087bbfa SHA512 af3f4ed7cdb501600f77d88b3f4e064a8a6831bae2bd05f41afbbfa56671a453d180f44f58ebce2466f8ff2f5530085f668723cd9c5331a58bdb803513d41418 WHIRLPOOL 20994f3b9a16cd7dd2929ddc684910a7904130b1bcc8fc9a5e1e5f62381112a57cadc6f3ae95bbcd5c5fa0aa4050f6c879ceaf648b91ce6d44508acc8dbc98a8
+MISC ChangeLog 8025 SHA256 04c9b2b53016b1f3704e7b3b3c20149411a861054d16ab985b8b1df77ef0abe8 SHA512 1b38bdbd882c910e5127c2bbffd337c485415c82dea0f6208742b691e016ec6f058f8dcc0151cda4939527bf835cde83b105885a19c744ffe39a463f9f1d0439 WHIRLPOOL fe46f78161c4ef1637db917689a30f8ed0b4c934ec7c3d071d4305e03088fa387fd6d3e9f2565a16db659b70c96c8931ad60391a148bef8b0e46a8eafd864fd0
 MISC metadata.xml 252 SHA256 146feba7b264cf8f998b6165a90d21809d3deece79499756ac057dcaed33a99f SHA512 b2223abf88871df181cb5c98611f42b4dd14969ffad2c618ed57fbce67b8c99c9c90a93838bf5b1bb7fcef34a7b0b150b0a69993bc8844ef5b20687ef319e0a8 WHIRLPOOL 9e9c42c19eb6f2207dff4231d758da4cb380143647d28ecc37c891ff7c53b6c464b26fac7a8812f1949c8b4e43f15cf5b677970a510de37644647f75be23d61b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVfxxUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVgYanXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMTUP/1G9J6c2+LpLcjcBu8L3nYgQ
-IvNVjvQHeG87DoX/aFgX6fkAgrgRh/j1dM1ZET5y4PK1Y0ckKTnpvNscPsuBf8vx
-0goMdwSr7svoKpdfDCa/8fPpRbZTma0HTgjlcuvs0DSGMjouO7mJW66LkA/MhUYO
-PiSbdva7QqPae1gufqqx5kjKYdjjhNU3U/1f6pvzClee04lYgEtrcBPYqh8b6F/U
-yRwiKc/DdvafVdGBrRvGSiZF3aCawQeU6CGRoKYeRl5SWwS5nw3bqIAP7qkiJB0A
-nUIAH7i6WWZiuTi6RMu5e9Ubds1SYgYyuwB9P3kllorLv9bn9zwOENpzDGJczpfL
-akQJa6CXb3gQ/j8FQ0NlYcpixj8KqTlj1NtLOuFnRA79BdhUpPk4d+3lIwcMflko
-tezEvhXyUTEWPxkiSJN8A8T5VAO0L6a2ppCdV0hkLboVwHzOlqvVnfnQ+nLVzdyS
-H2YFIuoq9wTgX6qE4/ST4xcoXMVhFEiyKzji8NM5WBBgyE5aGcMLKrOJkSxSttR7
-d/NvKUNA9sdauMiR7NuvKD1zWiXA1fB4aP0YtW49gSuN+G7wWE/3aS0opLe9ZboL
-P+Oi0KjNDKbP0PiramiErqjcDDW8ntZ40oK2xTM4adiJtnzOBpcJgFfeZdmJSLUa
-dxSRpxC/8p5qLm1tCP85
-=xW/q
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7iwP/1nSgJikt117aZlBgpI7BfaC
+r16gJMrSqDwnwuLocENbtH6Q5pGxB07yLTne143l9bgUJ1SfgnMH/hf502g4ectf
+M0ExKtHF27qowQJcrjj0EuM4AshO/QaPURWlX5LKX5JbYXEHUVbdfuMUpKXB9fOv
+/xmCVNdemVpQGsLVfKLuGbgPBSA6FCveZoQSxZF8fMcPSJMUtqJdMXeWlsIowiP1
+D173jVLP3AJGyXbD4+xXLNiJPghhnPT6p2BYVSIBXMcpnhATj7okz1aoCkVI5jgP
+cQj0628ivS0SJuAAWIri6j5oM9R+j+R7zau9uUu2shWLfxM0uKjU9rP5xdcsKSyv
+4l4pY+tM6ZCckIveaZYhGI64/pA2cFgxPXT5xV2Pcy2tk+YNgg+QC8JPIPAtGAi4
+5yfZYvtVBqHNPwqqV2yza2K3OyasRUlGU61ajqnMGonNQVBJPgmY+07o8qBRWZvX
+lOlaROFcqSTOPGFzsxbOBknZTqnBkgOnTNI3u4a47ma4G530qAwPs8yvDb+34YGD
+6ysYGjtmHrkfZUC2yjWVlqZnoyv0ere8IFDnk7+8uKdGPrd7VdVWTc+F+t5KQQ80
+RFiQ8bP9KdFSxtwtlX6GQ9hmMhhx10J3/gk9MMvT/mU2M2HHcrbCifYKNE0KeRl5
+vrWUaNZTzHY8eVxwn1Ff
+=UTJK
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
deleted file mode 100644
index 8f9436203f66..000000000000
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r1.ebuild,v 1.4 2015/03/28 21:40:24 ago Exp $
-
-EAPI=5
-
-inherit eutils fortran-2 multilib prefix toolchain-funcs
-
-MY_P="RasMol_${PV}"
-VERS="13May11"
-
-DESCRIPTION="Molecular Graphics Visualisation Tool"
-HOMEPAGE="http://www.openrasmol.org/"
-#SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
-SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
-#SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/RasMol.tar.gz"
-
-LICENSE="|| ( GPL-2 RASLIC )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-libs/cvector
-	dev-util/gtk-builder-convert
-	>=sci-libs/cbflib-0.9.2
-	>=sci-libs/cqrlib-1.1.2
-	>=sci-libs/neartree-3.1.1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/vte:0"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-	x11-proto/inputproto
-	x11-proto/xextproto"
-
-#S="${WORKDIR}/${PN}-2.7.5-${VERS}"
-S="${WORKDIR}/RasMol-${PV}"
-
-src_prepare() {
-	cd src || die
-
-	epatch \
-		"${FILESDIR}"/${P}-glib.h.patch \
-		"${FILESDIR}"/${P}-format-security.patch \
-		"${FILESDIR}"/${P}-longlong.patch
-
-	if use amd64 || use amd64-linux; then
-		mv rasmol.h rasmol_amd64_save.h && \
-		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
-	fi
-
-	mv Imakefile_base Imakefile || die
-	epatch "${FILESDIR}"/2.7.5-bundled-lib.patch
-
-	eprefixify Imakefile
-
-	xmkmf -DGTKWIN ${myconf} || die "xmkmf failed with ${myconf}"
-}
-
-src_compile() {
-	emake -C src clean
-	emake \
-		-C src \
-		DEPTHDEF=-DTHIRTYTWOBIT \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install () {
-	libdir=$(get_libdir)
-	insinto /usr/${libdir}/${PN}
-	doins doc/rasmol.hlp
-	dobin src/rasmol
-	dodoc PROJECTS {README,TODO}.txt doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
-	doman doc/rasmol.1
-	insinto /usr/${libdir}/${PN}/databases
-	doins data/*
-
-	dohtml -r *html doc/*.html html_graphics
-}
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
index 060eb362e4a7..b9b7a1000c0c 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild,v 1.1 2015/05/18 07:01:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.2-r2.ebuild,v 1.2 2015/06/17 14:39:33 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/open${PN}/RasMol/RasMol_2.7.5/${P}-${VERS}.tar.gz"
 
 LICENSE="|| ( GPL-2 RASLIC )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
@@ -67,6 +67,19 @@ src_prepare() {
 
 	eprefixify Imakefile
 
+	sed \
+		-e 's:vector.c:v_ector.c:g' \
+		-e 's:vector.o:v_ector.o:g' \
+		-e 's:vector.h:v_ector.h:g' \
+		-i *akefile* || die
+
+	sed \
+		-e 's:vector.h:v_ector.h:g' \
+		-i *.c *.h || die
+
+	mv vector.c v_ector.c || die
+	mv vector.h v_ector.h || die
+
 	xmkmf -DGTKWIN || die "xmkmf failed with ${myconf}"
 }
 
diff --git a/sci-geosciences/osm2pgsql/ChangeLog b/sci-geosciences/osm2pgsql/ChangeLog
index bd3271667e7f..54d0c0d0594a 100644
--- a/sci-geosciences/osm2pgsql/ChangeLog
+++ b/sci-geosciences/osm2pgsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/osm2pgsql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.19 2015/05/10 21:53:28 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/ChangeLog,v 1.20 2015/06/18 04:33:20 patrick Exp $
+
+*osm2pgsql-0.87.1 (18 Jun 2015)
+
+  18 Jun 2015; Patrick Lauer <patrick@gentoo.org> +osm2pgsql-0.87.1.ebuild:
+  Bump
 
   10 May 2015; Aaron W. Swenson <titanofold@gentoo.org>
   osm2pgsql-0.84.0.ebuild, osm2pgsql-0.86.0.ebuild, osm2pgsql-0.87.0.ebuild,
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 997f97e3b284..afb6f739cc64 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST osm2pgsql-0.84.0.tar.gz 1037670 SHA256 cc0a2c4c677833c4c2c0c00a35ed25ad8ee4e378ad0ab834f151aaee5e7f6f85 SHA512 f706c57ecc63382db7f031f5c16ce94949340aa96bf45c85e71e8c5fcafda0756e91673369fa46e1217733dd8aa12a24cf1260362995d1c9dce258242704f42d WHIRLPOOL 49c1be45844693262108d31e23249e41eda2da7319e93b0c9739d8c5d61c035e7e75ea5182e04e3ddc3063cc248865751da8a55651e2c94e1d8a0797eeb68f4e
 DIST osm2pgsql-0.86.0.tar.gz 2101740 SHA256 6599366c562a7ed6b2c92dffc3ebfb4f6917c7216a2f0d01f154b01549525140 SHA512 f16f67c97b771d58df124aa99b1f414f379f293580451dbb288c460814a5b11a5e3c607d9623cc8e9705117a204425af3599498f9358f2efbcd1c408215fe7f0 WHIRLPOOL 437e0ed9923a07a6d9c507c6442b47cf1d1affa9921b2c8d4b36441c03df6577fee18596204928f4bbc291e8c7e6f9cd1e3f6c19e5d0ab65a5e366f1354d47f2
 DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10edb04114d5cdc5233ca97f868ad0f6 SHA512 f3dd88b6f89c7ecbadf3ad65d548ba0430726bf3c11b5a32c214dddb74f6f7371fd10d712fed965045605749b80d796fc67e4a4d085ffca11310140161059381 WHIRLPOOL 67ef36defd4f0fbbb16ab561790fc4b5abff715e315c83db15735fc11c21069c44d48687dddaba7edd5476f71fe9ce54485e3c8b2279fe7348ee929868233997
+DIST osm2pgsql-0.87.1.tar.gz 2139623 SHA256 49cdfb36ab1abbc568bd5d8593a671d76205ed47efba5a23d84ab1b975b4b62e SHA512 2efa1e350c24cc6a5aac69e9df60172bfbe99a5fc10d4fea8f1af28afaf4c0176e51dd357c89e2d68a264b283457e798746da47515684f2aeee3a26abe6d1171 WHIRLPOOL d00be1f2613c7fa779ece1ce2b16b68d423a365569d4355848fd5fcaa72cbcc49b11b9c083fd28533c92b42c0f59ab3a9538a4cc5253cb74c50ee271aacd948a
 EBUILD osm2pgsql-0.84.0.ebuild 760 SHA256 d8d4eb21066e9bb1ee54f428f5de5706ae2d9349ff0883a04aa3b932a12409e5 SHA512 2b7d6034e55b94b70c9d51a1c4565adef095faaa8b346888a35e56051030e8c687bdf0670669072a330852837f9c6bf6992ad44578fd44755ffb3046745df499 WHIRLPOOL 5216fa188b58dc73486a1330abb5d855887d3be1de66c637196d617f2001dea9e0610833bfdf1d07a057c40d0b951e2a2b3bac3f96e8098d738ce5b8aede33cc
 EBUILD osm2pgsql-0.86.0.ebuild 760 SHA256 134a13cfc3f5e5b5a7c3368481c5846417a0cb48e674fa017211e28ad1f26c7c SHA512 7c3bff6a4a0dd2c12c916ee5592426163b392a74d8d3b3b498b3e9e7be0433ce9c6ef19b3ec3251acfd35cdfb0c5e2bc8d206707bf3174c546142530c4d28f3b WHIRLPOOL f14d2f2912e7c16d55aa4994cb44f3ab9b2f904b70b6f8e0e3c30aa360fbfc3460c3d1460c9d8a58cf5d62d283488e7af68c4f9a5a7e1dfd42cc8caf229c7005
 EBUILD osm2pgsql-0.87.0.ebuild 859 SHA256 9fae359fd2b4d1ed0bebd778baf8a04abe325dcb83e5f54e3d1e868ece099ecb SHA512 3950d536b85ff18076c68c0f2657f6adceae66506e05ecf423cb3d95673adc6fd514959b035c6d78dbd97ea6726b848aae0a4c4d999516a3eb0b497703f3186f WHIRLPOOL 9ece5f280319846eeb284373e0e00ab9497467d741b435c173a96590256b29251387652c2f4eb5f7661dc494208179ab02417c277f4d33149d006cbf3cb653bd
+EBUILD osm2pgsql-0.87.1.ebuild 856 SHA256 0503347a64ed95da7bb21b9e44d4830986a1c5c592db95a9ae3d9da132b13315 SHA512 958f7c56943b813f55bf448d5d5759d69f1392b1ed0c707a366ee736b541dbf7c4b11ca139bdebf447388a791ccbf1324c2d9eeb2e28656456dfcda92985be73 WHIRLPOOL 2acf04852cf1a4be0631ad32a93f03b8a518e6ee836d493bff662b4a6b14122b643c6eb9be4232c48363ba03289b0157c8c2e76ba0c962404b82028888c0338f
 EBUILD osm2pgsql-99999999.ebuild 766 SHA256 2ead848c5617c5d6e3c5e22bd2fabd2e191baa069a2ee44eb2464ea982e558b1 SHA512 526aec0c120e25fd21c235951207c7b15dfe88a3eedce54add309134133daeabfe2aee28a61c7ad09615a1d5f3c84a569f6147e6f34b9dc7961d5c4454ec4ed9 WHIRLPOOL f00293185a3ea2b9d7b49e2dc9356f51890ce874311f40e85004b69e43ff1823d8683e2a644939dc6cb0aa50aa5888fc951f87149f8b2809cbd45e6eaebede62
-MISC ChangeLog 3505 SHA256 1565c93a7221aa9c824aeaf95ba02bf90116fdb26f217032ad5d89a5e104bca7 SHA512 0a47c24b9a0e88f772e6c33e7e8470adead5379b48a4ecb67acb06f591aa9608b3ab8c59de1e2f7e487c486ec98cbc588095c7ef2de8e237dbdd0e2eb10d4df7 WHIRLPOOL 3d1fbea711979b5afbbecdc1e78210681326bca429403d52e5a4d20b6368085396e8ac24753a8e039098076e557c6e383120e9e8d84c1e483e034f16e5c3b66e
+MISC ChangeLog 3619 SHA256 65fd7d4cbbe85203ecd823bb0ae3edc62d47a10545c159834e4a3e4c2fd2cb04 SHA512 974a3f117501e08e08b9c37930c6d423def1b692996e1b65ce331d9319bf66ef907f13beb05c6b275088f1ccea3c0c84ca8dd207e85625531cf2406361e02fce WHIRLPOOL ddd8f59931c46db64c8ac09dcef786d525c2b3dd104acfb66e93e0ce0dd67e4d2bddebccf8b33f4add04c961b3ba8cc95ac3505993b1f399e53bffe3376adb11
 MISC metadata.xml 587 SHA256 df04284bc105352816e089fc2483c11d10ded49b95e96d6d5b20ffa1a22810e4 SHA512 cf9d4fcd6f45fbc0c1d1de5d81ad3e0447a54a464246d1f9d3ced8d21f964beaf64a4902679e444523c262e7b7da9c6601e72fd9caad13866765e15aa8721d23 WHIRLPOOL d42cd23ee9474e2a684c99d2b96dd2c983d2f817200fe5148a5efee009c6274f99130f82b6f3ec6b2854d86824d13bc35a34353c582c1fec274e52e5275db333
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlVP02IACgkQVxOqA9G7/aDiKAD/a7gvJyZre2nlzv7f1qS2DDIQ
-kpywpg2fzzUMGmPIdvEA/1/h5/fONquw3YUbDZD63+LY8VSLeZOIrqDBDyK7vhy3
-=vnnG
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
new file mode 100644
index 000000000000..8b5779815d6d
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild,v 1.1 2015/06/18 04:33:20 patrick Exp $
+
+EAPI=5
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+	app-arch/bzip2
+	dev-db/postgresql:=
+	dev-libs/libxml2:2
+	dev-libs/boost
+	sci-libs/geos
+	sci-libs/proj
+	sys-libs/zlib
+	lua? ( dev-lang/lua:= )
+	pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/sci-visualization/veusz/ChangeLog b/sci-visualization/veusz/ChangeLog
index 5ab6034be355..c07cb1fd3e14 100644
--- a/sci-visualization/veusz/ChangeLog
+++ b/sci-visualization/veusz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/veusz
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.55 2015/05/13 12:18:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.56 2015/06/17 18:12:02 pesa Exp $
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> veusz-1.23.ebuild:
+  Raise PyQt4 dep wrt bugs #526792 and #551382.
 
 *veusz-1.23 (13 May 2015)
 
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 6bb230976a97..79941148388c 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX veusz.desktop 248 SHA256 dc7e1f66e993227cdab3ec9d3741c24f4887398f782df926a1c5c720710f3776 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047 WHIRLPOOL 81943f7498a67394ed6221c6a3ddc03719d0cb950254989401c5f9b068fa0bb8c02fb1c8836ab8250b041bf448057192a1ed6faa9475b4f0300b718efbdd3411
 AUX veusz.xml 346 SHA256 a5d2418b2f530136ac94f60334980f43ac87842756d4664095608f712542cf4f SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e WHIRLPOOL 3b3fb053b68d5b8cd2e8a66bfa9f42d83643d9f75191918cdddc2947ab8005534e48630b21498b21f80da85a2cc4fa01bf105bf84b46038d957d9b05b7b6eaec
@@ -16,25 +16,25 @@ EBUILD veusz-1.20.ebuild 1743 SHA256 b1f8a66db28cec12dcfcdbc320959dcb934e62c1ab5
 EBUILD veusz-1.21.1.ebuild 1919 SHA256 39c4ff5430a43c3560dbcbf20fa12f10179870b3303510427579a5fae1627272 SHA512 4fabb76f0c7597e8081c9393407120b7483e6e0339574b8b93b4926479d8efb805db29c7575bbf2d682cfdb3ef355e4b854ddcbdbdfe511ee12d5a4249b47c64 WHIRLPOOL ccacd35b7a09ab3eae45332e29b94f890ce0b3ef965cd32ace506198e9619fdec16e69e1a84c0cb6b2813fce0a8cb59d3ba96cdf4b6692d9fb68144a7a79474e
 EBUILD veusz-1.21.ebuild 1743 SHA256 c01fe9517ea50d4fb322d7ab4d51a6b40934fea984ee10a35d205d79265edae1 SHA512 4fbe331cf3bc7df2b0c519fa9b58ac13612d10ca0094eaff83ad6624114d0473da7c384e7247449629d78150d911d70d3a1b6bf1ff43191773c69d053696b25f WHIRLPOOL c18b6521577397ad614b9149d93938515dd64da04f97429d6940c04a2207a3f31e47006e8d7ce681164794bcacaa408b779a73241a7a5af29a01818293e34ec3
 EBUILD veusz-1.22.ebuild 1906 SHA256 cc918e51d00d5df743cf7ce5ade3c6170949b05fedc5b74de2f712763a799992 SHA512 67d60207a1bbbc1e5b43b6de4a5e913df90fa2bfabae5e378a419bfb83fb1d0d33c9a0a2b1ffdc00bb3573f335a76a297d8490b8dcf18e9fd219ce3acf46cd7c WHIRLPOOL 1a10bb72cb7d21fbc8b1676cdd2639ac184c7dfb555a7497af79b2c55f0cac84841c9161391ef4c753fad20c58cf41cf7ee3b542784a9eb13aaa3c7435bd8244
-EBUILD veusz-1.23.ebuild 1963 SHA256 bc00c71800bb585cc3073cc504093751bce7d8c005e3d57b8a93c7fd951dbf71 SHA512 753187e9e99f95f10b2bcff4a5d3892c8a21fab5871d53800a8cd96487eb910426d9c52e75e7e67c06d5cf904df12161ab2c07c0b1b1848a034a8fae1634b6db WHIRLPOOL eb10fd4a23d62cc3bd744efee3d8a592f2c211790f6f95fb8ae9870fcbf60f01c511acfd6580c8608f54bf6fb7cf96b2018824c1a74fdcb082ab867773cf5e22
-MISC ChangeLog 7689 SHA256 d5c7c99b49648e2ed667ed3464bce6eb47fa43eb0c8fd1b1a416446200823326 SHA512 f913d8ac24c20b94850cea8675e21013f9188aadc5d39840915c0e4c29319fec9d21fc9ecb219f87891ce6e7b5092918d255ea8379d35298ff306256b075a3ad WHIRLPOOL 352e752c3c2315e2f09a7d9690661196bb6c87af5bd93ee092aeb9de470302b382e54e9c571964c81e13d3845b8d877927e7a530799694dae0dcb8d298ac66fb
+EBUILD veusz-1.23.ebuild 1966 SHA256 cd083fef8187b322dae77cad9dee319aebcc3c96aece902df39d148c4fef61b6 SHA512 9e30b5c728fb2ec7fd98641bf29591daa373f626ddc798deb45784a87a26720ae1271e472c8b14db98b0b7547042458cf8bafd0cf7d4c8dad78edeb7dff1c3dc WHIRLPOOL afa3fc03662b7ec0fef8b295e0d6aae48c7ed6aabfec704b7644542fdc5a08e34e539397b2e2fd048a867faee14d58a55659ce76471e2cbcd77647f4bb8770e5
+MISC ChangeLog 7807 SHA256 f524496c0947fdbd7add5e01d03d927f1c828394dcb066253fd09301488af530 SHA512 2eec40b2080cebf72e85b12efd78be5bec2edd2230f3bca5395ca4bb2019a66b57e375e441884156210439b9dd915171d0cf15cf114bd4667f7ba87eaf5c086a WHIRLPOOL 5e6f20e66fd04fb6093d5b300869b880aec17349e3574bc2e216eb29a7e8c07801db7fe5f4f62c5a145e3a2830dbfbde3718bb8e4d4b4c151f767367e7c22b07
 MISC metadata.xml 875 SHA256 a5dd9974743faa210b04d361e302a8164fd16abca486c7747af85575632c8c64 SHA512 a01ae058aaf1281417d7d169b88664027604ebd23b879799ce1903e779f5d4ef55e2176325801e6b7e6aa7751bf3c26595f0ecc382306e419ef71ad669b279fc WHIRLPOOL a75c7ac9ab1de4cc15049a3e0073ed45b4140784c59902ae054d85cbf7709d1f62a5a01d5b2e3c9ae3cdfe26428d967544b38dd630928de7d6b7b3a0a0f5c902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVU0EuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisVoP/AwrTpLvCLRpo29xj5rqTxFD
-NpMu/K8MBgFG0HYwB/1kzgA3oF0QNVTg6BfAMd2s4PqR7cT/v2FKF3USENRkZr3g
-rAFcaAkVakdt1Dn0I1D3Qc4FhBAOe278tdFoA+x5lvkRd22W4fWmVrZA6j/YJhkr
-2cOnQLY4j8kamxiVG6PA/RRKmRMEp75OYB5uFJC3b9sG9douuV+F2HMSU9lDQBWj
-+ej47ObX1/EqhJx1szNC1AJj4ZeVOoUsSwrVufiUhtbn3AUvpEt1CspUorFU8b7L
-vaInceBVCZsX/eryLjBhfpzMwTwpErOAj264G6d0BGkKmeYLtMLQuHNkceZ8PLet
-K1bMLOeNbTSBgfphsQtDslmN26jyzaxuzMkPvkSRF78ucmHH5ucDKixTCZosIZKX
-nN+07nI0ByskZkXP5yOx8P4upEeVwLXe8K/FUWvPXsj5b+2KhJ1vwkmVSiHIu3il
-hCQk26B46TedKlFDToRRv9AkySf6qvKenHITap0hNinzBpU8wEvrm9eOxCPQkn0j
-Og3KFHOBDvaqpsZMgfH2OsEFOvHopbfhlfAhIDT0QaKQ3voJhRrVGXOGK/JQpUbG
-2B93xkCmvxyGmBrRTIQtH4b5GRQocnivlPbIINV/YYA+L2q0iQptafS2keTsJamO
-ZnC+SSlyPNV4jehgJqYn
-=xkyc
+iQJ8BAEBCABmBQJVgbhzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV962gP/0ETAXFWyqxA9Sl345uCn9xi
+Flpu7fPsBdbYmRePR3U2yfh+CJ7XayyeN/2KJzad99D5kHmSczyAwCHjXXY9AcWP
+u19bkLXrJUakheqAtHmnXbU4ozsQD2FbiJf2WnC58f4Vbd2cYkeQT/LNwUswYQrD
+BKj4efdrpv2fEUbMqNGurQnzGhpJ8n/FQ2olzYJ+2oE27hSbagnOFy566afuBcvu
+XhlJ9uy0QvgDUAMAMXhjdMjotKFF/QAfWhgr9g3fXSpVgMJkKMoLlAn2aBx5oY5+
+R94EVSSXcBpFTWPmVPJiaVmKDaUApAVtEg7aSG6sWpACwHOsSZdSZmYPtbyRsT7F
+jwLtAhj6NdEajlsbWdvMFq5CWubg5MaP4QvaZLdk1y5nypm7++DV4wsdzO5HHioR
+vBwHW81ZaF7NM6/gTZSudz2DShgBL61k2WApf1DbiFHA5E9nvUQv2RSMlbJi/kNh
+S7IbXyhspPw7F15Z/VpPKbUPx/0T4ADS1Z8fjlVI3mFJdELpmLGwhtMrChUgbRbA
+MdMx+4JL324B/pPBEytPskzJ30QL+BEmD/livy4r757FnXqVYq6ZbDVlS7rat1Y/
+DdtAlvuuDJ4VQvh21OYD4opeljQOwMv4x0H2KvRL05XmRJtXBQ9TLScJK2ICDjzT
+CY0Xs8jDrbJ2TKMT+oDY
+=hzie
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/veusz/veusz-1.23.ebuild b/sci-visualization/veusz/veusz-1.23.ebuild
index 305f9d76ca0d..2c0d479ee50b 100644
--- a/sci-visualization/veusz/veusz-1.23.ebuild
+++ b/sci-visualization/veusz/veusz-1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.23.ebuild,v 1.1 2015/05/13 12:18:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.23.ebuild,v 1.2 2015/06/17 18:12:02 pesa Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="dbus doc emf fits hdf5 minuit vo"
 
 CDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.6[X,svg,${PYTHON_USEDEP}]
+	>=dev-python/PyQt4-4.11.4[X,svg,${PYTHON_USEDEP}]
 "
 RDEPEND="${CDEPEND}
 	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index f207daaed576..bf2fea970e4c 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.250 2015/06/16 07:32:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.251 2015/06/17 19:39:15 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> hdparm-9.45.ebuild:
+  ia64 stable wrt bug #528772
 
 *hdparm-9.47 (16 Jun 2015)
 
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 0bf220851e47..0e940b8b70c6 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -7,24 +7,16 @@ DIST hdparm-9.39.tar.gz 126989 SHA256 72d550af4526aa96f0841c79321a0ee39d636cbaf1
 DIST hdparm-9.45.tar.gz 129410 SHA256 23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669 SHA512 2692382f16fe9a87b7c9673bea44b8a9512b2449aaf18090f09c9e761fadc153f71d9779d063218f6951797649c0758f97242b7327da6653ea53991bf3da9eb8 WHIRLPOOL 6c424e265b7845afeff26f87654fbefe7d563404f2dee59f976594a87b375124262864305a14655bf5379e77e21bea0d8fb179e099374d7e8f952199f569ee58
 DIST hdparm-9.47.tar.gz 130180 SHA256 4995545e2d4e5a1e6886e5032f353ed9472c17a56a88ee4b1334b142d5b1b757 SHA512 1a5164ef13b276ea0be25ac96710ec6292d73649eb20b2350ae4f3ea77e4816515cdca75316a4bcb8624a0fff725560c4a64fbde63d48b68c44bd02cb76c6a5e WHIRLPOOL 97279536cd14543380d287f5b9cd76934c11358ccdbfce1610ec0c85a522b49913a81926a9b042de776881c3160f4dec81988ca91cce7811f8a216e3736e47e7
 EBUILD hdparm-9.39.ebuild 1023 SHA256 fdf2b6979126f7af92653a9decb0c9d3ca873e8ca6e77dfc8eb5af741953c267 SHA512 4e1ffd038a3079fd3c4c6c4c58451fef9bd2724761bddeea5190aa9768fa53e6fc803ea47975a171515fdd627929dbdbeb55c2b55727ead6b98e072e871f7fb0 WHIRLPOOL 4e4b71085d3d4688b16b3eba4722a84a767a2d4f27e05dfff4fe81c209219527a9e67440f147c22d18134d6175981d542a3cedb058b08f0b6509ac4a3fbb6ebc
-EBUILD hdparm-9.45.ebuild 1096 SHA256 b71cf0b3e69a5f5a5ac41bc125c44fafc8d15b834968cb629d47eb9424be3856 SHA512 55de0c3fd364235260c404c6ee6a26f639287b104ce329536b293bb906cc3be7c65908752691b033c18ff5d451b15aa52e297492daee3b5fb4917bbd0dcb8062 WHIRLPOOL 562e294917d1a6054e76c0e8eb30e44cc2676f0710743038aa6c746e0743cb0fb4f00357a23d5163b3620becfba0b3d4e8a0da04abbb6de19ec4d48829a96584
+EBUILD hdparm-9.45.ebuild 1099 SHA256 434ddd6389ac144b6d6219a392c94f95a75bc056dd9891ac89d724e22b55d365 SHA512 5bd6754f87d22c9d034b296f974b710e7b4896cae244847aa7b2195856b1d13dcb9a4646330c5897c5942820076728403f95e70c972cb4515443ae04c37e781c WHIRLPOOL 6be2af2200f5a69b39f322e793c71a76c62a07bb6e702ee1498e6360059404a247ecbfbb83bf22a7a39f80401e54f9c3ec3af613b4bfc197bf6c3bf1af77e5ac
 EBUILD hdparm-9.47.ebuild 1111 SHA256 6b98604b807e37449f5a0acd1c966cac161bd917f6930f1d0ac239bf2bc8540e SHA512 4ef957c69560c56872736ca9a93be38cff71b6471f9dafc5b44e438a53c2f9ec5a6c2fb0d3f160362047c1d9b1daee8d9a0725d3b7cb97ace7abdde1fa2d907d WHIRLPOOL ed8e4b7db45a8b41bc13b654710035cdd322db28e7cf877608c5c44a0d3706d09244353dd4eedf282361e066eb2c87bf160de46808811410cc18e21adfdd1ead
-MISC ChangeLog 29182 SHA256 cf737b338b37acf4860381fc43163d32a039067074f46c040534065aaad651d4 SHA512 adbc78f5a25e33c17a467910e871715697e8d68a0e073c66b93d2b3637672c5d1c8637f036f8789c79f3baec759dba9be3980c8b11685641166e8fd01f643bf3 WHIRLPOOL fdd12dd4ae922176812b2614d688591581350dd762cac6d6c4edd5a3f8d9b9557fd57620b0b99918bef52e156b59e93e1e5713f73b6f1df3951fbfa3f20d9556
+MISC ChangeLog 29278 SHA256 1e49684c123bad66a09dab84cbd61a60375722491e7144b962c3df7f45d8bc36 SHA512 beaf823577d5ea2e736cb8fd8b885081032fc6f1cf93951a4a06e924d1632d42d9ac92f09c230fd34cf1776b597867ed9684b9366f7569f0f5f26880dac6dbbb WHIRLPOOL cc8d3d468a5d6f5d961f7826727bfdb77c348151deaf258f8ab3c4fcfdde8aeb47cd761856a3a0c3c50ca8b548e0091f80e5ed9b43dec685f733b705f393b791
 MISC metadata.xml 241 SHA256 cb8ce43f39a29bd724b4f43d7854108c1164375bb439fcc725e651f6d99fe7f5 SHA512 3c8635b26517adfaf4ed9c397493d08fae97acd20c19b105a12a566390bff9542412f5e281bfff7a9a7a780181d5ec0677c3d717c2351f5134d440257a2dc17a WHIRLPOOL b955c4a8402b536cc685bebc076314070c5f5ca59996dc5c84b1d88b8ca851941a81a00a0e37c04296b707f693bb18cbda52c7bbdaa650198e5146bf6bffdc53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVf9D4AAoJEPiazRVxLXTFiAEQAK2KuR44Y//AChFm8AGRy31+
-3pKEyvRTmm0NLlJtDvdPFcooo3mv443hTVJKll6gQCv9PxKAwnH/ppLkweMsWomR
-wS3bW5G+pumJi6gX/3XFUBATrh9MG1nV1Y9sXcHjWFK+t5cqiePbBlZIlgVAK6OM
-KZJWIhia2/z5sSwKT2nW0Rk8rXlXfY1Qmhs7M/0uk9KlWp4VqpvZet3Th/cZoeqm
-O6ucxOQxrjLI7BzVu0ZRE5+XPnp+jSEegSjFburHDzxljv0M88+lxKTcgq7jzWNI
-X/jI3IjHXVPt/i6fIWYRinwEt82V2dgFAMrHyr+1Z6xvNoI/HfQTNt6Y+Uoqp53S
-Uqb4X/PRi5Bq5tg4VaHV9IliDE39WtpdZAC/Q29rvLmvIsPXYhscYsJtjis1jN8L
-roxVq0TA+0KEqGdfTPJuxkNjXxCwt3TNhGSMDggJJXdGmUhV8lgzDJtQ7Sr4WjCB
-3UWGwUdrY1Pm7PAU2a9ChBC8oVPsa5tRePCKSEjPb3nuIVZ+DtsdB1GJWxHvgsxh
-l0tOA14a20ybtcZt+QuzXIMh+PR+uu5E0lTAIHmE2q1j1tuCpioZClJqaDrdFspe
-vD8EmtNWG8kXYRt2yiYg9ONEUqvjpvorxqdB8tNInoAZ7MouykedZ3lGYjXeB7J8
-wOHgqoo5saDFPBz40k/7
-=89Ez
+iJwEAQEIAAYFAlWBzGIACgkQG9wOWsQutdbYRAP+LSlzEw/khYhbaynKkWU0+JSg
+jUM4cGjEUmx6S/kDlfvFsDxTss8COvyWQAvd0uXxt001TFCoD5iT9g4n1KaURlTb
+kxqwhB0/LonbGJ1lYQE8oBVGymb5xpFEIcPg3MFpncR9xNzqNkIAaPwaSsMNzOOg
+RjK7L45GgK5nP6F8VB8=
+=zQW5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/hdparm-9.45.ebuild b/sys-apps/hdparm/hdparm-9.45.ebuild
index 60a986f8911e..bcceaaf0665f 100644
--- a/sys-apps/hdparm/hdparm-9.45.ebuild
+++ b/sys-apps/hdparm/hdparm-9.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.7 2015/06/11 14:14:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.8 2015/06/17 19:39:15 zlogene Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 src_prepare() {
diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index 72b13db21bae..08f921f1e354 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/moreutils
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.69 2015/01/29 06:40:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.70 2015/06/17 21:21:27 radhermit Exp $
+
+*moreutils-0.56 (17 Jun 2015)
+
+  17 Jun 2015; Tim Harder <radhermit@gentoo.org> +moreutils-0.56.ebuild:
+  Version bump.
 
 *moreutils-0.55 (29 Jan 2015)
 
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 1040ba082963..cbb33dc5f5e2 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -8,22 +8,24 @@ DIST moreutils_0.52.tar.gz 47511 SHA256 c4bcf2f5bac09312ed5aa48d2cecd77a1c960901
 DIST moreutils_0.53.tar.gz 47613 SHA256 4f1842467759b6747f28a624c317a315f0b54a44440d2c8e2eec4d10144696fc SHA512 ea4eec3f66b14d86898da178dc3b7900ea4b266a8118e6b2decb2dd01217ae5918d4b45b952366be12a27b8b83791ec877ec0749e3272e6adb4fb1f14b706bf1 WHIRLPOOL b9d7f14fd1b77bb7f2bbc6ccbfeb07a0af743509809ecb2f1b9a448ecaf0a5f517cca384e3792e149b95679054cc27d73ffb9c5dd71c9c735fd0a4921960980b
 DIST moreutils_0.54.orig.tar.gz 45575 SHA256 50281c4d6bbbc8ab08f881c44a01c367049a09c19b7375023dec2543493b529f SHA512 c398ed126e5735356688654ee361063cbe8dbd76ff28aa856feb87c0a1fe812d78c2cd1ee84b029180c45161720659669960362583744ad4c9e3105c2575a2a1 WHIRLPOOL 0911b70552bcd2d542503fd3b1f84362f62b5a4719fff8aa4452774e735a28ff86f674f85ce66285fdb14e8397a65f857cfc4b86a27d81b27df9eaf8f1a8dee8
 DIST moreutils_0.55.orig.tar.gz 46500 SHA256 da9d5cd145ceea967a65dd50031d168d66199c3eb41b9390b57f35d4a5808ab5 SHA512 9a64057015cb9d1f957c438a35efc57c09438a033d0e58aed5e7fc0cd3c125df91b075a2f14b78d75c7e89b3b41fdba573b4cf41aba08bef7230f5a8794ee1a3 WHIRLPOOL 595692ac0d3ef5eee5323d682bd2a9e722fae2f33ef63199539d5612cc9b9a6c9a8eb96561149e13f03a6df4587532a231f7b00ff45694e2752b0753bd17efee
+DIST moreutils_0.56.orig.tar.gz 46704 SHA256 ec4b7a1e1d1e1d6ec606d2877301ec06c6cf4091776687d9b76f4d019705e77f SHA512 1793619f791fa2da9d233e0ee90ba4d843ced638f059406bec84f476a1300df33288fc34452a2912de7006e1ba2a75492785024148fad6c8372987147fb8616f WHIRLPOOL 21eecda882856d0c4ee2fa744a9a10a8ac71333f64d592277fcb93cd6ed14bf59003dd16a2a8985f27556344e884d60e2c28556fd024638e3ce30f7397aa5bd1
 EBUILD moreutils-0.50.ebuild 1502 SHA256 2fa4f85be19c3fd8f1a616188f60b3c04bc2eb443beac29197fe47f8ca90e98b SHA512 443d16108447b83c2626603bea75bc5e2cd29addc30fe6674cd302e1d1ba5385c91d77b83087d88ca2df7ce3416d8bf89d8da331b979ecc9cd48a8f2e0a3c7eb WHIRLPOOL ed8981213e91a7280f8f3df6664502d5700077af19db3b273f6f5e1d6ab6b4fc73f2808c94b68eddf168ad0ac98aeb09e76fe8f800a2701fafc70e6907daa68a
 EBUILD moreutils-0.51.ebuild 1439 SHA256 eb300b5bf11eb598ae553b3a8d745f3702296bed19196aa60fa0e30368613482 SHA512 74f68ebd25e6930254875705efd3c44cac27a4b76302cfc5a3797e77be9935265e70616848d783ece1ee50ccef568ac2aea38c99a0fdc19cfb0e1be1fdb8498e WHIRLPOOL 7454cd686edc050a4228d22edcc83c27f10d284772378eecf15e71d68b74b191c506327cdf37fb2df4c4740a9c1ff8b029ea6e4d334b8a190f6cb1e4f8633f08
 EBUILD moreutils-0.52.ebuild 1440 SHA256 180cb29872e5b9b4d14cf2d66c27fc70dae8206ffcb25fde5e061d6638cc0e80 SHA512 87fc00b2146738002294d4f253ba4c0c588749a7e7e3d33d6b835e32c6901d6eb49e56026475727fa117ad17bae189046bf73327f03181359d9a1b3a8e9eca59 WHIRLPOOL 5a36b57969cace6f2e20d350df3058dcce83b27e426b42f50cb090cb045919c4456bb8840961e4329044414d879319399efd1856ddfd02537a83bd12d598356c
 EBUILD moreutils-0.53.ebuild 1440 SHA256 e6d67169aff7312c1477a512d6280a20b9c1dd499ab46047d494205badaa13bf SHA512 059047d8f8bbc26db123d408ace9826df794c8945aec5458c874ab9a72fbc2a5cb916d336f5edf5fe726aec54d33c8c5cdc54f83072523a839c0ac249d630558 WHIRLPOOL 59dbee5c3592c4f4c8fdc5cde6f0e9dc5a72e94a3bcc712d698bbc570fa2358dfba4c37bef089ba92629f97f2ecd27cb04d0cd09c2163d468c8d43e116a65f79
 EBUILD moreutils-0.54.ebuild 1425 SHA256 157d22703efc97e38d83df7798108d8fab14b68278da1cc03662c1c954000ed8 SHA512 e8d152d3f1b6786858732c74d443fc28d3208ef6290d4e624b59b1a38739c2cd834123ad9da89ae49927c7e99b238f48ba374ab94d4cabb432cc6750b599958b WHIRLPOOL 29d505f6a9636848421c2931c863f5bc475403883170f385aa406ade443042e0540295fdab20130e396c36d57297de782034d3b16c4edd684de34394898b8199
 EBUILD moreutils-0.55.ebuild 1418 SHA256 1c8de5eb6666d0f962562c43d940f221578bca4ef019ba8dbea870e0c4e13e87 SHA512 91611c70f6ce81ff6e764392d0e02196b5a2ebcb5a1966ee42ef73beb0f9faeb2ef746bab7b97ec2104b367d0f2b1b97ff7e0328ffe059c251b65267e4557249 WHIRLPOOL 7402487223c70c22438acbef0945017e3a0828b1a95fa707f5255584cb7b95ebc66c01b0d185f318046d162abf247f83c728e3295d960e39f5ad17fc91aa1953
-MISC ChangeLog 9672 SHA256 e0d2257779dd9da5013ea7d7e193ada492bb4cedfdb7f970d4f9d7fac4077ad8 SHA512 a95b86a48a39168f85a7a298eb0dd6f1bd3dc70bc8b4079503e42cbdb541789395688e323f7e03db755026998e7b12a3cf3042a01d8e4fda6f8400c32d5194ca WHIRLPOOL 87bcfd94ec4e6aab796bed8d7a5dbfe308a9d4438cef7d67ee940a1c1336ad9f46b3fcf4e742b977fc61c1863e6b6abd834203cc1839fd1704a383f882b0c983
+EBUILD moreutils-0.56.ebuild 1418 SHA256 0e93bcb302b7b4f25be93156e745193f80429bcd1871bf9b576e0998328a4939 SHA512 c31c0df33cd57b20093c16cb827e555d966cbc285e99e3a5c30c1ffb8b8dd752e5f937554616753af53422aa9b341ee842bd74b61e8410d238ad875ae4bd0382 WHIRLPOOL ce78edf249993d4bf56bfce2b1de863b75524ece6dd7166ac13ed99729862683736304931872c57e2452cc583ae2f538c46af217b529e413575e800aea807721
+MISC ChangeLog 9793 SHA256 338078fc41f39f641af28c681ebc1a50c242ba288b1e84d957fb99fda93e53fc SHA512 f01387c6f90b49db4a625b245d3d498f59921e7a0677aa9f872067eb222523c79dd03f1fb1de42bb7f29dc559838b53da368c3db3455bf0f65ba2d65c63b9b59 WHIRLPOOL 4c0a58efaa5631181bad9bef137083dcf2714a3b299b5c42ca677b0a173f6e3dcbce5e6b374b9b9bcf2b21d889edec2c41f76a429df57b565d078ecf8f722392
 MISC metadata.xml 393 SHA256 43a43aba45d87b31f2081aa91fef2931bdf986be3438a727ebc5f8421a219a00 SHA512 0e100adc572ebad52bcf5445e5285243372a94ea3e6bff64525159e50b22a0523bd9876cd3be49c530af6809dcc3bac5f905974496b59f499ba89abe4d6936fa WHIRLPOOL 7868e591fad75499480cd1bff3d21d58eb014d3dff581dbf0108545a52528d42e75c2b1449b605633b475ccabcdbf87bc7dd3aff8086e11a441fc67e5385871c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUydXlAAoJEEqz6FtPBkyj+9YH/3x/8Yx4HE4VNkVYWPMZosHT
-ThnGwNtLfHYQCkzQ9zOaA2lXZD1vlb38XoTNwPXopWBAnyQeXGsA7rmjIA9g5Rbo
-jhGWRn64A7JVvzneIYmDsqsJ4P3IonC8MoXW14lYYRvmuEU91qGLUbnFhcefxfDj
-366siq4o7s1EKnW76YHkyJOk5EMeSFR26WJoC3sZ9fQuqX+N/gmqm+QTq6rql1nr
-nohs1sQ4K7jnH+hKREoWx4twF+O8cFKgRWfl4Hd6zDrqQlpmi9HXcDmjXh2CrJ7K
-ctajDQ8pdsmPuzUgJZpYkUwVi5Om4u7ZnrbZ/PynRv0ohiLMqXbMm3RyKP/eets=
-=13s+
+iQEcBAEBCAAGBQJVgeStAAoJEEqz6FtPBkyjWewIAJK0dwgI7pWcxxcp8ucv8TmO
+6YM4LzTOXoACQG/XUzBSiYf5Ql5I8KNFkIDb/ZuMLWYIbEl2zeWnxpsXc5YV7P8/
+Q6Vb3trjECNTR1lfMF2JFdxM8HjiZ/EptneuIRI2PmdNngBmWWy0SImPCIcVwugp
+HxFXOkXx8BSLAlWrieEpbSCtUNhIcheAwpAuXQ9MlBXFlzhE3MRSYCnPGcWQeTzO
+ffVQ8Y1P/wn455q4g9oCCygcgGiaE8WgsDADAfikOQTyfIKdmO+QnRhxEoFZJNFz
+kuFRjXVzLpRt5oQfPvUe+GmLjzELcpf0ORl39wqiMdFgUpHx9E1guf3zFqvsvZI=
+=7sP5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/moreutils/moreutils-0.56.ebuild b/sys-apps/moreutils/moreutils-0.56.ebuild
new file mode 100644
index 000000000000..a53ecca3fd86
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.56.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.56.ebuild,v 1.1 2015/06/17 21:21:27 radhermit Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="a growing collection of the unix tools that nobody thought to write thirty years ago"
+HOMEPAGE="http://joeyh.name/code/moreutils/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+	mv "${ED}"usr/bin/{,${PN}_}parallel || die
+}
diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index d18a84e7cee8..52ababb59199 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.24 2015/06/15 18:27:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.25 2015/06/17 21:39:14 prometheanfire Exp $
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> +files/nslcd-init-r2,
+  +files/nslcd-init-s6, -nss-pam-ldapd-0.9.5-r1.ebuild,
+  nss-pam-ldapd-0.9.6.ebuild:
+  adding s6 suport for bug 550594
 
 *nss-pam-ldapd-0.9.6 (15 Jun 2015)
 
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index d5afac7c0565..f38811aabc6e 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -3,32 +3,32 @@ Hash: SHA256
 
 AUX nslcd-init 867 SHA256 a8cac89f3bbecde9b4267269a19bbd9cba56b452928346c4027052dc46624d5e SHA512 5fdb4dfb678a8733156bd9f99cace12104917cce96b476eccaa3621019c319a2cbb5e0f7789a883e0107bcaad98b9272ffcbfefe33a75173a79bbbb1202c02a8 WHIRLPOOL 795e2ab94174731b2b20ff27cb308fe2eddf9a5eb457f36c7a4a2c2d3d505f014fe71f99379bff3983d9f1253335227f63f36f984e316896f52d3f0539f03715
 AUX nslcd-init-r1 856 SHA256 d10fd2a3b46af6d9172d4caa9544b66c86783f147c37cc217e52b8d343813090 SHA512 31962bf39ffb3e61cf9b203425ec6fcb7635cfe82add485efd48db212b24c3ed0b77953b524add1c2a07574890bf933f265e7f2a94c63fe7c4203f3ebcc0a20d WHIRLPOOL a5c3243b811a26ee09a9f2d735fd87ad3004afec85837b5eebfa8e3c0673d58c93fbb192bad3bfb45b8866620742c491cf5a6b9da49806ff06c3539858f6cdf3
+AUX nslcd-init-r2 645 SHA256 1d5ada9f212779075b6fdcb0aeee6b8d92753f2afcf57263939d98d1de3c7f51 SHA512 2013d4c5e3dbf3c6e033dac561a8f264938c6a91bbbdf98c42f8d6ad55d821673faf07c9a29354d8a95be40eed5546d57e8b4767e81c1a818e39e57401e3c53f WHIRLPOOL 8c169eed1dae9c6bb37ffea03aca65bf8b167b669aa8ca48f335de26bc92f0580651f85220d33c92149a29132f7ff2f3fdc6e64c41b9452ea1d22708815db7f6
+AUX nslcd-init-s6 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 AUX nslcd-tmpfiles.conf 32 SHA256 670cad7afe9938464a1e2edd6bbb588e138318795ed6895493c64fa7e666164a SHA512 ccffd327cfa015ec746f4e1506c02beb514763625b0e5818455491b911d9328b19f17620926c15aaf18f5cd9268ea71f5ef35ce7a427aefab950579d5629ee5d WHIRLPOOL fdae80405339264b9c9a491b80d5e68990f2a8c5a42ab2b8b2fc60ea00ee4a5a47ca1b74a256caacb376292302b6e44a888e2d201d9ad2b698e65974ec52aba5
 AUX nslcd.rc 815 SHA256 7e68c0387282d045016c371c3888946955e7c74281f3d92f677c1f80d39833d9 SHA512 fca3a13f259293adf5fac1f1b574019752103ea83aef261a3a83be81eba59e779399179a82c57e2d504663c455efd2cdd3662ffe12bc2bfdc323f425c58d0906 WHIRLPOOL 2b3ced109aebafff42981b18b142dfed90bc2f1c10f228098f38ab2a1f03402fb79d986cf7a1b309e7649fc91d10c184f3fe5f9caf39933d12bc716de5c6c819
 AUX nslcd.service 324 SHA256 9a194c0cc0f43fac5de3ac974cf8efef1911e233c05d7cdef22a9922161d940a SHA512 8055407704c445b4b90046cc4f6b68544d8955bf65fc6b4a2fdf986548a353c2292de70edcf7cb2356619cb122cd3341a82156b6f71eec914471406447cb26a7 WHIRLPOOL bfe549b354ebe56aeb8442a081fdecd7326391d789bb733933606dac8a118a66f169561ea07e389206f971dc93b6d665ae9f8d374a6e36160db218c1b5c0f973
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 SHA256 d47afa040e8c282bf7f294583ae2c11a66c12cc702082c138eebaf972afcfa68 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962 WHIRLPOOL 916c2b506e9133864c4063bc6ab420b6c6a7759b8b7adc6f6964b9b33bbcd5966b89135bf37eb3a511646806a11073210a68be9ea379fb214539f4a41934cc22
 DIST nss-pam-ldapd-0.8.14.tar.gz 508949 SHA256 a29ceb9b7eda386ca38f16115ffec61425462cca6b5e560c44c3d51edc03a63f SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 WHIRLPOOL 5d30088d73e464bf380dd5e7d34f8c5200680712693c97ee1f1df1880b4680236d9168ac7ec08b161ae463236c0feddc2171442a956c872113caa6e2b07a6bb8
-DIST nss-pam-ldapd-0.9.5.tar.gz 750988 SHA256 49080058d85f60213c1b661a899ffe44e30770b5034e5a6ce48486a8d92bee6c SHA512 78df39c7db10b8787ad4e3b4ccc4c764f390db85c1ef3da1de5344cca668fc54945537425e1c89c7899c66c6246652475386009b8fcd3f4d3144b790b1fc4015 WHIRLPOOL c6bbae2c174df83fd27ba90ec3c7a9cbbb20ef1e1b048c8b730735897d356bd2087289c8e5e669f3681f615cc466c540ddc78893edcf487f796e3a5396a30ccf
 DIST nss-pam-ldapd-0.9.6.tar.gz 754681 SHA256 101d5a7fa10549cc77be48d07f2b8141f59182f10f2cc0fea93efd13c3a5a6f2 SHA512 213bc55554290042623ef4cce071045bab569a824aef7d960e3aa9c2f64f0c4928c5c28a4b5d9225fd35ea5026bb11f710d9c620f790e9d82c73d89b272e972a WHIRLPOOL 8902d48a6e889e697f7ddf9bd7d481493a0e2e302223317647f24fd3cd10b176cf66287553b8eafc2b996d0c073055afeb42b4f29d93e8f05f3967bb0aeaee16
 EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 2144 SHA256 f36b6e4138dc6346f8440fc530f2be42dd4856243faec07058079f9d55f7b562 SHA512 ca6749205a478d4d7f526c46164fa8ce0c22b8ad8d18af6e3c0dfc9f41ca37f1bfeb29e428bc3836a94aae4a810a954851842aa527f424a7aa4bf4fad3307756 WHIRLPOOL 0755f53e9f56e745c37753d62747ac8efc01404e778648b353076d1ee43815411f6db60b404faa600602299f819decdad9b7d364442b76e9cc43f91c1d162ed4
-EBUILD nss-pam-ldapd-0.9.5-r1.ebuild 3121 SHA256 786ecef074556bcf3dfbca459f5cacde6c5d8dc30cec2d634b964b8ddc769dda SHA512 a1dcb24faead16545afb073d97753c030cb0e8401238a0d36907fcffdda73052e4b2eee8aef1cd6203ba414bdbd25a8b09a2b0c0d278472539b08ddcba2bfb09 WHIRLPOOL 6469669f168a15c8fefb0cac2b3cefde8ff1147f79f771a111dfec25604c1deade7665cf2695ebbcb7f829c399abdf302c9c6717f645265cdf6e813eeb631520
-EBUILD nss-pam-ldapd-0.9.6.ebuild 3112 SHA256 acd4855af7c46613900863d024bb753649591f23239298e5b3db9dc5aa6ea36c SHA512 8f8ddaf4c2b5cb451c14617e45187992908e2c18a9cd3dd2b22f6867d9fd6d53a5c7ea90d75e87900a64ec0059eb483078cf649617683bbc3eae2aab9b058025 WHIRLPOOL 1a509a239f8a4f42ca27b1305cbad81dc77aa22fcda3dd84f4d5acdb676b19854b98c46fd707adee559b2c0ec7456b4ab7872a9a69aa5a7dfbcf216bd8118be8
-MISC ChangeLog 6114 SHA256 dde425227ef41a84e6dad2c97c7e45509656dae51e92c00bbb4fbbeb0d386e83 SHA512 68d0f535c038401ea91af26decaebda7989f561c134ae00aced88a3829d901662f7f63468a91ad5d91e17368ed572c870064d3dc9c4a980169d38cef512aff25 WHIRLPOOL 79942a37020eba544b992e8510d110c33dbfc611a7cee7323e3876434edb0f8b69bf5cd05c640f15a93095218a40e7695bca68c9297a8ec3ec9982f57c826a62
+EBUILD nss-pam-ldapd-0.9.6.ebuild 3466 SHA256 2658337821d4dfa75455125af511338d7e33a6ec95618b8ceb5630a518b0adc7 SHA512 9a27d50fd4e053adcd13ebec43ce0f3e7aaab68ff99eb57fba33f6ea4a6e6dc5dc2c1adbc65d6f92474ac8ea58c54d314a79b0301173d77dc309fa5b527a86da WHIRLPOOL 322ef9520a988f82117faacfaa245bf3a77784afeba6b0d02ea9ff6d78d9233d32c54e3d886aa45e100b2d3d79a9e36cbb9316cb2be1558178c237d23779eb9b
+MISC ChangeLog 6320 SHA256 e596e817666fd5f55b84af4c3f2f912ac30e7d83b9675ceeaeb12ca37950a46e SHA512 aa565c289f28c6467dcefde33b174793064cfee4e9bef3b71fb5bb1bd450f24c8a46c20f71da2cfc5a8d3f606c1cf0a8d1455cf6cb333e1470084142e32aa004 WHIRLPOOL a2785d0fdc469c6e12ea800ee4bd0fccd3fbb7b29e0792916f3211acbfc3fc0b8ace63696938d655fe3c211e0931c697c5dd5691916192916fbf803c9dcb935d
 MISC metadata.xml 1036 SHA256 81bb1d41ad1502e088be7041ee4ab827d770bf21c5eb4617553d45fa27356218 SHA512 532558a294e12659b86691c324fe9d4e90530aa56d985a450057363e3c966bb1a18d354be536106b83c24b7bff54c4a8d3852ba8be7a1e5e270921c7828507bf WHIRLPOOL 7a73016266565c39cf732006384ea266ce00f8119786cebd7fb39e40408b07bad864601a96d747f7488c92acb39e1c96e3f170dc4d708d8dc5b61f12fc8a26b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfxkLAAoJEHy/RO9cNQiD7UUQAJDRH6yJPECrJ2Cyw44UPNh5
-rYQWfOPU+Wu7n1Jfn4oupxwdsJffyTo7JMg2QyBWF8gRGwDv2514A/xLn6YZdRXM
-SD1VRABSxAPSyc4d0YbLcwgYZ6o8mAzenv2BLY+T+NQ2fQqONnIFCPm/X2GCzHAV
-XsYt6NJ6hoqmA3oCZYj6ZyBZcsJjFl3o0vbJcwsiusbYWKG2Fvmw9cHpjyRcQj91
-6IaymVO2jQKL1EEQxAO0CwwU0ElvktqMnwy+kun7Cx2/vdkQ0Sq6KVx0Cz1AHYh0
-Emz4bkytiRp+U+8irD0Z8opE9nyWVpmJ4Ab5S5uhtIQAq+YJ6l5ZZh50JIgzSy5M
-PPxOc6UedsG/Dy6UYgV6sg0Q6fCjtRMGdNfR3Xu5u1zBl65dHPrrA7byhn335bVL
-4FvoRZR6nN4nIQbxBeMIXGGPykbqX4Ij8eaUUoIpBA/ys3nmYbr89GZU4Pn77r/p
-niPN/FxxLPBMSKr+Y0fUtMBnBwNQGvIzmIpMbBOMQnmUPGJBYhNsWeMz0G450oN7
-zhvvWq8P3HYasAilR+2dC4GeVOZ2YasDKAUiw01Uemf6EaLVsIuhM+nUw0wRAaOA
-03PvQ+TomYBWUDszuM2BngrO2CcvngZ2jSubKs1QMHeCQjCzbYHfF6Y1PYfejAES
-AQKy35zsto4dlzH6u7wF
-=70c5
+iQIcBAEBCAAGBQJVgek9AAoJEGSje+quGaToTHcP/A/B9MPah8m0iO24+kez32tB
+MzfrSWdlZ9F7QSCKRSJ1muKn1/4USnzMt4yGjmS1gzxvm4epe53Za4zFeguSDeZK
+GnMme6flDIIntcTc8v+p4OsUB+mWGMl7OBF2CBeZZGCrtr7nyenizP94IlFr/aPH
+UtVm7SY3WPgXQdqDQ6ndQo4yJJU5XRRG++Psij2YT91kT5r69Uh6JeK160DND6AG
+eYF1h1i3yO5VsHRdOyesD6pse3Ipbk/kC1tua5hy54XzfGkZbiCx4BwFghhh+GuL
+jqT5aek1lWCKZI3teczy1PkdAVB0i+TZ2dvnde2wQ8ieGACm6MioiJJf8LYPwjnS
+DAeC1tni/YCrnLd843kSxnusjt6d+eNuVHWrP7r1KbU4SfKaH3zD6H/hhM/e32jW
+h3+Evvd2DBY1K/plKsVz+irN2pIhne8KLxH7jtfN0+JjMgHuP5kHs7ConmeK0Hb5
+m5QuHObXDJzkIo0nsFnnIORsEMx5+ZLIY4WtjLuTONrf7Rle3+rkGIDKiwnSdbrO
+H/FsWtVR2WKvyDXRDUvlpojwWijEHYexR/dBiP0psmWUZbyJA3zgT8KGKOqYztdG
+jogbVBxzwNb8gqVlHJ4lbsyFSrcStLLgdnKvV9kI3pMFx70RoE4YQUCU3ev6l0OZ
+YWEmgKIGYc2g70LaTUoP
+=Lg9U
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
new file mode 100644
index 000000000000..533e8ee2eddb
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/files/nslcd-init-r2,v 1.1 2015/06/17 21:39:13 prometheanfire Exp $
+
+command=/usr/sbin/nslcd
+pidfile=/var/run/nslcd/nslcd.pid
+extra_commands="checkconfig"
+cfg="/etc/nslcd.conf"
+
+depend() {
+	need net	
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "$cfg" ] ; then
+		eerror "Please create $cfg"
+		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkpath -q -d /run/nslcd -o nslcd:nslcd
+	checkconfig
+	return $?
+}
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-s6 b/sys-auth/nss-pam-ldapd/files/nslcd-init-s6
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
deleted file mode 100644
index 0044c38e0582..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild,v 1.2 2015/05/15 18:12:17 prometheanfire Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug kerberos +pam sasl test +utils"
-
-COMMON_DEP="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	pam? ( virtual/pam[${MULTILIB_USEDEP}] )
-	utils? ( ${PYTHON_DEPS} )
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-	sys-devel/automake"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
-	epatch_user
-	use utils && python_setup
-}
-
-multilib_src_configure() {
-	local -a myconf
-
-	myconf=(
-		--disable-utils
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	local script
-
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-
-	if use utils; then
-		python_moduleinto nslcd
-		python_foreach_impl && python_domodule utils/*.py
-
-		for script in chsh getent; do
-			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
-		done
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-	systemd_dounit "${FILESDIR}"/nslcd.service
-}
-
-multilib_src_test() {
-	python_foreach_impl emake check
-}
-
-pkg_postinst() {
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
index 103dd3282704..00a96f868a64 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild,v 1.1 2015/06/15 18:27:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild,v 1.2 2015/06/17 21:39:14 prometheanfire Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd
+inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
@@ -80,6 +80,9 @@ multilib_src_install_all() {
 	local script
 
 	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
+	newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
+	s6_install_service nslcd "${FILESDIR}"/run-s6
 
 	insinto /usr/share/nss-pam-ldapd
 	doins "${WORKDIR}/${P}/nslcd.conf"
@@ -115,6 +118,11 @@ pkg_postinst() {
 	elog "You can add it to the default runlevel like so:"
 	elog " # rc-update add nslcd default"
 	elog
+	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
+	elog "to supervise this service."
+	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
+	elog "default runlevel instead of nslcd."
+	elog
 	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
 	elog " is now named /etc/nslcd.conf"
 	echo
diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index e89041ca95ba..69af9267be59 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.55 2015/05/12 05:25:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.57 2015/06/17 21:50:18 prometheanfire Exp $
+
+*cinder-2015.1.0-r1 (17 Jun 2015)
+*cinder-2014.2.3-r1 (17 Jun 2015)
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2014.2.3-r1.ebuild, +cinder-2015.1.0-r1.ebuild,
+  +files/CVE-2015-1851_2014.2.3.patch, +files/CVE-2015-1851_2015.1.0.patch,
+  -cinder-2015.1.0.ebuild:
+  fixing CVE-2015-1851
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> cinder-2015.1.0.ebuild,
+  cinder-2015.1.9999.ebuild, metadata.xml:
+  allow for memcached support
 
   12 May 2015; Matthew Thode <prometheanfire@gentoo.org> cinder-2015.1.0.ebuild,
   cinder-2015.1.9999.ebuild:
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index c1a5966c2c3b..11a18e8637a8 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX CVE-2015-1851_2014.2.3.patch 3724 SHA256 770232ee23c0c6636677c06aa5936448eaf08cdc2a0393d3aa20270ec4bac458 SHA512 4ce7a3d4c85af90bc27c3a5fb623be9face1ff820362b8ebdff4b9e611c0c6cd203706561ba5ee5453803b681234eb94c6106c4345d1a06403dc2cd242a84337 WHIRLPOOL c2389ab144d943071faf28c1b450a90d7372a72a7fed99596e90df6a7c0c98e8f730fa26194c62924726cd914345333e20fea781fa9b0e37714351c3bb5d90c9
+AUX CVE-2015-1851_2015.1.0.patch 4043 SHA256 54f3c8fecf96c7418472e331bed5b526a613a05b7a3f1f3663defc64be5c39e6 SHA512 36276816f0099719d4d46ab773d2f5ba5e894544b913608dbc24e418b4eaaa47b8e81523ad21c4d090898bc39b0196f9c6accdb3f45bfc0df909a0ac5e0e8bf4 WHIRLPOOL c7f0ebaf40553781434d15c2552a999f5aaa5f6469a64d23b9f02d258017b301e3de796ae00817962e99cdc48f9af86d3e583a34de5adfae80369b5fffce72b0
 AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4d0ef190f0f3 SHA512 4dd3db170c1234906fa679ec6684cde16a6bdad4ac90d6a9c00bc0c4afc7ee40ebcebdc7071ad0a34f8eb5bd9c0ab32c6f8fc40624b6c575c4fbb58dad1c91e3 WHIRLPOOL 3f32cbe4f4935a5c5c34de77d638b4cbc10a7a75ba230be5be75af85b12179741bb970603252ec74f098319dffce6eef7e5f0c9bfa34a5b84119fb7642f22d22
 AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f280b08ca8154 SHA512 b6d9d5a949cd43669a28b4e2c54cf795c92f070d10b56130f5a024fcbf9934d9e4f910e78972f427c979e68ee71c55006ecc9008eacf5c8abbe4c81c7b0731bf WHIRLPOOL 5983f6cbf500359d4e03b89d240f7652bd22655c0edcb858052062c4886c4da1d72ded228dd79847f74c279d5592dab2945807f611db1bf847a2c6d2b9f8f619
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
@@ -10,28 +12,27 @@ DIST cinder-2014.2.2.tar.gz 1792693 SHA256 2c779bf9d208163af6c425da9043bbdcb345c
 DIST cinder-2014.2.3.tar.gz 1787308 SHA256 1112da6c28b92fe6bab1ab493b5a99d8695e78272d0c1d20c1793cc9c5a0243a SHA512 2f5b00a87da50e2f5b3acc1a05e1890542834431c406d2450631b41df05fcdd8591b625c58291441a929c731b274093e034365cf599a54f2a79334a3b48143a2 WHIRLPOOL f67b73f96a923369e5d3dbfa09b3a6a858c1f85232505e99e9cdf72ce28b3a87fd07193a4fabda11cfdc1450ab44d7de9cc4aa0ac9af89a96179dd63a0daf4c2
 DIST cinder-2015.1.0.tar.gz 2060773 SHA256 d89d588f35ce66dc7af6e9d63ebb9b3a929670db90ed2ad43d129f32928a4270 SHA512 9dddab335dae0660a59ea80b2579bca16c0cc6e5220f5f8d150f239b026fdbf085c55383d44833da5ea21fb554d9ed6f0700d503322e5467a3c6959cfcb3bd93 WHIRLPOOL 6383b7482587eb1bb298a9b6650f75225a306fe2e398a6377416f182fdc8a1614e4b0a3847bf21cb31454ad3b3c7cb87884c6770b6f4c619fa078db783cc3683
 EBUILD cinder-2014.2.2.ebuild 5650 SHA256 76398d96edce4fed41949883527224e53efcf52c46b143a7c0b934f3f017358f SHA512 999b55fed869f687d44223e20ab22a556ad4bd4988eac9c0277ff199e5fe2941b610389af7d229631eb3d49fc2faf0a8dd16e40fc10a3453357cec2aceada949 WHIRLPOOL 305918fdf146291684be969766b88e297a8e7ffb2106a60d8144a5d0e2abf9a1fc97e52b430d42cb1cd069a6fda2a5ffcceb78989a9737c7c88115d055ac84c1
+EBUILD cinder-2014.2.3-r1.ebuild 5701 SHA256 aa9b749b70aaca442ce548f895a27da763547dbaff669642f7ffd7e70d8fdae6 SHA512 899fc0bf0fdde66993b8f678027f892aaa8498f6a5ed1c15e1aa403c7c72dc129b91ab0540b41ccd301145214abb4d2e2d088732e5236eb45bd48e991d37ea59 WHIRLPOOL bae442dcc2e358ad75a09ff91cd2c074e455381c6f24135df42e593956bedb4989a9cadc4fb9661eb8dde76db185fc610a197e2e7d819cc1c243d312e098cbd6
 EBUILD cinder-2014.2.3.ebuild 5655 SHA256 a5f398acf0125c6502ea53f4eb57ea06c8ce5a8db4ad64dd84132075d360416d SHA512 5581cfdda3c2914eac8104735d7a435bc2cfc7f8a43efd1b638967702215ba912173164bc8d3d616d1d23ef763e7641e02b1891bd96fd70207400695c049f5c8 WHIRLPOOL 8cd89b218ec10ff4f14228b31a690b8eb12279ccf00b8766d3abaeb5c093083c72693110aa8fcc0b8f50b283b564bc97194d87fedd6f9031df9bfc5e73bf803f
 EBUILD cinder-2014.2.9999.ebuild 5665 SHA256 d7bd99ea76758a2891a259dcf44f2286407adfbf1262b83cdd870ae3bcc489a5 SHA512 f70a9e1a82524e895ffce6e6b8b8d39173a6493c92bc4adfa84675aad928e95035cfcb4d8c86b858a920a758ddf604eab59d2072ac976e4fe4a97d829cfd7fa7 WHIRLPOOL 50d839c6a81bb508a352c6b85a8b80aa8d9ba702c25fb2aaf892af4915d172cb97a2d47ed352025d23036bb577e181d82a988b8a739b772aaab0c5be3950c578
-EBUILD cinder-2015.1.0.ebuild 7093 SHA256 f22519fa8ebb27c5823118b6135ed2c907c52c8b6e5ee5c7314d607c90f7b65c SHA512 ae8f9c5821c056aa217d267d871cec5ca4435948aeb0a7f67ec3a47e0eb10ad34b3ae3996c8ab7eb22d0329513684dbe632733bc42ec45682ac5f507dad71ce4 WHIRLPOOL bbb2e247f7ea11df62e117f5041ac0d58f964d7f00cd8c42cea9eedc0e5e3cdf4870d94bff3ef31373e7540859bc33e7ed55f1a634277cadf4b7fc4dd0740124
-EBUILD cinder-2015.1.9999.ebuild 7103 SHA256 f4ad6c527514f4f3fa19a3556cdaaaf0ca231de6af6d91ce7ae9a0d2e2d8e2ab SHA512 fb409199196950f58723f22b4f2d6a3aa4818b51d8a573a236400545e52ffa268049fb011a503ad6ed78eb8b4118ceef153ed999315106b329df183bbef11e08 WHIRLPOOL aa2d2cc77305da7f94addb2b6d980c579b37f74c3e16906af69e3bf53577e602c3985694fe7e469c0e043c7c1c8148739c551c46b3f3334482fea19ddb5104ef
-MISC ChangeLog 9939 SHA256 c25bc314d1271a17367e3767a1191af9f4a223ad37207cee751f2c977c8afbe3 SHA512 13e16d9da9a4dabe1a73b16864d673273302091ae5b0bbebb098af80b90dc05a300628a55a738fd017bc408fc78876273f5ee5edf4c49d39c3121b2f0ea4f07e WHIRLPOOL 55ee78fad2358dea28d9a245b6611e38487479ee10d300ef6ef9ed214c56e7d696a7749a32fd862f6e8624446d09e929067a6aea55af6e7dbcc2cf9d1656e337
-MISC metadata.xml 967 SHA256 55302912ffdd3dcc0180ef6fe27a8952a52fbcee7cc1243c54696c21628acc5f SHA512 8b9252ecb4c97099e220a7d42bd829917861730604bc6d8c99c153ef8e41b9a8846415c47d0241bf5fa1397e5ace184641ba038ac6c243abf2b7a55cb78f764e WHIRLPOOL 6559f0803697f671fc963fbab18307f7b30ad3843abc14f4672b707b2992b7246465648c2b9bb8ad2bbdddc3b343ded44ccd33057cc2e5f0985bc1363f2e4bc9
+EBUILD cinder-2015.1.0-r1.ebuild 7185 SHA256 b886a0b22d76911ea511ce40749403d42a473d4216f69e40a0e32d5e3a57318c SHA512 5a44d14df81bff5bd6f7483dcb82c9b564924eecd9139ea1f15c07bb38136217b6b831eafde0cc0ac90162a577e607ebf4d389bdeb76a452b98dc427a3ec1c94 WHIRLPOOL 4d47e701280f674f9220f14d5e87d7c4394ff8bb959d9984ff34edcf9431ab7ec73680475fc7ae5b44806ed1309da99a68d53d64fbf6b2d7a71581da419c9dfc
+EBUILD cinder-2015.1.9999.ebuild 7149 SHA256 b7798b6d71f1621d26616ee800d13f3c365d0bdb5c6284c45a1d15c3f53d0a2c SHA512 9a0477d6d6e47bb55f66da809a52da127faf3188e3e1dc0253f622a55ff46ea0627a4c341285a641aa200cbf1ecc34807181ce01bca71cbd8b475ceb0e6d78df WHIRLPOOL bb39de9f23e1239ea71f3ba4a4e124d93b19de07aba63cf0c16417acb59f96f5b78ac75908ace088226c9b684856c42fe07a1384bed528dcd2964d140099e8ba
+MISC ChangeLog 10405 SHA256 3105468773308cd40ecb8b5a9cf001e35ecaf1be2a8025c2f289a6ade213850e SHA512 e2360b6a6a9b2e9b563fbeaf5df8eacba76066f71ec5a9de526c6a6c7bfe86239211061fc61b5e3402efe9f05836ce330a00dd4920bd222b11d45b342a195d89 WHIRLPOOL be52262b065a8d30fb0bea2c2f512166b3351d1c3e6ea12595ceed7ee395028e9bf3586094cd01171063c8e38c3f826643c97b04a7b21523778aec2fd9af954d
+MISC metadata.xml 1031 SHA256 616141da0a68b35bdf1cb238a3ff954b5acfc05a32b5082d9cd5ee7cef31a239 SHA512 3daccea177c31c85a854c1700e4d39e79b967c4833c9156f0db7d8a133a44c380aa98b842e05830264d6ffc9fbbd1817aa88a808b2835b80f5064ff6afcc2783 WHIRLPOOL 18b4d280c105cc21e084e01c8e3b80ea48ac7c6cebad2f5fdc5716723b346362416b31a5872c486d11ce9d313446db0994c857d5fe7dd5d7cc9d391fa82ea4a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVf7/3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqYkP/i12PmyL1+i3nCZWO3QXhsyK
-QeRrDnB4jMxE0LeKsLweACLqyHOrv+55rAYlJ2qcPQz04Ts+x4TM0Tgwz/CUWtzL
-5SaYYqS4M+gPQmhuWmL+01CuXo4a33JOoimxG2eqQT9pmQMQAxQcP/REAvvkKRMv
-9fOWQGeBQORQ3/OrAMVMqfE238GogcySovG5B/NP0r+nh+FTAeUCpHWigqtHu6gD
-VvHkFKTKIVUd5LNyxJjfOGXgHJsLUzILiqRReCJ+M3/8cC3OYEVizN6GuCrTN7Ki
-xWnGmL0WZL4+6EuoUirpTXHxtVoqvlxYu46GvVOG8eVilkrHYUaP/AzWe1TCrmox
-eCWBMXk/rL3DtHatYP2JVJd4xx0MO0aZOcuPpis5yLfcVI+aU2n+GfXiz8eMLJAZ
-FAQO5eGNqQC4GFUXDeMf0FAFbCeo5cWDpflzRWueH1GwY13gmWF+rKySVSh4hOBH
-9kOvr8hpuCABp46SE2GkBlILEfXU+cvm5yXjL4/8Mwin1+kXLWKKpZCZqIQkR4Rh
-L0VuNjZMBwQxNfe0KN4EQniKKkTK3ilL6JmSy1tXKUfVY4t6sv+8G04XENidBPeZ
-1Mm+Nk2mQukReLBhpYCoe+C/pxDWo5eaamK6mH8vMFwLzcaMgsIcmEgaHjKxT88d
-P3o9JRluQZ0VwiMejJM0
-=wmtX
+iQIcBAEBCAAGBQJVgevXAAoJEGSje+quGaToRYMP/iz0PejCVj8AVGexzCgfdIia
+YEJoZjAj4xRE5i9jyZusA1VlmpehiN1DL9MGU1d/AiL2f5a9qMdM8sPHciWCK8Ds
+Cr8vDPVDNgfqx8cPKTrXBsOcuILn8098SmE8wmuGNzHibvSsSETCqvYRJ35F1JZA
+IkVx/CDT2OWSRNvW40R5NY2sncF/3mAIA69TZtKAhDa0IUZ7a+U6Rff21oPfcYrW
+7eCtNfkSCInkWDh+2WkqY2y3BiLCZKIRhVALziCBkDwhgOYYVanHAvUGNOjL8P35
+vFWOrl3j5NsOJew3hrC714Kj11M9H5Q1uUsw0qPYrOUMTT7yJu7l82axSLL4bhJH
+E4McICE8XaMtCV4o50soAqyCqQV3E/KmHlrzDmOCRsH//C9iaEkB4i2wRLTKUqoh
+aYRduB2spicT0sksqt0Z6xI+4FbI8LI5vfK1lNQm+DdvWmR3YDF6nwp7CLl4geB8
+APLZxmXKeEA44l8DeQMnqlw0wJDgDT8EkfxPtwfY6P8aHDREJRomCJrM0oFVrvef
+rNTEpMpK57ESyXLyiTp2Nsj0FQpz2EPdMkon1MNgdYsMgSTig3lpaS/TSqPjgAid
+EcfRX/0mNVfxOFYOAilBYb4owr96qbqB2JmvcopjkSqZpTsmErztYwnjtkKKnSXO
+ekPfbfqwo/nwrmOw4VrK
+=F9KW
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2014.2.3-r1.ebuild b/sys-cluster/cinder/cinder-2014.2.3-r1.ebuild
new file mode 100644
index 000000000000..375aed3e35c6
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2014.2.3-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.3-r1.ebuild,v 1.1 2015/06/17 21:50:18 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? (
+			${RDEPEND}
+			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+			postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+	iscsi? (
+		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
+		sys-block/open-iscsi )
+	lvm? ( sys-fs/lvm2 )
+	sys-fs/sysfsutils"
+
+PATCHES=( "${FILESDIR}"/CVE-2015-1851_2014.2.3.patch )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="ISCSI_TCP"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+		done
+	fi
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+#python_compile_all() { leave for next attempt
+#	use doc && emake -C doc html
+#}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
+	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
+	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
+	newins "${S}/etc/cinder/policy.json" "policy.json"
+	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
+	insinto /etc/cinder/rootwrap.d
+	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
diff --git a/sys-cluster/cinder/cinder-2015.1.0.ebuild b/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
similarity index 96%
rename from sys-cluster/cinder/cinder-2015.1.0.ebuild
rename to sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
index eaeb2a769c97..b37563471a4b 100644
--- a/sys-cluster/cinder/cinder-2015.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.0.ebuild,v 1.4 2015/05/12 05:25:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild,v 1.1 2015/06/17 21:50:18 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
@@ -127,9 +127,10 @@ RDEPEND="
 		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
 		sys-block/open-iscsi )
 	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
 	sys-fs/sysfsutils"
 
-PATCHES=( )
+PATCHES=( "${FILESDIR}"/CVE-2015-1851_2015.1.0.patch )
 
 pkg_setup() {
 	linux-info_pkg_setup
diff --git a/sys-cluster/cinder/cinder-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
index 117568e48502..58a281448139 100644
--- a/sys-cluster/cinder/cinder-2015.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.4 2015/05/12 05:25:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.5 2015/06/17 21:16:47 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
+IUSE="+api +scheduler +volume iscsi lvm +memcached mysql postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
@@ -128,6 +128,7 @@ RDEPEND="
 		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
 		sys-block/open-iscsi )
 	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
 	sys-fs/sysfsutils"
 
 PATCHES=( )
diff --git a/sys-cluster/cinder/files/CVE-2015-1851_2014.2.3.patch b/sys-cluster/cinder/files/CVE-2015-1851_2014.2.3.patch
new file mode 100644
index 000000000000..5335e5c02ad5
--- /dev/null
+++ b/sys-cluster/cinder/files/CVE-2015-1851_2014.2.3.patch
@@ -0,0 +1,85 @@
+From d31c937c566005dedf41a60c6b5bd5e7b26f221b Mon Sep 17 00:00:00 2001
+From: Eric Harney <eharney@redhat.com>
+Date: Tue, 31 Mar 2015 19:48:17 -0400
+Subject: [PATCH] Disallow backing files when uploading volumes to image
+
+Volumes with a header referencing a backing file can leak
+file data into the destination image when uploading a
+volume to an image.
+
+Halt the upload process if the volume data references a
+backing file to prevent this.
+
+Closes-Bug: #1415087
+Change-Id: Iab9718794e7f7e8444015712cfa08c46848ebf78
+(cherry picked from commit 9634b76ba5886d6c2f2128d550cb005dabf48213)
+Conflicts:
+    cinder/tests/test_image_utils.py (backport to old tests)
+---
+ cinder/image/image_utils.py      | 14 ++++++++++++++
+ cinder/tests/test_image_utils.py | 13 +++++++++++++
+ 2 files changed, 27 insertions(+)
+
+diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
+index 160dfe7..cac0072 100644
+--- a/cinder/image/image_utils.py
++++ b/cinder/image/image_utils.py
+@@ -312,6 +312,20 @@ def upload_volume(context, image_service, image_meta, volume_path,
+     with fileutils.remove_path_on_error(tmp):
+         LOG.debug("%s was %s, converting to %s" %
+                   (image_id, volume_format, image_meta['disk_format']))
++
++        data = qemu_img_info(volume_path)
++        backing_file = data.backing_file
++        fmt = data.file_format
++        if backing_file is not None:
++            # Disallow backing files as a security measure.
++            # This prevents a user from writing an image header into a raw
++            # volume with a backing file pointing to data they wish to
++            # access.
++            raise exception.ImageUnacceptable(
++                image_id=image_id,
++                reason=_("fmt=%(fmt)s backed by:%(backing_file)s")
++                % {'fmt': fmt, 'backing_file': backing_file})
++
+         convert_image(volume_path, tmp, image_meta['disk_format'],
+                       bps_limit=CONF.volume_copy_bps_limit)
+ 
+diff --git a/cinder/tests/test_image_utils.py b/cinder/tests/test_image_utils.py
+index 86168c0..2cf571a 100644
+--- a/cinder/tests/test_image_utils.py
++++ b/cinder/tests/test_image_utils.py
+@@ -462,6 +462,10 @@ def test_upload_volume(self, mock_stat, bps_limit=0):
+         volume_utils.setup_blkio_cgroup(mox.IgnoreArg(), mox.IgnoreArg(),
+                                         bps_limit).AndReturn(prefix)
+ 
++        utils.execute(
++            'env', 'LC_ALL=C', 'qemu-img', 'info',
++            mox.IgnoreArg(), run_as_root=True).AndReturn(
++                (TEST_RET, 'ignored'))
+         utils.execute(*cmd, run_as_root=True)
+         utils.execute(
+             'env', 'LC_ALL=C', 'qemu-img', 'info',
+@@ -497,6 +501,11 @@ def test_upload_volume_with_bps_limit(self, mock_stat):
+ 
+         volume_utils.setup_blkio_cgroup(mox.IgnoreArg(), mox.IgnoreArg(),
+                                         bps_limit).AndReturn(prefix)
++
++        utils.execute(
++            'env', 'LC_ALL=C', 'qemu-img', 'info',
++            mox.IgnoreArg(), run_as_root=True).AndReturn(
++                (TEST_RET, 'ignored'))
+         utils.execute(*cmd, run_as_root=True)
+         utils.execute(
+             'env', 'LC_ALL=C', 'qemu-img', 'info',
+@@ -534,6 +543,10 @@ def test_upload_volume_on_error(self, mock_stat):
+         m.StubOutWithMock(utils, 'execute')
+         m.StubOutWithMock(volume_utils, 'check_for_odirect_support')
+ 
++        utils.execute(
++            'env', 'LC_ALL=C', 'qemu-img', 'info',
++            mox.IgnoreArg(), run_as_root=True).AndReturn(
++                (TEST_RET, 'ignored'))
+         utils.execute('qemu-img', 'convert', '-O', 'qcow2',
+                       mox.IgnoreArg(), mox.IgnoreArg(), run_as_root=True)
+         utils.execute(
diff --git a/sys-cluster/cinder/files/CVE-2015-1851_2015.1.0.patch b/sys-cluster/cinder/files/CVE-2015-1851_2015.1.0.patch
new file mode 100644
index 000000000000..2e1d31970fc1
--- /dev/null
+++ b/sys-cluster/cinder/files/CVE-2015-1851_2015.1.0.patch
@@ -0,0 +1,85 @@
+From 9634b76ba5886d6c2f2128d550cb005dabf48213 Mon Sep 17 00:00:00 2001
+From: Eric Harney <eharney@redhat.com>
+Date: Tue, 31 Mar 2015 19:48:17 -0400
+Subject: [PATCH] Disallow backing files when uploading volumes to image
+
+Volumes with a header referencing a backing file can leak
+file data into the destination image when uploading a
+volume to an image.
+
+Halt the upload process if the volume data references a
+backing file to prevent this.
+
+Closes-Bug: #1415087
+Change-Id: Iab9718794e7f7e8444015712cfa08c46848ebf78
+(cherry picked from commit b1143ee45323e63b965a3710f9063e65b252c978)
+---
+ cinder/image/image_utils.py      | 14 ++++++++++++++
+ cinder/tests/test_image_utils.py |  8 ++++++--
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py
+index 6e5e2fb..6ae0f81 100644
+--- a/cinder/image/image_utils.py
++++ b/cinder/image/image_utils.py
+@@ -344,6 +344,20 @@ def upload_volume(context, image_service, image_meta, volume_path,
+     with temporary_file() as tmp:
+         LOG.debug("%s was %s, converting to %s",
+                   image_id, volume_format, image_meta['disk_format'])
++
++        data = qemu_img_info(volume_path, run_as_root=run_as_root)
++        backing_file = data.backing_file
++        fmt = data.file_format
++        if backing_file is not None:
++            # Disallow backing files as a security measure.
++            # This prevents a user from writing an image header into a raw
++            # volume with a backing file pointing to data they wish to
++            # access.
++            raise exception.ImageUnacceptable(
++                image_id=image_id,
++                reason=_("fmt=%(fmt)s backed by:%(backing_file)s")
++                % {'fmt': fmt, 'backing_file': backing_file})
++
+         convert_image(volume_path, tmp, image_meta['disk_format'],
+                       run_as_root=run_as_root)
+ 
+diff --git a/cinder/tests/test_image_utils.py b/cinder/tests/test_image_utils.py
+index ab41243..3f8e763 100644
+--- a/cinder/tests/test_image_utils.py
++++ b/cinder/tests/test_image_utils.py
+@@ -381,6 +381,7 @@ def test_diff_format(self, mock_os, mock_temp, mock_convert, mock_info,
+         mock_os.name = 'posix'
+         data = mock_info.return_value
+         data.file_format = mock.sentinel.disk_format
++        data.backing_file = None
+         temp_file = mock_temp.return_value.__enter__.return_value
+ 
+         output = image_utils.upload_volume(ctxt, image_service, image_meta,
+@@ -391,7 +392,8 @@ def test_diff_format(self, mock_os, mock_temp, mock_convert, mock_info,
+                                              temp_file,
+                                              mock.sentinel.disk_format,
+                                              run_as_root=True)
+-        mock_info.assert_called_once_with(temp_file, run_as_root=True)
++        mock_info.assert_called_with(temp_file, run_as_root=True)
++        self.assertEqual(mock_info.call_count, 2)
+         mock_open.assert_called_once_with(temp_file, 'rb')
+         image_service.update.assert_called_once_with(
+             ctxt, image_meta['id'], {},
+@@ -470,6 +472,7 @@ def test_convert_error(self, mock_os, mock_temp, mock_convert, mock_info,
+         mock_os.name = 'posix'
+         data = mock_info.return_value
+         data.file_format = mock.sentinel.other_disk_format
++        data.backing_file = None
+         temp_file = mock_temp.return_value.__enter__.return_value
+ 
+         self.assertRaises(exception.ImageUnacceptable,
+@@ -479,7 +482,8 @@ def test_convert_error(self, mock_os, mock_temp, mock_convert, mock_info,
+                                              temp_file,
+                                              mock.sentinel.disk_format,
+                                              run_as_root=True)
+-        mock_info.assert_called_once_with(temp_file, run_as_root=True)
++        mock_info.assert_called_with(temp_file, run_as_root=True)
++        self.assertEqual(mock_info.call_count, 2)
+         self.assertFalse(image_service.update.called)
+ 
+ 
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml
index 22f7fa479dfa..2ca4745405e9 100644
--- a/sys-cluster/cinder/metadata.xml
+++ b/sys-cluster/cinder/metadata.xml
@@ -11,10 +11,11 @@
   </longdescription>
   <use>
     <flag name="api">Installs the initscripts for the cinder api service</flag>
-    <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
-    <flag name="volume">Installs the initscripts for the cinder volume service</flag>
     <flag name="iscsi">Allow using an iSCSI remote storage server as pool for disk image storage</flag>
     <flag name="lvm">Allow using the Logical Volume Manager (<pkg>sys-apps/lvm2</pkg>) as pool for disk image storage</flag>
+    <flag name="memcached">Installs the memcached server</flag>
+    <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
+    <flag name="volume">Installs the initscripts for the cinder volume service</flag>
   </use>
   <upstream>
     <remote-id type="launchpad">cinder</remote-id>
diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index a631760d4843..d1f63ef46ced 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.99 2015/05/27 05:48:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.100 2015/06/17 21:10:37 prometheanfire Exp $
+
+*nova-2015.1.0-r3 (17 Jun 2015)
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +nova-2015.1.0-r3.ebuild, -nova-2015.1.0-r2.ebuild, metadata.xml,
+  nova-2015.1.9999.ebuild:
+  adding memcached as a use flag'd dep
 
   27 May 2015; Matthew Thode <prometheanfire@gentoo.org>
   nova-2015.1.0-r2.ebuild, nova-2015.1.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index a88aeeabcf3d..23131e65fefd 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
@@ -9,26 +9,24 @@ DIST nova-2014.2.3.tar.gz 4436742 SHA256 5fc1f02c887a4ca9b1968dba71864cdb5e81bfb
 DIST nova-2015.1.0.tar.gz 4541653 SHA256 7279d18cee6f13e19443f7cdc6a296566674d66049ee5c9af6d1c973115f16d7 SHA512 a315f7bbb73de4f26645ffed42663af377ab5cd55db82eedbcc1411208e276bc5dc68c2ccef07a35943f6643f3862ca44a9b51f8e259322bb176c74485d98cc5 WHIRLPOOL d885527d6479cd1c760b6291732c5a7e01b472f536d4b2a55cd4b829f32e4d4b213d946870b4e52c47a86973c7d97fd89ebaed752256e5286c91222973c68824
 EBUILD nova-2014.2.3.ebuild 6067 SHA256 b8ea6d84e8bfbf5c5658b10938d4da15b8dfbb9044b4b4b475ebeb3a89a75793 SHA512 38188b2c1e0eed1fe23002ccfaa81f6782b74276b587b21765f83b359ae67f8757e6222b0bc2c1d819f238c2c943c1ebf5fdab5da1b0bb1de08934b04ba16550 WHIRLPOOL 2db61b4f347a886465b29c02901d9ec3ea7f34e0abb49be18e754269032a7aa932221f918d905a1add52d28672d0e28629dd7d55213fec71ba45b318b4edd5e3
 EBUILD nova-2014.2.9999.ebuild 6075 SHA256 eefe8729db7296ca360cddabfde23258be0a908921d94ab25ea585e199ddf9b1 SHA512 6ebfc8afdcfb33aaccf0bc137360c563572c743d3fb937e18805eba5d13f9a6c027311917327a519ee71492070875528d58fff3f1747b35e1f0031f973decf68 WHIRLPOOL 989b23c9d9edd618c6338731b5763f2a258de2241830e934bfbc26f38f105b61206934ee78188eb760fa47f63f1f65b9df8bf7e2279eb3596d8a99089f74f322
-EBUILD nova-2015.1.0-r2.ebuild 7481 SHA256 cb7f4108f26e4e26f16abefb5dbed4c67017fa9d79b91b7945586fd495a95f3e SHA512 4bc40375f2fc2df0a6fbf7746aea715621ac14a0398078fec1e03e92d425cc5382d57d1024b2f9e701359231a49ed9c351f136f32a9698452432ab5afe674bee WHIRLPOOL 60fe03792d4ebde8991399e3580d8b98c10cfdf58e0c9c44e88955872945f3f7cad3d233061e18c40aebc050ac43c7a9deb702feca1ec504f3606a689edc5d1f
-EBUILD nova-2015.1.9999.ebuild 7492 SHA256 b68f0564b9890e92529ebb13ad5001b4cc7265190931047b64e67a1706e0742b SHA512 7068f0046551c20428cac431cc4a7fc0c46f347564d7ef8a8242684c3454b1fccc84f5246213289e16a0e082cffdd16dccd94ed8e161c5ceaae55d754dc01ab0 WHIRLPOOL f0b5fb316cd54432724a337ea9251838130331d2f30a015c082b16ad85dd6ea6883f3da40347d2330b21fcdcc578d3fb31bd41b96da2773625e1a89ee43dd724
-MISC ChangeLog 21096 SHA256 68f5acce0ad8733fd945f1b34ce5dea9a1b8d972180076b513739a85b535242a SHA512 0d49b71d26c5991c9472fb4bdbcfe50cff29e3eb3422c21b8a9d88a203fb048dcbfb0bcc15b63679e3c3dfb9283a9244002e0eb6142f080af34bee335937a21d WHIRLPOOL 3124b457a72206b83f4e7c9f4f0e18773a1ac09ae9ca1cbdc67994f277ad7a62afc71cb96ac0ae66c4dcf5c8636a024aaf29f5aaa231ad00c1a2236fb094d25d
-MISC metadata.xml 1196 SHA256 a13cfdfc22d1719ce1c268ae8cf5e52832764764fae294a6608be5e71c9fdb9a SHA512 d806cb4710b4ac62ce6b3a5f169d669c382ce463436478da21ff829553036380f0fc46d68b96e965eb6ba192c670d7bd2b224a3f17969f0d7ac8b8bc47688ece WHIRLPOOL f7b67aa16bda5d59df2b59e84927b0f8c001f7350bd1b35a06fc09321df25c59b2e630575ddd870d8194a2ff82f6ecfe273a37fb38718a1dc9a45ac484422290
+EBUILD nova-2015.1.0-r3.ebuild 7538 SHA256 d9594715e7a3498860d50f762beb91879cbe65148a2771e1eaa90cf012ea96ab SHA512 88f93a0cb18884d45ccb66f543a8bf5d04f22ae6cc84a600383ba24cfccb0a22a6fd57aaab67154d7e5de468d80de4e71300326a2e9be9491fdc6a42ead2159d WHIRLPOOL 716ab7d49333534f02988b9720b26c591f8bd0f892918d7e10eb4fce376bfb64b392fb486caa5149aae7829473d38c586ad3e628e3c13db43689fae1ecc010e8
+EBUILD nova-2015.1.9999.ebuild 7549 SHA256 57b7e2c832ec498d25aa0c3ed7599151332cb072598b1f4bbe6cf282e524e758 SHA512 d4e16941ee91513ad8f16ab0059a66fee00e8502862df293c1ea7bde7aae7e579f898ab55b3a051c3f19fa7994a704f5329d2f5b26fce6feba54dde031fee329 WHIRLPOOL 8e8fe4c2133f544a8fa0001ba18a0abbd281295ebad5c5ae8ac0f4b2370a38f04c6bfead09343bbca67c6a9e9329c90f71085034aa94dda12a48eed4179d0a2f
+MISC ChangeLog 21322 SHA256 29c5739430f4706ae87023282364830ca5f693585eb11793060a3d5cdf4626c1 SHA512 c052f35aa7d054e148eac4591dfab2aa540deb61c1dc126b0e60e43d06240f4a49fa2576eada5a2602bb13eec6ee40d8ab5e6f2b61aaeae7131c284595394ff6 WHIRLPOOL f40a21427699442e014b5ccb7b892668f9737ee43b127f0437366fb1ec8829a72a7bd5442d4553f49c8705ba140f28047f25f67eb3329da7f01a8c825c2a5cb9
+MISC metadata.xml 1260 SHA256 b4e820c6064dc85b039f587e24ad6441fcf4a8df51bd685a04ef103bd1acac70 SHA512 6c30aa50013f98f183ab0ef0b72bde4f5eb5c3bffa22495bd97526ccdd30430cb43b3507722a42b7b7ab168d0ca4b7a61d7ce72196a39075162958c54f8b9230 WHIRLPOOL 4005218d2273faec31d520404d636887ae8248686398b8676efe721232e4d923d5b58ed4978a27059adb14d73d3985e3e8d04a12a4f7a29444f18e8aa15b862b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVf8ANXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixl4QAJoK1oU1fJs1AYOYw5jR53hH
-O8IZ94ABZqxLn3JiY7AtbAaoBFxtrdYu5owgzIk02PQxhyK4oef6f6aBBhObLyNq
-SMBzOcUHFZtJ1M5+UmHePgKgkfQy8uQWeysq2Jc6GxxKZDJQcttMHuQi3OSrqNSs
-uCw6qdZbLIEzbbwVBT2INcQHK33pCOjU/lA/23tetwOT7xJ6Y6j0OxxDm335cGoM
-hW4g95vzX/shjqgO//3Nn1XdxkEtFCd3wfXX26pkoxZ1R2HQp/QazfM3UlT8vTPj
-0AmyvrMGH217hGNNg08IyCN6+/5haI8cRKlqlK86phMqfiKmamjRRJ1dc/Xc0YMO
-3aI/WA/6nVETZrh8TF0Iyoj1hhzEchNCfhAQJOfnNU9X8rMSQF03BjlvbAAwHfjS
-VM3HGl5M+DCPoOy279fIb7pojcmrLvTpKHeitWFsCeQErL1c1QefFbcf0TP09FWh
-8KOHLhJmG+kwDmzSPIT4XX4ZCPcWprEJPUou0ezz07q+g0a2nHkdtQnLeEcfWlql
-8N3pzHW6nRRSV+Mb8jOYzctv4Qmgw8jiShsq4WnBEoKQe7hY9EyQw5PrOsB7rlTq
-1mzlQTJEKqyCU0e1e4ytEefKmlEo74sRWg7tfmBWqrq74UZb5OdJoqlcSID0dbJ/
-iEAgGOt6jyAWCYShaJDH
-=cVTv
+iQIcBAEBCAAGBQJVgeKKAAoJEGSje+quGaToDs0QALgGjetOpWEZxkCXkyzoqYq6
+jppNtDnA6xchS8oTYd3kTcGcKIGe8U//ayweEWNTW1BEtEiOqRU/h0Uks61p9dXO
+2n1SzC6eMbDSKnqL243COHXBPiBRdTcnKFjcx/119RI90dNAbUWYCkBOW47WCLdv
+sR341OG+9e3Srv/dpJPlEqi4wX9GnH+5YEJvh6GpkbrV7PZiENATh4+JxLcQphem
+2yMSr/Dncanw+d4Q1kdJUnVCweRDHEBqOL/3ZveEZsWIVLkHs2D89CaOq8vQU9qg
+2UsVzFlXGmDYzjGBMOEvZGAg0PC5rRZs0+TjFW9xNo3FGj2rLRYYrEr3xt0F3dCs
+V/Kil0pppYTe3FLo2xH4t2Vbjwj1Ww88rNBsU1I8KzyDDeWSOs11iUuRoEpi2GZk
+VyrmKiDi9frRtEmBqkfrJJlm5N1i4Y+ZDr+G5DbvOq3bbvShjpVbCwNlG6JWr81j
+Dq2kXBxkdemov83UkOikdqMkN1/xqpE1ZKc6uvWWRM0nC1FwonUV2cRPH3DgzL0q
+AjQvcKv3iJpk/hr8zegvUfkzCpmSM5OxskxMDHJ6vwL98ssMlSih4zJDvILV8eNg
+J5gPrFuRy5IPh0KN8LJqmuksIplfZDeK1kFJ8fnSTY9AaREJkoVgk8AoSDg/YRbF
+0jFUoAf2jeR9AEdDD4gO
+=U8Mb
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index 27c5b074629f..d8ca67bd04d6 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="compute-only">only install stuff needed for a compute host</flag>
     <flag name="iscsi">Installs iscsi helper udev scripts</flag>
     <flag name="kvm">qemu-kvm hypervisor support</flag>
+    <flag name="memcached">Installs the memcached server</flag>
     <flag name="network">Installs the initscripts for the nova network service</flag>
     <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
     <flag name="openvswitch">Installs openvswitch for the neutron openvswitch support</flag>
diff --git a/sys-cluster/nova/nova-2015.1.0-r2.ebuild b/sys-cluster/nova/nova-2015.1.0-r3.ebuild
similarity index 96%
rename from sys-cluster/nova/nova-2015.1.0-r2.ebuild
rename to sys-cluster/nova/nova-2015.1.0-r3.ebuild
index a2a51ab60d55..4a8207ae233e 100644
--- a/sys-cluster/nova/nova-2015.1.0-r2.ebuild
+++ b/sys-cluster/nova/nova-2015.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r2.ebuild,v 1.2 2015/05/27 05:48:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0-r3.ebuild,v 1.1 2015/06/17 21:10:37 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,9 +14,9 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
+IUSE="+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( compute !rabbitmq !mysql !postgres !sqlite )
+						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
 						compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -109,6 +109,7 @@ RDEPEND="
 	sys-apps/iproute2
 	openvswitch? ( net-misc/openvswitch )
 	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached )
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 2daed4ebc1ae..7c78430ebaf1 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.12 2015/05/27 05:48:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.13 2015/06/17 21:10:37 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,9 +15,9 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+compute compute-only +kvm +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
+IUSE="+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( compute !rabbitmq !mysql !postgres !sqlite )
+						compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
 						compute? ( ^^ ( kvm xen ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -110,6 +110,7 @@ RDEPEND="
 	sys-apps/iproute2
 	openvswitch? ( net-misc/openvswitch )
 	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? ( net-misc/memcached )
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools
 	net-misc/bridge-utils
diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 86765ca23e37..8961822e310a 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.45 2015/05/02 20:46:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.46 2015/06/17 21:12:59 prometheanfire Exp $
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
+  swift-2.2.2-r1.ebuild, swift-2.3.0.ebuild:
+  standardize on memcached as the use flag (instead of memcache)
 
   02 May 2015; Matthew Thode <prometheanfire@gentoo.org> swift-2.3.0.ebuild:
   removing unneeded (broken) patch
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 3657b2129b32..90907a025a40 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cve-2015-1856-master-kilo.patch 11096 SHA256 c57f05cae2a7543a757222ea3bd6543789c4d6abd73e85b6ccffa0a5ef8b06a7 SHA512 65b4d016f11fe97efa95749e3033aefbc06750cbc1e17ece245bbd1bb6bf20c9cc65d14fa10e763188cd49648413e8cd88b8684b0502ac8596fd25d214f89afe WHIRLPOOL 8ba9422600bd6edd220c949c15e651371b416f0600953429b641d7575902176ea021c6d628d549ddbdc97945c24919b77f9118a350af9a28a599bb86b130300d
 AUX swift-account.initd 992 SHA256 a920abae629964eace9edb9e15e754bbb6765dcd6845a7f2819ed07831ea7c8b SHA512 f2ff3a7054a240d58c8b6584539365908fabcee8fdbe067dba2fb6562306a96f94450ed56a93c16e985813e266e7e0afa34e921b8d9bed754bbd85c5dab85670 WHIRLPOOL 757ccd49fcf9afbfaa5f3f7df3ee45cd30104b1c5f190a10f452bdbcdc5c1dfdc6cd9eae85d2c60c80a062f56af2cad7bc7ce80dd552ac0e812a1bc2f0e72a8e
@@ -8,26 +8,24 @@ AUX swift-object.initd 986 SHA256 e53fd0e15faad19da10258d9857f24ceb0c589d06bff57
 AUX swift-proxy.initd 1502 SHA256 65e8d40f51324e7c61121ea0d38b607084d9d1bec0859cdefb8b09a86ba993cb SHA512 17e9875b3e7f5dfaa1681279cb59708dfa12fdd866a5fb9c3968dd081a4c95d0bc51ab652916073b0b42b2ce9cfbf997093ce9c0e5d4c66b43242ef4f6dd7387 WHIRLPOOL d800071bd7e44e97ef97f4beff5f4aa8c932a01c8ddd067b3f5b1d7256554cb1d9d8eac80b738198cb3870fb88b7cf11ef41e8b842b8b898e510a11b376c6570
 DIST swift-2.2.2.tar.gz 1038850 SHA256 d97ff8e3c1381611ca2f9cd3eb13000e3339166e06d67ec079ce9ec958d1a088 SHA512 5abe34679305df18dabf49e6e9a6ddf7b890718a4586b1a33cadf0eb47412861a4af53d6124d2a238e463603d11b134a5afa2867939cb3cea49774ae9601d8e6 WHIRLPOOL 57f7364c0e2fa9094837b7127d4380df52a263150be05d84142e1d1256911d0466e7098a7f2a0380b087fb5da313d5a65a973f42b1e39bc102be46f21000c8ef
 DIST swift-2.3.0.tar.gz 1346492 SHA256 7225061f92597e7eaf6196c9336c5e590c7626b7e84126c51e8ca5bf5b7bdae1 SHA512 cf8e1e640f1f679516ce1af772c93f860d7d1f1b6712fa9b89dda1688a4b02cd3fdadc443f4911be5927544f0cffe365ff4174ef6e44d118cb56c7b05cd630b9 WHIRLPOOL aade05a7b8f23e680aa932150e8edbc2e9b6bb83528ffa62becdf4d29c8597b20e873017c3c6a95e66448c13c60531abee6ed0bd9b524b6319642c0436ad5e4c
-EBUILD swift-2.2.2-r1.ebuild 4091 SHA256 e636fc3daf38751da971e52573888bbf9a13713effff418ef71945dc0d542f04 SHA512 018521764c18349ba0e9d32a0418103c861bb1576ea57c080ae7656cb6839bf10c9d40bbedbf7b6a99d25dfef194aa16fdf82e38297a59a0ffa9a5417a81b333 WHIRLPOOL 076d22eb72af072f882f018e9c42e95e84b898c2a43b19c743413dbb36eb449deebf46be4966bdd43c1370a4cfdf10852edcab69874bcd243c85aad83a077a3d
-EBUILD swift-2.3.0.ebuild 4136 SHA256 79a0d9ce0616d3fb761de99c0f567e9eb04987a97376e5a3993e0c6978782044 SHA512 9c8ffcc0a5df0850b5bee55697889cdb32d5b11522f1ee9ab19d19af16e2a61bb4ec7b11441b2c0b8f2b1123ceb5e1a27f3a695ce7f14244ae8a723dfd269e7c WHIRLPOOL a0b2eb1f3fe848202e4aa93e3661045e4ce765475b5fa116b9bd1bc8e9a703edde857231612a2fd718c15e096b01a523a20d509224b7f2123356a9ef68f896ff
-MISC ChangeLog 7975 SHA256 80720ded2cb164d6826efd7384e92d2892e26c8cadadba2364ff6c1a183667ac SHA512 c08f7c4d3abd4b0948a118f544d13eb2ab47453e55579907d64cbe496ed658d6f4a29e073d0d3fecf5611ec5e885e54bbf9ff33c966c636dccaf74907c5e227b WHIRLPOOL d723fa4cb3300e7ef4b73e76b709294e3fe9b34c9070a1603efeaf5bf49ae5e83b66e74831dae76b36c80441e938db2aabc05929c57f0a74a67ce70a6ab9b98e
-MISC metadata.xml 794 SHA256 6a648df240ff06cb2e1513fc8cb1e281aca0fba86e1f21bd2d733448a55c9240 SHA512 f784d06632b45153702579dc090719c857f11d967e7f3f5a7fa7c6ef7b59ee7093c25f04bcde426e906e99dfa964c3647cc7e675e2aad0d9b48f9e28221aa4f7 WHIRLPOOL 4f6c3cdab89a7828f80d48f2653d720b810b4012a863712655cdcdfcc5df02e0e5ab43be5999d7fc697708adedc76952b3f6b8cbd8a011505badd73ab5c3eb04
+EBUILD swift-2.2.2-r1.ebuild 4094 SHA256 46ff7cca2d7ed02c63fcfb99f9e6c14def6b6287cc21ea35f35a94096620e0d5 SHA512 368f741e2fe1b0d531f6cef7a87921671408a54c7c5d9c2b534b523ecee0dd406a257fc763058b4855fb0b30f2cd143647614f7a770bad4e6e644d1c367b63c7 WHIRLPOOL 1b3bc33510dbbe02425a1b373547eb477169f0ecde2bd19462a501775b0d32c2d4493ae09b8854bbc11ffe5aa5d41c4166b9289b36f25c7e304e362749afe73c
+EBUILD swift-2.3.0.ebuild 4139 SHA256 60ba804e0d67012dc788fdf11a6b6b96be72621c8944f4e4fd1520e46861ab4b SHA512 bd80e83956e788db493d7d7b490f3a7160edffaa552c566b69ffedf1d72dd63cca6c8910d5d39a46973b4065e70b133a3153915c665eb5ab918731c90e553b8b WHIRLPOOL 88ddb8763e51692ad065e792d6dbdfdab64be142ff98f49c1544f363cc9bbf8cb331002688c1bd7a5aca66101cf92b988b50c7ae4426f418ec047c40c1afee0b
+MISC ChangeLog 8157 SHA256 eef66125b516971dd6629a694a0b93ef03edddff00031d95b275b1a0e15a1e0d SHA512 723ead41ede471439b96582ae834c48eb592449d4737ed240105656d64002ecae2d8727af56f9aa3933b7fca40e152b11584cf8e181824603ac674fe45f993d7 WHIRLPOOL face64805233974aacff7df82a9d4a9f01ac96ecd2bf968dd0865d37cb1d84e53ab8e9e888849e15f53896e9605805253db1e374db1b46b80e4e41a86e1d22a9
+MISC metadata.xml 795 SHA256 45f35ebed31acbb4832ee4ce5aab007c70fb011373bdcf1a0d8764c75d82f054 SHA512 2db43560576bfbb1118e6203fdd95eb59ad00818f543d0d62e4e8f317cd4161a4c1dd72f40554650bec2d2274ddbb550b6a42988f9d98017d0f22e677a1a0eea WHIRLPOOL 01e560e383157c568b3d4d6e473f1495f05d4bca44ab84535edbee60843895f7ce71c2f827be37414848e98f42575972cec803035cbe72cbf05698e1ca2ec8bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfyh2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifwAQAJmgAWCR6IB1dNzNTrntQb8g
-Tk5DZIc5mfxU6ksMeB458iVy2VQdSYx4M/gHXPd+NXCzChx1B/jaOJ/O9HD2J5nx
-BhBQGETxdKRdVhwfAAMVA88wMXUrwhNhe4TxMp4SFisD5/XM/MWaWftc2x4XyEjg
-a/L7uF1cIXrrqD4e86EVHDy0SLUbrNShwB+QDjQFtlGZukUSam2dmOb/GPcRxfEP
-vIceFouQzB8qwijas2CZY40h4r9uMQ3dfQT2wMuXW7tA4Vkd5LafH6UQyyRH1dyU
-loEzumy2c99I1xncMmnjNyZhx6G0UBJLxSu767BZ7OWPk4TL2mg6MdK56YH+sSN8
-5hFtQOvWfCEX684nheOK0KsIYttcHEySrAJczsTCAFaOfYfKwPKeJZnWent4B4Dp
-nqaLvq9cQTAhAkxIiB9svvJaJvKudU5DMMwljpdsOYiCBXCp+3qaattzw5VPGGXL
-AyKdNp2JhUbL2G6vzdjNa0GzFwsooByAs5+CBWEVZG9POdJmwA1swZfc8RGkWwZa
-bLlwZqQtplBqHbrAKSosuSzeW/kZ+eK6Y3+NFE5pvnP3fXZ9cKt2jSGgUGjjvM5g
-qxOaolGVlgf8YSiGn+lx+rjUpFg7aEVhbbXGpWevpVRfgxaP0MXCr/SGTPgaP+By
-zrssQn471xSYcIPiLnNC
-=IWlp
+iQIcBAEBCAAGBQJVgeMXAAoJEGSje+quGaToyBwQAL//jd9IRB4OIs2aBGaDzohs
+//SxZfgiuavNGdxzKEEzHRT3W6P8HTfHJ483e0TbSNJpu+PuCuJRkFPiYOS5mSmo
+cL9QZbJkbyFbFYwXcxIREFUY3TaFbHCmQhYdiCXzkigGMPz8K3D1DwjQ908frJ+X
+plmC6dZR/e5GrjTmvXhIpqs/Rrh17E8F/tThRSr47UErbAbVadWoEDWdzafhWuGK
+keOzRH2QPySgG1oV6CF8e2Hnhpr4t8h43e5NBpz7/lvDTQaXRO2vNJ81JAv+pupx
+3BQJn37DXmbqqLp34bpV79Khk+QwjOqikt1QRYYcxiFU7YVYKIGlKV3b3EyEcbt3
+1CnpD6dRGDq9atxXf2EcMQgSxHwgTQhIgnyW32lcxALrM3AfzA+p7LkJMFCuYBSu
+GELPQ3pstkSsIWcd7nkfO1DtvVyRJw+W2jNAGr6a/8tev7eZ9F+hKC5NM4AjU2CV
+g9ewMZn5mRna77+rohFMf+llXd8+CEVbW8skzTd0kSPOevfmwJeKPjTR/esryPCe
+dUdTESB2hAbzZdhjxSnQHz8tKeknTrxFFE1FgihLntVvMLumCSXXaJ0F6PMjEOBz
+bHPxtwZ1m1ySP7RJztHXB+yG8HSQivK9P+h3rZ3BNbL8Xew/2e8hnE4ktFMN5XqR
+ttP4zjk27apLNLMBM42W
+=4Az+
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml
index 68889444c8f1..9f7df66f121e 100644
--- a/sys-cluster/swift/metadata.xml
+++ b/sys-cluster/swift/metadata.xml
@@ -5,7 +5,7 @@
   <use>
     <flag name="account">adds swift account support</flag>
     <flag name="container">adds swift container support</flag>
-    <flag name="memcache">adds memcached support</flag>
+    <flag name="memcached">adds memcached support</flag>
     <flag name="object">adds swift object support</flag>
     <flag name="proxy">adds swift proxy support</flag>
   </use>
diff --git a/sys-cluster/swift/swift-2.2.2-r1.ebuild b/sys-cluster/swift/swift-2.2.2-r1.ebuild
index d876a07e04f5..4cefcdda2f8b 100644
--- a/sys-cluster/swift/swift-2.2.2-r1.ebuild
+++ b/sys-cluster/swift/swift-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild,v 1.1 2015/04/14 15:25:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild,v 1.2 2015/06/17 21:12:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
+IUSE="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
 DEPEND="
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
-	memcache? ( net-misc/memcached )
+	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
 CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
@@ -90,7 +90,7 @@ python_install() {
 	if use proxy; then
 		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
 		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcache; then
+		if use memcached; then
 			sed -i '/depend/a\
     need memcached' "${D}/etc/init.d/swift-proxy"
 		fi
diff --git a/sys-cluster/swift/swift-2.3.0.ebuild b/sys-cluster/swift/swift-2.3.0.ebuild
index 435aa1bceb31..b4d563623fe7 100644
--- a/sys-cluster/swift/swift-2.3.0.ebuild
+++ b/sys-cluster/swift/swift-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild,v 1.2 2015/05/02 20:46:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild,v 1.3 2015/06/17 21:12:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
+IUSE="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
 DEPEND="
@@ -49,7 +49,7 @@ RDEPEND="
 	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
-	memcache? ( net-misc/memcached )
+	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
 CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
@@ -91,7 +91,7 @@ python_install() {
 	if use proxy; then
 		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
 		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
-		if use memcache; then
+		if use memcached; then
 			sed -i '/depend/a\
     need memcached' "${D}/etc/init.d/swift-proxy"
 		fi
diff --git a/sys-fs/avfs/ChangeLog b/sys-fs/avfs/ChangeLog
index 2797011f2b26..4a0d6ca9e107 100644
--- a/sys-fs/avfs/ChangeLog
+++ b/sys-fs/avfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/avfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.51 2014/08/31 06:11:12 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/ChangeLog,v 1.52 2015/06/18 04:24:44 radhermit Exp $
+
+*avfs-1.0.3 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +avfs-1.0.3.ebuild:
+  Version bump.
 
 *avfs-1.0.2 (31 Aug 2014)
 
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 530aaad5ea63..55d92b5b589e 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST avfs-1.0.1.tar.bz2 678562 SHA256 6c6558c35864660e6d26e67f42caeb2bc8f9ef2ad0c502fd659fb7d94724aaf1 SHA512 3eefb07ed303343c4e5ec873fb519f171e8b19f00efda5e78f4af573fccabbefa59f77a677a34a569343db743bb41368beaf6e399d69f228ad0a77878e41adf0 WHIRLPOOL 68153492899a67b36bb8f982bb319469ee8cdf64e8c1ae642fd2f746736bc5ee93c22b0fa005ffc42d5bed543332875b5d6ed096bfd0a8bf2c2da3cc47cfacbf
 DIST avfs-1.0.2.tar.bz2 723051 SHA256 52693953e8290281d441a898040c5ac2989f11bc1fcb83ca5063c37a125a1c9a SHA512 a248c025388d169e2c6a57f04487c0aefb2c574647aade49c3a27d62621c0ead25b321b87518cdd718cb238387a766ec9e7fef434f30dcc4dd2bf9fbcc3de020 WHIRLPOOL 71f3949f39b130522d98fdf6ae431c8d410fc83d4e91028223c6bf0a247373ac129257c1b85efacbe430320d6e870b373a3e65cbfad31eb123f691f02da5c26d
+DIST avfs-1.0.3.tar.bz2 722861 SHA256 c6dee77b2b71567528f897727e51695587189765fc35f694e4734db0a7d4fec8 SHA512 b20a8bcba0d1d0181a14d5f1204f0532817037e3b5d32931f00f988793cb6cdabec82298686d82aa34885209d22841754e990c9c35b6384e0b441f99fd3d1efd WHIRLPOOL 406b708b5b9516ec97e024f518eb7370031edf8410d8637763bacd05f6d15ceb06217c43a8f28381c0d2f9fbfcd991a27b57cb45521ed71696e70e41352b7de2
 EBUILD avfs-1.0.1.ebuild 1523 SHA256 b24dc1f0a2fca58f540c7dc2f5cc00e8440ca2279ed6c6b3a62d4f672e8ca503 SHA512 f36caec42406df7dcb1000aa88d04bfb27d972c2a3361349209fd5e3de3b9253473d023e5c144a4ae5a3918eca319ba31177bb964315fe42868dac0ea993ad35 WHIRLPOOL 90540f28a88c1448ce4617f3541eeaea57645d86732e047c8310d7296316209f32086f835117031acd9ccf0a1cb94db2766750391cd62bf8c073c6cdb8b60794
 EBUILD avfs-1.0.2.ebuild 1530 SHA256 f03b05c850cacc7afc79d6d177a441d5109c26216ef4c6b5fa1ebd231a713f9f SHA512 686eb4975a2ca2f367ed670b89308c3b718e60791502bd998d41666502e1a6a91023234ccd4a419d5063bc9c7a51bd3e2863dca0823ea5d018bd00aa663248d1 WHIRLPOOL c0e72e1703e4acf7b7005e1bb6400e8c3f50ad206c19818fb42dcb607efd7ac4fe50d848794f14ee9203e15eac4ebe8d8b8914f90c7a277ddca272646e756bb6
-MISC ChangeLog 6839 SHA256 cb663999b96e041b32fc1ec09b363764e93603c1c552f128f4b72559bcd45073 SHA512 71dff9f17bb674525f9de9515a2612b74c117466385790b9d58497739498131a0ad04c782e0059f55d9b3488577e0895f307ca5a947d93a621036deac04260a6 WHIRLPOOL d0d4f6f9cbbfe99bc5c7411b66317ebca19770bde22fa1b1b6af8c0efa3f8abdd8110f1f6db12978b9389d7740a08e2e544a4682699df3a9dbe3911066085080
+EBUILD avfs-1.0.3.ebuild 1530 SHA256 4be06e11b08d859ae0fbafe8bda1a7f9c2ee0a43faadcc33adafc9fbef01e9ea SHA512 0f040419386e8aa1436dbd9fe4712aff482863bceb79362edc1bda400ca6a7f06c4990f49421ff7ed5e78dd6a36f3614e1032ec651d767617229f4cfde6ec3f3 WHIRLPOOL 3dba33d4808cc64fd04e576ab26e8a9fd21eddcef6b6400a93379828df8ec51d39944863c064c2983184ad590240d5209bae6bf4381bb0814f74ee28da809b9f
+MISC ChangeLog 6952 SHA256 a5d8ba1f33e427d4a5063e502056d99d4d7354f07a55184937d77bda15b67ad1 SHA512 dd83376fb5b98701abaee5443fb7bdc02f3ed130d7d0d9c17c2d14e066aeae97fa8f408028dcf65bb0a06a97bde847253540ddca4c6d9625aa6e0d6a5bff1d86 WHIRLPOOL 8a8b24f5ac782605ad1c33d9873e661e571520a3cc326e5d97b02655d03701cca522e6314c478b5b4be04e405e22cb864910a3018a8bd4c575d449d6a5e0f75b
 MISC metadata.xml 376 SHA256 ca693249886f2c71695fd2a902c704c4ea1dcd0727d81b8aea51fc5f41a80445 SHA512 7e364e6d6c50b394669f1717978378ea39ad53352203d1c218d9c9cee5fc0c31767df21e3a26453f6e99f57a254b7d08bc35a769ee4959c8dd0936dc3152bfe2 WHIRLPOOL d9721d800cea695240e0504b4fc5031ced59191918cd65078f43073951ceff760c018807c852db2b90a9e3ed4c34f87bb13aaf7cfc67c45fa5c7d57d4ef24c04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfyjtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCVIP/3zIIuMwOGG7ctf7A4zJmKKE
-FuNEXOykUXARWH2g/IU0E4OqgDUQNPAEsx05f+suLGpqrmQLY0zc13yCuutHxlhd
-xRTXnRMHBHqss2UVz6WYki4RdXwHszs55sZc1zlWmTYY+q0wR0eXg9GNU54GxSZO
-51u4/QVIlsMq0FjMnhycyvvbWZG4RVs6kW63NuhEKc/MyCieZsYPOW9fqfzMjeen
-B1Xz8lD7+ibcV/jrPE8AplQRkenzcf7k4SB4QBPQ2tdc7pGhzaMA/5i80UR32Gut
-5JRwXTDQAfXiIR4o9mg4cptlewrM4aJmJujIeRuy0G3V6nVPZWVtdNq9cpAbAZGg
-ETdofb4n0oNrZDs3jxxcgmels6afYVKevYH1N7j3HtB65uDZZdQtcjZKvscfPQM+
-gT37G52sGE0VQAp/pu56LCXfbWAtVLanbMFVyaAfbm5mrwJ4k9YMZ6IAnLqmYfip
-eh8YYrOguhFaGHlvVG/r8qgpmoguVhKsJfOr4O2PKlijOtzsQv2Up/cjh8wfr9wF
-NNHK4IuTK8ah4P4QUmhyWOAWsYNow/sFAr6rOHmXIISMlhtalCppuoQMTBCtgbhA
-8q92e6m/hFgpJVCrc72yg3LjI5kP2uFUuRlV3wmzqW+Lysbxp/ezIL328f8MJi9x
-G7SIFWmlj/x5cGYduimS
-=gxes
+iQEcBAEBCAAGBQJVgkgOAAoJEEqz6FtPBkyjXIMH/jO7KVb7IKPkSoothYjAZF1X
+0vlx/JV4O8EmpO1eE3JZX+LjW2sM9j+R+BVF8ABZBR7I287qnAh0Nvi+JEiVtb/l
+xZReCM48x1XkBauv4M1Rnaz9SWpYZSMZufWUTO2eoOkKnk9N2zNQBTfCGdZUL7iS
++8k30pCddRwVwwZktb4MhwS8tGJ5J3n8457VGxbG1Lp17WYMnGOHV2wqJbThDgp6
+lartGcap1CcllIA7XXnMSnU44E1KIAtsexgKpJwfE1HuphdZq53WQjhZQunJFAhw
+RrGJFCSWEFtjXOY+j8+9o1K7n5OQp9vDyn1Vk3BbcAvBl6kPGxrhzyKZ8iepkDQ=
+=JCsh
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/avfs/avfs-1.0.3.ebuild b/sys-fs/avfs/avfs-1.0.3.ebuild
new file mode 100644
index 000000000000..8d00845be149
--- /dev/null
+++ b/sys-fs/avfs/avfs-1.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/avfs/avfs-1.0.3.ebuild,v 1.1 2015/06/18 04:24:44 radhermit Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
+HOMEPAGE="http://sourceforge.net/projects/avf"
+SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs +lzma"
+
+RDEPEND=">=sys-fs/fuse-2.4
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-fuse \
+		--enable-library \
+		--enable-shared \
+		--with-system-zlib \
+		--with-system-bzlib \
+		$(use_enable static-libs static) \
+		$(use_with lzma xz)
+}
+
+src_install() {
+	default
+
+	# remove cruft
+	rm "${D}"/usr/bin/{davpass,ftppass} || die
+
+	# install docs
+	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
+	dosym /usr/lib/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+
+	docinto scripts
+	dodoc scripts/{avfscoda*,*pass}
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	einfo "This version of AVFS includes FUSE support. It is user-based."
+	einfo "To execute:"
+	einfo "1) as user, mkdir ~/.avfs"
+	einfo "2) make sure fuse is either compiled into the kernel OR"
+	einfo "   modprobe fuse or add to startup."
+	einfo "3) run mountavfs"
+	einfo "To unload daemon, type umountavfs"
+	einfo
+	einfo "READ the documentation! Enjoy :)"
+}
diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index dac257bfba4c..c94f08868fd1 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.106 2015/06/13 09:37:36 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.107 2015/06/17 15:11:48 floppym Exp $
+
+  17 Jun 2015; Mike Gilbert <floppym@gentoo.org> btrfs-progs-9999.ebuild:
+  Set EGIT_BRANCH=devel.
 
 *btrfs-progs-4.0.1 (13 Jun 2015)
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 47bfd2184990..98378ff70ab4 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -22,13 +22,13 @@ EBUILD btrfs-progs-3.18.2.ebuild 1381 SHA256 b132133a7d6f697097b86db98defb7731a7
 EBUILD btrfs-progs-3.19.1.ebuild 1982 SHA256 9f612c2e73976ad53cdb223acc4e671735b65692f68406b656cfe4039cb52cb9 SHA512 2133deabcc0b30dbf4fa87d11a22a5cfd57b1edecb507e7959c7e26e711ff992ca0268f7d320f6c054aaa6f8eafd8a6cd68ad7ab6498180101a2ef9bdf2bab17 WHIRLPOOL 4f0d0ede6e5f9ef0a7eba49aa9cf04ea9fd08f0763eb170ab4c4b50fd8fd1aec211c0df606e392dd5ed709bca0c85360ab2a5ea0dbbac46dadf1503107765c30
 EBUILD btrfs-progs-4.0.1.ebuild 1980 SHA256 e62bef86d9f5949f7956579410a91f6b2e6a0f9d9cb61954a277fc72aa942b89 SHA512 8d74081bcfe085e5f321c24abf661366855b12939a5208a9a0943901b8decdd5be21ea4bac07dff960c0bfaaf5ddf776d2cd2fa43a600af7eb3a7e15b4d413c6 WHIRLPOOL 4c88d6cbef252d8b5dae07fed98a271027a2ea9a85c66a6a8499c20594ff077ff72ae86241f55bb23bcc9a9c23d65a25044cca1e4933b8923330dd45a88e0677
 EBUILD btrfs-progs-4.0.ebuild 1979 SHA256 ef1afef852b313f732d2ef5d66b84f1cfdcad670d451320872b73503a5919bc9 SHA512 a328eac28b523c24b33aca20c406f87a39761314e54a48d8d13e62264a800f545a0f9950330fde180569ef5a48f893fe9f10a0ffb743b9b1211322cbf633d8e3 WHIRLPOOL 7866ccd46a60a02647f9dff00df6eaf58a4cc635d577fd8db7ee42dfa1e5ef582a12ee573a21bde086acba966d5b630c5a521eeda8409d8aeaf333d6b5687a1c
-EBUILD btrfs-progs-9999.ebuild 1981 SHA256 3ba38df37e84bd9e36f38a7004a372fbee9967f276ed408c115a8a0e47a7b044 SHA512 f8f64a38ada90b1b9697f354f5d4d3698ffd4df4fa1291fbc693215d3ae5de1f1de4f097845d5db7894b35cc083bdef034d62ffa31db8d838bb31d377ede4c9a WHIRLPOOL 07ee322d28f6506ee39e7650cf4d3e473ddcf9e530c52579e9de561b264ff84bf2da0508639cb7fe9e97ee1710878080ac9198d2564d3591baf93940e0e8f5ee
-MISC ChangeLog 16621 SHA256 8e7c24a16f0fd1d6e5715297e0347dfd1bff2704c82a2ea0faeda4072078381a SHA512 ce13fadcfddfabf07ceeee08e66b21bf848c836f6d566c38959de6993103ca23582c8302a1827ed56d82882e91c6dfb77d03fde04c54dc433ce877f957dc35a4 WHIRLPOOL 745fd5f83e6f8840b7825dcb2b3fd807f74b8934ca25c75fc35e14bd0ba6194f08afac5d839d91ac3c339434792b80791b731fd9f46a3a3cf5c8b7be92eb7a57
+EBUILD btrfs-progs-9999.ebuild 2002 SHA256 62492918050c94773c2a5f178cc2a52cbe94c34e37669d2c9bc42fc99a9dfec3 SHA512 0853fd50293b8d2d72a6c7991ae9d3241b460c4f9d69a7c7e5e847b6faae31f6e7bf100c4b9ecb8e2c9d878f8e73ff0448aeb7b33b84a817e78344ae5754fd3b WHIRLPOOL 9e01f861cb68447a0017c30f2f119f72b0af230080d027413492dac7b718e076733c68631a0dd0f78291af02aecf88c07b652962fed46b804eee3ed1160e8c5a
+MISC ChangeLog 16722 SHA256 0ad1956b207641f248140dd6c13e5e76acaabe2c9510d402bd0cd27eca4199a9 SHA512 f4f661c894d2f154c1466bc0f371b01e94437cc2b9af62df494c0e0ebcd21993e6d940a72aed80cf3bd90564791d20d7d40e070cd907c91e80275d3a060db381 WHIRLPOOL 57822476a8d1f779feed1ed421594b01b61f96a186ae85059b72b465a473eac5d8c8bd1a93a62ff917637a0c75fc5101d55b6d54e5bab483943da6d0584658d4
 MISC metadata.xml 437 SHA256 1251b85ad1e170caf3140533de18e9b7a7a1263c07d6a85c7a7c51393d2ad753 SHA512 8779ff4ef65b62d10ff0954d418b9f89f99bc61cc9ff4d0152fb1a07f5ad8b70d4962418323d644c630d654e798b2ab9a6a2e727f83e9b8d8c0b621175fb3175 WHIRLPOOL d35b019cf132b3c7519029fd6f60998d033bb91622e69111081c03e0fcbde268f69e61e7a376f2eff7fefbc4ee243d9c91227afa37502e736370867cf9aa1704
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV7+eQACgkQcaHudmEf86o5nACcCEb2DwYFtykow33vGQuv11OE
-NAYAnAq3ddACDyBC3T3VaRP5GQSUKbsz
-=PcAN
+iF4EAREIAAYFAlWBjjYACgkQRxvnM+8pGj8g0gD+KRP34dAOC1ke4gjnk9Kpvw7A
+UZEI8LukVXtBp3JHq9gA/jh+lGtaBdFhTVFYTTjU+KhwrhMehPby9ruSFTi7la75
+=2c9J
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index b18a95bb9a9a..0cdecc66742b 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.44 2015/04/19 14:59:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.45 2015/06/17 15:11:48 floppym Exp $
 
 EAPI=5
 
@@ -18,6 +18,7 @@ else
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
 		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
 fi
 
 DESCRIPTION="Btrfs filesystem utilities"
diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index 93c50c2282b0..d5294ecb1301 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.201 2015/03/07 21:34:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.202 2015/06/18 04:17:14 radhermit Exp $
+
+*fuse-2.9.4 (18 Jun 2015)
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> +fuse-2.9.4.ebuild:
+  Security bump (bug #550152).
 
   07 Mar 2015; Mike Frysinger <vapier@gentoo.org>
   +files/fuse-2.9.3-kernel-types.patch, fuse-2.9.3.ebuild:
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 1bb3e5423793..b04957f36cc8 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,29 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX fuse-2.9.3-kernel-types.patch 433 SHA256 9ccb9b28c47dfe1ab8d59d1b92df0d00b7b6bf36b8b4d4ad53066cecb655f612 SHA512 97f3a48850d69a532c328a112dbfd9ee3029c1d858a499e20fd1433d33ea349c29278468fb35324e0eb2edbe03f9b32d07f95f23cf2169273e3a05dd0d582ffa WHIRLPOOL 3d126c66606d9b44e88c5915d45eb406fdf10a7f74b9ab7434ceed9a117c5f61b41f3790215bb8f95932d794eb513662f6e17d0c84df36d1067a5afcc7347bcb
 AUX fuse-fbsd.init 467 SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273 SHA512 4d8ce71d9a025a52e8f1d7074f83fdc368fbdd4bdf65bccfdbdce214580d4051c20bdde7f61725d14c585db1dbbe0781cee2a0c73a857f1340a5b57ee920649e WHIRLPOOL 3cb757a5de22b36c6e638c612a99cad43edeac86e37a9590a3635d550ee12f404ea54734c69a7f139c1c1089d2446b37a6387f1aa264651000d50942f4a97047
 AUX fuse.init 756 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda SHA512 3d2765114081c8f6720ed25d7b7da4f6da5fbbb5b35760bb0a760f0bf2482abacabec63c1488d4e8cbe4f78875574607e6e46508dfe22df0869f4d2e1e91e607 WHIRLPOOL 2932da7d97b7418b5ead6c71f9e583b6ec1b47c86e763577312fd55492482c0c31677a78534301c7b541d476ee16b0eb2da981eb6723c1fdc9af338ce10c243c
 DIST fuse-2.9.3.tar.gz 572044 SHA256 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c SHA512 03f43f88694ec7e039ff3579a8e76349b5a5a05872c55901fc1d9ee53dbb6b1e69f6dd0005b620f3b5ead0b14da8eeb31d46b922d10f88f4e3f830aa47e8162c WHIRLPOOL 739562e48e85326049dac0ef06653e5e6574a01dd60649e23ddc0990ea6c1979e6ce952a1e84d0776b706fbcad79eb0e1328aa35f70ba4881db9a4482d254a04
+DIST fuse-2.9.4.tar.gz 577282 SHA256 6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1 SHA512 055ec2a78793276102bc5a0afea9eebd18b151cf752d0985380ffbde1c554e9fb7bc3a43838618e3957b274aa06624303ea12f32c659365c4768dad887bb557d WHIRLPOOL 6c866ba05be5a56e1b1d8793378c0c5c683375e9baad6de22344adaf5bb35021182b15783f59911259f98cb914ef4a1cb70be0cb9b5cd6625173b3b6454c32d7
 EBUILD fuse-2.9.3.ebuild 2307 SHA256 1e5aeb56527c1cbd559dfd189637aa2dad624bd136140462ab1357eaf2d4eeff SHA512 5f46042120814f68d08e5dc7becb9e5253e27e6344cb72a5c1e647573e55567a86f12c0f1694bef0a4b0d3b8b214c960bce2901ad4853194e57766a5214a0850 WHIRLPOOL b622eee18fefb3e284b8894ee191e84b653dd7869f2c35ed57b9568746499bf9ad6fa7652d43c7c18866e2c2cc97933561db1c811f2b620711363b6b1baf7d07
-MISC ChangeLog 26347 SHA256 8b5b61daecebb87db4fa76fc0b70166834a85dcbabd8eebc85907cadcbdf4127 SHA512 76a4bb2349a84f8d9a3b4f2ff5ae87d808f7d3cfab5180faa8e02f823cebf502e43482c1d35c4a292fc055c24dc1544f151f80497a41a5170091623f288fa860 WHIRLPOOL 5e48cc667532d7c343067ec13138977a361a6b4fb99155a933426fdcea95300dc38759e0983255a05016b4fac3c74884db0023a2514869c73afd3c3a12e562cf
+EBUILD fuse-2.9.4.ebuild 2326 SHA256 4a17c3734fff40da4c473ea81b48b4fe780ccf6a4d2fdf43b8962a335f10c6f5 SHA512 9e26802c75695e1c552c6582375a73321db68917d6969ae1478fea729691c60fe4d84c9ee8c6c371d7bda4c2370bda86c1308237a5c5b83a17d423cc3280b637 WHIRLPOOL 4c4947340ebfd49797d0e562153db67f043aa4d492223b5e914aa2f386c681bbd713bce4b1a3758ad415b5bc6e13333b105c66d31b90e363aca8a3819166bed8
+MISC ChangeLog 26478 SHA256 7f925080d07787112e75954d3c7c60b6d1c4548be67d46b7c9947c299d5a4cd0 SHA512 b4c15e2064d0a05cdb0c471e46445a97e1669acb7f9dee8e03e7892dc1b022ceea88f9e1871927d4498014c290696b3429dae6a73c0c8b156d3f8c0c5eb8f1cf WHIRLPOOL c61243d3b840870f3eec792770bd584c3fd58ee66b458825c556dae1fb1c95b144c75ba25506aed1c83bff1f668fdfc3b17bef5fee63fe0636b09035d49a3a77
 MISC metadata.xml 299 SHA256 60cb290e776d3f0a224ddaf626f9a15252744ee6539d331933012ea7dd6d1cd2 SHA512 1dd163265a0e4fcb605f315b633235f5042ad2cecf45cafd2fbfa018050f6ab84bab866345e96d31fc1f35e90de06d9bae7da5d8b84f012e33e7a4a99799662c WHIRLPOOL 3a477cad9fecad606e5b4398c453c6819518f527ebbfbbc6defef788b7f667831699f4b5e0a841a39032d5f6eb4d725ee0e3f482330ff04baa928f0820ffc78d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfymXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmigc0P/354PqVbDnpOQPAF9GgeWFQw
-DAfNw+2i25RRZdBGKV8NNLV7NTaEiiyV8uCCzUjPWU3SCZ6KmfEvqt+/ibuHAhPB
-HqWdpLMY2k5YTN0nxeA0lvUFuCJo3p0RJ/ajhqpHbW7d6AwH/XT/6XIgfKu+gqkr
-a0cefGAIKdv+Seu9RpCqP9FLid11yEiwAD73KVnOG0S6+CavzO2K3dPHdKWOdIeQ
-VcKM68b+ly59Qt2Y0FHT+PnaOvgzlOFw5sbMaJQrv5CO1HH5BB3nJJNd+Ft5rcK4
-NhjnX6po74M+OGT/ioVgpu/rsT3uEPFwha/lN4GgsIO1BWQJIuj3P3yfVaSj3XtE
-7+YjoGA7/WGn68Q4iaDSMt61C67B7bcUKEvj8DIzQl7P1q7XALXNXAJSGDhbWwdh
-o5A4qgSNiRxuS306p2lIa0OWhPi3NQ0FZpBijcOQKO00KQRMLXvekwtg5eZa1XqO
-CqKT2Zol2moREj6CUfskO11rZ02bGtFf9+FsoEGoJgoUivNtC9X6Y01+gWk2s9RO
-/br89JIkLq1/cCeQ2UnZU78Ph0hQqDZjv/v5m4WtKjx5eag3QgmcTRQCzr20gmMT
-HA7InpQ/R7oVtdhNdsbFMzJ+pEyCFDxYdecfpay5DaffX4/gJI4cs5AkASS2Q6uD
-k87WYwfPn6ygkP/HjHo/
-=muB4
+iQEcBAEBCAAGBQJVgkZLAAoJEEqz6FtPBkyjYDYH/i2E4Py/SsR3sQ7RQxfmERI9
++EwSQROPKNzwcFCeOC/Knnobzj/vwimBggL4I83ordmrO4qSECQC3hJmo05w0eNF
+iOhNuxrnh+OIj5bRuaNjgWZhaLnPq+v0HNeHzhLMM+fSeE0dt+0JYY98JKQVe37j
+dMsn61zu+8P/Q77eSN2W5hgv4FFnIGdRlExTFuUFvz23ahPDdZY24lIjizV/SD0N
+A++sKGt/BG8XxZs6opoMDtKUhQp/iop6A4YLhqLsxNyma9W1Af0tX2lWsJBr+IiD
+DYIPJdQGeZfkpx1Y4cf7F4YZY1vOZniRMQqhUSSkej3H9yqMqfkOgbv+PRtv5Cg=
+=3jRO
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/fuse-2.9.4.ebuild b/sys-fs/fuse/fuse-2.9.4.ebuild
new file mode 100644
index 000000000000..a73e8a636885
--- /dev/null
+++ b/sys-fs/fuse/fuse-2.9.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.4.ebuild,v 1.1 2015/06/18 04:17:14 radhermit Exp $
+
+EAPI=5
+inherit eutils libtool linux-info udev toolchain-funcs
+
+MY_P=${P/_/-}
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="http://fuse.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="examples kernel_linux kernel_FreeBSD static-libs"
+
+PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
+DEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if kernel_is lt 2 6 9 ; then
+			die "Your kernel is too old."
+		fi
+		CONFIG_CHECK="~FUSE_FS"
+		FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
+	# sandbox violation with mtab writability wrt #438250
+	# don't sed configure.in without eautoreconf because of maintainer mode
+	sed -i 's:umount --fake:true --fake:' configure || die
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		INIT_D_PATH="${EPREFIX}/etc/init.d" \
+		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
+		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
+		$(use_enable static-libs static) \
+		--disable-example
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog Filesystems README \
+		README.NFS NEWS doc/how-fuse-works \
+		doc/kernel.txt FAQ
+
+	if use examples ; then
+		docinto examples
+		dodoc example/*
+	fi
+
+	if use kernel_linux ; then
+		newinitd "${FILESDIR}"/fuse.init fuse
+	elif use kernel_FreeBSD ; then
+		insinto /usr/include/fuse
+		doins include/fuse_kernel.h
+		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
+	else
+		die "We don't know what init code install for your kernel, please file a bug."
+	fi
+
+	prune_libtool_files
+	rm -rf "${D}"/dev
+
+	dodir /etc
+	cat > "${ED}"/etc/fuse.conf <<-EOF
+		# Set the maximum number of FUSE mounts allowed to non-root users.
+		# The default is 1000.
+		#
+		#mount_max = 1000
+
+		# Allow non-root users to specify the 'allow_other' or 'allow_root'
+		# mount options.
+		#
+		#user_allow_other
+	EOF
+}
diff --git a/sys-fs/owfs/ChangeLog b/sys-fs/owfs/ChangeLog
index 26d0d2236b48..e83dc40930f6 100644
--- a/sys-fs/owfs/ChangeLog
+++ b/sys-fs/owfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/owfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.28 2015/03/25 16:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.29 2015/06/17 19:46:47 grknight Exp $
+
+*owfs-2.7_p21-r4 (17 Jun 2015)
+
+  17 Jun 2015; Brian Evans <grknight@gentoo.org> +owfs-2.7_p21-r4.ebuild,
+  -owfs-2.7_p21-r3.ebuild:
+  Revbump to fix php dependency and remove deprecated require_php_cli and
+  depend.php.eclass
 
   25 Mar 2015; Justin Lecher <jlec@gentoo.org> owfs-2.7_p21-r3.ebuild:
   Fix tcl/tk slotting; bump to EAPI=5
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index 6310b8134e62..4543320192af 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX owfs-vendordir.patch 1261 SHA256 9a077df11039e1c20150a0f50f4f988635b40048284fb4f5310d6a2b33318041 SHA512 12d5efbdeaa2f59e2c12aa5df4602f8b3ac1b3aff946fd9915bcfe717e9fd342766c379380a02087762b6028c048d08e05d88d9183667ad7222f3996ca0ec12c WHIRLPOOL 19b710c1938bf5daaefd7af5bdb6245942acc56abb4e6f608f845d3bffdb4244bd49bf7ba050b95510e518954d8aee11d8e388443f419d415286b5f7ec1ab844
 AUX owfs.confd 86 SHA256 a9dcdfcea30619f692275a7ee9842746e10ed72884dd0c8184668cbe7f065783 SHA512 7c23bd956d2e22cc3952eefa52bd6b5b08c1b24561d5ac9cfc5222595d083ea64ba26dd0b4826e0fad3e2eb5774cc06a7bb6c7afd9c4c0726ce2b4b6df4dbdcd WHIRLPOOL bc8d7e66c34f8411387b3931f387b937e9a8fff81bcb0b48eaa086310962477e42927350f1ecbfad7dee2a854c86899910de63a434f0c77face3cedc54ec85d8
@@ -11,25 +11,25 @@ AUX owhttpd.initd 847 SHA256 81469aa86786f6926685b9f4668051c8a862afd0f380a71df49
 AUX owserver.confd 108 SHA256 e14d16d11a9a4c597a957f2db48840e1fa6280db241dcab28922ae2c449940e7 SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411 WHIRLPOOL 1dbdd8ed06ea24b9abebdfe6190b9cf4aff20df66127732c283e6179ed685fc0a47e00b2690c4949042083ae52f39f9895d594c278b7596ff3e3ed6298f7311b
 AUX owserver.initd 836 SHA256 52d6b43977485bde574889491cceddbca7d8554fa9f314e2d34d9a88ed7eb752 SHA512 779163dc4181676e8f5972baa9fe4bbe23f85cc4a58bc5fe3c70c32563d4853ce92b4be5f5928f8b7f6eb424205db91c9b88a12f62ed6def7ced4fad61f0fd9b WHIRLPOOL 8f63622c4482bafda86373b987588d0b522a332719bff3ce4e155deb0fd61effdb7ada69bf73183431fc9ed4b8a0f3a9036bd78c85ace48f95434c56b31db660
 DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d SHA512 ec6d372d32ebf59278c2c68d5fbed42664f52bc1702f4ea8e5506457594943413e37801d341102029cb48a9d8c3d6b3d68615a1dd517c93aa0a475a1bb06c4cf WHIRLPOOL 31901ae07a7431a368cdb4fa0a30a1885da29f55187dc601b53f2e9ebf4e11aba73de93d7f6308671ecb3afa8433548b41a2e79a9a0cc4771adee93a5a6a1ddd
-EBUILD owfs-2.7_p21-r3.ebuild 4258 SHA256 3f6783b4a702b345259685b8b7d41fb61d88c082d159b7f51ca820baf02e74cd SHA512 8f330f1e0311a434b68b52718e447d8034d03c458844b3599b60e1df6e2ea3fb140504d07b38bc487279d73eaeacfdcb511adb4d07eb6367664cff12814ec3aa WHIRLPOOL bf600fc9c45cbb8018cf756ab7a21f1d82151af7abe021f57f065760e7170dc7a6e75abf770b6e6354d1d2f2c4a00963082ca447e792901d6f7be120ba87d5e2
-MISC ChangeLog 4706 SHA256 0c58ec1bb8b667dc48275a44b2bf5cfe1265877847af49e2b68511d912fbd263 SHA512 f44ae09fa0005c866f5b09fa6ec9de61140cc2a8e2a543c3586f9b181dd2b86465e319a6664ae8d1d0b21b31dc4f1630baa1ba2ba0e82de2b587122d5bf85dbf WHIRLPOOL 1f9372ea2a23ca48c3fa752df8b5e4287754527a6ea6d860ffe62c94153a5acfd6beb57ff415ea163f9a314e33851b4db0b162efeeb348d892433632ca2fbd4b
+EBUILD owfs-2.7_p21-r4.ebuild 4227 SHA256 4fc4a80005f59c25c9822f5a9084c36eebf1effac3fe9884de5a5dd4d873a7d2 SHA512 bbb1cdf6d9e9ab0bba81a5c72668cf10191b8c4b3b0d50f162d4fee9822d452023343e98ff8f747d50d9c9829f00450129749f0bb350e1ef16779b49c49aeb64 WHIRLPOOL 92d3e484d4176ba54b3be443f8d8b5515dfd7d06c0680e7cc8ade9e4749cd5954c069a84cb25749c01907ee903e8768389e4e7ed7af6f76855b4103e7fddeb0a
+MISC ChangeLog 4938 SHA256 dd91c024e2887b3e20efbac1552c5d69d01d01d8cc62706020c4e4a00671d1f7 SHA512 88bade78076fe391c9d65f79161de0e054db96d9538df1aa4aa8bf94e7c06d919905044762450b13803e5ef422f70ccb2fcbc3fe03989a012d762edc24ed6ed0 WHIRLPOOL e9522c1766a85d4d71de49b6178cdc12031447ab9163fab5fb2b2a01801ebe3c70ea5a3251a4a325969ad943699e73d9e6949b15c9fec3e2af509101b525a1d4
 MISC metadata.xml 987 SHA256 b2b3a505fb3902a6b651502f04ddbf51f64d39fcf8eb8f7b2d8fcc5bce915bda SHA512 5e68916212ca291eaea7a93b9872cc5b26c3a1d8f943e9120cbfba401efe0760a727b5f54090c2a8046289a3685f6257e47e7b189bce1598e563e2be540e6ebd WHIRLPOOL f608d99f4423fea48166da339712987d2f56c045c3d29c7f475818d531c356e12683e03be7cb2e10c2d6f7e70b3485f626d88167be5154b2af818ec7ba44e733
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfyoyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVcYP/A30nTWvBGj3pjeJu7R1OKCx
-VWFzLCcPnpeIx36lmEGXjAhxtmwWY3AvYhj5TU4yHO15StF3dwy0NqdN+k49LVjZ
-NOPXqlyuphn3QK64No4A12RwEAhfMrYqbHS10n89LTGLZgBtsyB4fykL2SES0puV
-fFpe3zOvmtuo1kFZEuwG834LHYphfrp2VhhTqXFNT4XSAFJ6AeaYHMxmCrmI1rRA
-2YfVgcueaDXl5klnTz3LbcpdrZaDFdJMryF0vixVWKLvyMzDlr8kEyxZj4LrDImU
-pX1RnvvNXxHHOwVwJyx3H6Nlr0ZKc48/yQacTI+H77tVuy4y4USS6FHRKtNR8xN3
-0hlzAy+NevqtMMhDmE2PbcdTxe62EMDJqsQZIAAA8DQu3U+s6nYQnyXLE+DCvOdl
-MrdSHaAjQB367eyrFZH3YzMf86JubBuNnRQbFtpztauZpbtBiP4lwfAo0tBMAHZA
-6fm56ZuCdYKRnB/QzwGclVfwlaGkhgsIHExVk6RA9/IpEjEsYCeMRI7VyDqfVfnB
-hmkkH9s43cW41yyOmzVk6UuDKVpzCebBtZ1K9UaER/R8ttpljE93Zrm/SIOxsDcu
-Kh5vSMKF4ZMA7GgfSKbHwMv8+Qh3LsvihPkWVbz4C0xz/PE8Osjek8V0/u+vJUzq
-ZoxUb+kCDZzbj6nBfkC8
-=W0jX
+iQJ8BAEBCABmBQJVgc8lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2VhEQAIT10Drgv8rHzefw0sx9s28t
+n18ncGTfJ+6PihQ07UWkM814myc9+54Z9Uo0NGqNaIpUh7ALi+c4XJkl8sBhkWzw
+azxdbbASO7Omlqu4GTaVB4QFF4YnfqOXGuN1lTLjk2xWlNT8rhVbxj64rm2J83Xs
+VZ9TtsCM0iYcP0m6+Mc7jv7Wvv9fSklFQoRONi5EQcblW+Cee/I1r4HZ8JoA6HFs
+8PwFxTfTDq+OPZ4NF6xOT3p3GKSHEtB5wu/z4ieRtOTGrzSVmyASOoW5CE0MiLS6
+D4Ao1rG+V+UK6QkgtHYgk5VkVcjiOlTWl1bTRMAstNLn3C1blEScca5lT4n/6b0L
+sM5MsM09XN9wbkgKWav90jhyS9NifLYZPG/dg+3WpPUI/UXGN4HRv6xY+/gmo4rl
+V/GNMYu/t/0FcyfGZ0PlmIWi1qDGaqKe5ozJFVL7SlBku6yd3IdrTwDj0UmQiKWf
+TT2vjxO0m98suql16U+aBaBCIaIdHhFHbHTpXID+3qL8PrwZg2vKHOn/fxOnWcQ3
+Vcdr3ys450w+iemU3FDzTKmueE0elp/4GMdZF44EsZ7TYIIE5ZZ4A4tDbAASdDua
+sx814cm2GgO21t5etIrsV9IP14PzZlHu4g1KYSFbW3Kfuh3A36ayFq4R2rtlwrbp
+51/yM790mo5cWb1eOT+u
+=uGNX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/owfs/owfs-2.7_p21-r3.ebuild b/sys-fs/owfs/owfs-2.7_p21-r4.ebuild
similarity index 94%
rename from sys-fs/owfs/owfs-2.7_p21-r3.ebuild
rename to sys-fs/owfs/owfs-2.7_p21-r4.ebuild
index d630a0812504..df7e1c4f0364 100644
--- a/sys-fs/owfs/owfs-2.7_p21-r3.ebuild
+++ b/sys-fs/owfs/owfs-2.7_p21-r4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r3.ebuild,v 1.3 2015/03/25 16:55:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r4.ebuild,v 1.1 2015/06/17 19:46:47 grknight Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit depend.php distutils-r1 eutils perl-module autotools user
+inherit distutils-r1 eutils perl-module autotools user
 
 MY_P=${P/_/}
 
@@ -22,7 +22,7 @@ LICENSE="GPL-2"
 RDEPEND="
 	fuse? ( sys-fs/fuse )
 	perl? ( dev-lang/perl )
-	php? ( dev-lang/php:= )
+	php? ( dev-lang/php:=[cli] )
 	python? ( ${PYTHON_DEPS} )
 	tcl? ( dev-lang/tcl:0= )
 	usb? ( virtual/libusb:0 )
@@ -42,8 +42,6 @@ OWUID=${OWUID:-owfs}
 OWGID=${OWGID:-owfs}
 
 pkg_setup() {
-	use php && require_php_cli
-
 	enewgroup ${OWGID} 150
 	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
 }
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 343d5fe206fd..9253259a7adf 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1114 2015/06/12 14:09:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1115 2015/06/17 20:30:36 williamh Exp $
+
+*udev-220-r3 (17 Jun 2015)
+
+  17 Jun 2015; William Hubbs <williamh@gentoo.org> +udev-220-r3.ebuild:
+  rev bump to backport a patch that closes stdin/out/err unless we are in debug
+  mode
 
   12 Jun 2015; William Hubbs <williamh@gentoo.org> udev-220-r2.ebuild:
   Add one more patch to the udev-220 patchset so it will build correctly, thanks
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 4246f3676fb9..6cc1f5c57c6d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -13,6 +13,7 @@ DIST udev-217-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b1
 DIST udev-218-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd WHIRLPOOL a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10
 DIST udev-220-patches-1.tar.xz 1760 SHA256 ac2e778776db9dc13d431b871d5b67aad378bc4bd0b7108476500313ab9c8d2a SHA512 0cbaf904a5aadedfc3bd8aee735f700b2489112e51938ea54ed34a7fdef4e8f26749eb251a82bbc409fb631f1abc4f70c732cf9b2de7ced739efd3cfadcd5cc2 WHIRLPOOL 75e67af7592c9177d81f43a4aa403b1c359fd4695007f3324e73f65289f1d2b8c3575556980c77473717198eaac03b59c4e7e0575586bde1735cfe6942dde53e
 DIST udev-220-patches-3.tar.xz 2812 SHA256 885e3f4a52e7f178272da5591d22baf87954d2c8e6fed188193deff493b0ab13 SHA512 15a5bbd3f4ac95d14ffc7c95cd2494b4d74cfd95674f3b0ac3ed9ae955e88a026ad9be82e9229aaf81a2ac9649411aa178fccba2beee688f287e925a8bf3057c WHIRLPOOL 3f1f24eddb80d29da4cba0a32dd8697a9a1f7fc45c00207effe5d944f8ad4c09aae86c0d45dc7af560f42ccdecf0cd69267c46ddd853123bfcae202c5bd90d75
+DIST udev-220-patches-4.tar.xz 3432 SHA256 b17c676c7984d90bcafb57d087e77bc9e435a3244187f51e8c5ce1b3d4248ac9 SHA512 747e6d36faaed145bbe630e794bdd636d4e39d55fc2fc422d815cee3ab4aa579f15abbd1ff88c0448667546c8b04f72663cffa46d07861199076912bd009d25d WHIRLPOOL 0a349daae71b6ac95afc7414aa931f8aaa7328d2a0e7058cf6099b794531a1148bcd198f404d5d4bab7b250b1390adeb6938e8771da90fb7f56114560fd03a82
 EBUILD udev-208-r1.ebuild 15755 SHA256 213b2d12e016f6ee92703be1feb672b4077483aea7f2ff1b77a1bd96f6111e8f SHA512 08010a5cb9957978521f7a63d84acd9f727c70db5f865d73f1def5f4ca0093db17e210d32570079e63e9b42215fabd3f3b64665bd47f79837e939ccf6e8b554d WHIRLPOOL 3dd87881c67fae3e1cb866b3f28854e4316a7c5b1d9362801c4ea267740876e247bfb4d95019057d78025a84a6fa2f942b76409a2baa0c7f9313f0babc0a149b
 EBUILD udev-216.ebuild 15313 SHA256 7551bd46987fa8030dd89675b2d821cd868af9037d5e6b7e9458729a63d37fbc SHA512 64305d912001c0aa6298b033e913037fc720d080ba56d984e6134327c240bdef61a9094c446b9a0b2bd96a882d9a2df53e40262701bebb54adad3020af06d04d WHIRLPOOL 0d66063f0d1a298a102247e2dbce728e326597349c13f85a05e19e541203e7b6628ac91d95d02fbb6a4b335f7fefe262eae1670435513232ca74f6dc2a246188
 EBUILD udev-217.ebuild 15554 SHA256 cb3d882ec4cc8910fc4f8caf149903e4ff8d8e4f90368b40ad6b31d3a30cfeb0 SHA512 28335b988f562130fa4878dab8134243baf635caf2d07a1d33374cf3ca771f6ad87c31c938bec26dfc8ebb8030d010f5221f6ec2ff95a39ef046ed0214fe552e WHIRLPOOL dc6d6ea69ee22a0133450139e65fcc0e3547025fa69ee5f26ceb2dffb1952a4162c42c16dbf5a3d5fab0303f2aababf834b2cda1ac7de7be95ec51bb45f02a8c
@@ -20,8 +21,9 @@ EBUILD udev-218.ebuild 15663 SHA256 f62eea7e25c55b810990c559c985befd8a9e18642939
 EBUILD udev-219.ebuild 15662 SHA256 0fdad8ed3fcc5042e16767be2517f6ba3f557a540ea1a85ff6a835ab8087b3de SHA512 566f8d24c91271b6e5c4d0447fddd5c4619d1a8110655b141eb80668f412468a7eac3d231e34be54c31283450de7b6f3f9fbeeb5ad4cfc6e42a33a3a6cc93286 WHIRLPOOL 54f33c17bd78ab685a1912b1885a551e5565d8be49a6f00691255ecfbe32b52bc58775a8bc3922b1d605355ad4f61cc31bf86a80dd3f54aca7ea4ad9ca417ee5
 EBUILD udev-220-r1.ebuild 15793 SHA256 8fb809d0861408b956bd9376ed3c3ae5aa114933c8b41d3df0b2a51d1c83eb36 SHA512 b1fbafa1196c55a5da852fbe10155831633f75c440d7fe8e30d2429fe8361ad9413de639d6176e1659784163159ba30a4aed2af1afbce8a7271e7221ce2e36ee WHIRLPOOL 9d8091d3cae1d40db088703c8663c603fd9e02b43338f44d0f366576f52d155f85130abf9e28964a9b5cbc8a3106b115b26d644430f5a85420e413c2406f70fc
 EBUILD udev-220-r2.ebuild 15794 SHA256 4c3e0804ad6cd3faec252f9b1d1b55724ebd791b6832ca73670d8e10bbb2ae96 SHA512 1cfbc253411a9a16e24bdfce6e652ad48656976248797c3096a6f69df7af0e9c341024d61ee893b63255d35d2d1fc324d6c0da7d0a0b0d785b443a13dd2b46ab WHIRLPOOL 14a6c7742b152af3adaa2a8c070d3750be6372c1a3a68f292372711bd43a8a352531e787c8754bc8eea4c5633e444677c757f9e0123c93361bba7f61bcee95a1
+EBUILD udev-220-r3.ebuild 15794 SHA256 2fb0aaf8da8c887308de3fd121418557ca9fa52a2d991830f89c3b41954a9f05 SHA512 9b4ce896300ab7be9cf0f80ccefa2a80448ac2fc24a3d286cc1bc9fb9b6cecd6412dc1df23cde4bbbf796cc363fbe83972cf47c1b060481af436fe3d91b6e4b0 WHIRLPOOL 70c4e170873c65b76fcef8d2f17ec37e2e20e92769bba357ba76619a92d26b1f42fcb49ab875574943cb36dbe697f7fb94a1da6f48156fb9a15f7328c4ce3acb
 EBUILD udev-9999.ebuild 14776 SHA256 157068bd412e884a3397fd8474bcb45f213381337c41daa8d3d899c82a45ef71 SHA512 72bd8354bcc2686cb9a7b57d24eeb57e0292ff1b059473137825ee6e141ba15558aa977ac796fba80971e2b00943dec8698b81625ad3081fcd7424938783b3d8 WHIRLPOOL a1b320a8ebd7db6fac4f8791b2c3cb06e581dd1faa6c55f9bc3154951f9e004f4a470b805d4bc178c36440230711e0104558239417409268872476cb3153d552
-MISC ChangeLog 61781 SHA256 696d321dc8206b51702bb1fc8e9b04ecc540134fc45329487d0a4cdd0d0f0f50 SHA512 c1ccd8e15132fa2775de1790ba2df279a3a95ff8efa22fe2f976febab9541918dcb9c0e7a688f234c7b3c50b2e6686fca484459404378d577f5b5f6c22907715 WHIRLPOOL f7611669acf126f3a8cdf24a4b3895c83c20d7a13297856e768dc443f842ad56e9704d8c84d4742c7de6011093871342236653186f170efd4abd7f2cfb25cd73
+MISC ChangeLog 61969 SHA256 083868f417ae7d5dc3a25d449aa585b7155ab1b06c8790d4163d8c95fd34f4e6 SHA512 b4dfaa39dc78a69ea07683b6607a3183d1481b6798452d1cf66a473527aac3833f0409219f5ec786760ef3ceb25302e118a96e29838929d9b417f440433bdc16 WHIRLPOOL 79d6808885de398064abd8041855c629e00e0b36000fe1b55f9ca940d37f264ad96fd50c8a6ec2dfbe09d35e137e7e2bdbb3c1e1681875b1c0598a2558a2e3cd
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -30,7 +32,7 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV66CsACgkQblQW9DDEZThp3ACgrvtQNJAV3E6HytZlXhbR0+BD
-0uMAn3yH55vo3oeWk1PdH5IuVejzv8V3
-=g2kK
+iEYEAREIAAYFAlWB2Q8ACgkQblQW9DDEZTgioQCgoCk7R2d1Gd20pyokiIZseivs
+2QoAn2WvQx6vvdnzx+Ye71+iEdaStGCP
+=pXh4
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-220-r3.ebuild b/sys-fs/udev/udev-220-r3.ebuild
new file mode 100644
index 000000000000..c4c4da223d03
--- /dev/null
+++ b/sys-fs/udev/udev-220-r3.ebuild
@@ -0,0 +1,507 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-220-r3.ebuild,v 1.1 2015/06/17 20:30:36 williamh Exp $
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+	inherit git-2
+	patchset=
+else
+	patchset=4
+	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
+	if [[ -n "${patchset}" ]]; then
+				SRC_URI="${SRC_URI}
+					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+			fi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl doc gudev introspection +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	acl? ( sys-apps/acl )
+	gudev? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+# Force new make >= -r4 to skip some parallel build issues
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-libs/libcap
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-3.9
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+# Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs
+if [[ ${PV} = 9999* ]]; then
+	DEPEND="${DEPEND}
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt"
+fi
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	gudev? ( !dev-libs/libgudev )"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+check_default_rules() {
+	# Make sure there are no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	local udev_rules_md5=b8ad860dccae0ca51656b33c405ea2ca
+	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
+	MD5=${MD5/  -/}
+	if [[ ${MD5} != ${udev_rules_md5} ]]; then
+		eerror "50-udev-default.rules has been updated, please validate!"
+		eerror "md5sum: ${MD5}"
+		die "50-udev-default.rules has been updated, please validate!"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	if ! [[ ${PV} = 9999* ]]; then
+		# secure_getenv() disable for non-glibc systems wrt bug #443030
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 28 ]]; then
+			eerror "The line count for secure_getenv() failed, see bug #443030"
+			die
+		fi
+	fi
+
+	# backport some patches
+	if [[ -n "${patchset}" ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	# change rules back to group uucp instead of dialout for now wrt #454556
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	# apply user patches
+	epatch_user
+
+	if [[ ! -e configure ]]; then
+		if use doc; then
+			gtkdocize --docdir docs || die "gtkdocize failed"
+		else
+			echo 'EXTRA_DIST =' > docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		check_default_rules
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+		configure || die
+
+	if ! use elibc_glibc; then #443030
+		echo '#define secure_getenv(x) NULL' >> config.h.in
+		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
+	fi
+	rm src/journal/audit_type-to-name.h src/udev/keyboard-keys-from-name.gperf \
+		|| die
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}
+		$(multilib_native_use_enable static-libs static)
+		--disable-nls
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable introspection)
+		--disable-python-devel
+		--disable-dbus
+		$(multilib_native_use_enable kmod)
+		--disable-xkbcommon
+		--disable-seccomp
+		$(multilib_native_use_enable selinux)
+		--disable-xz
+		--disable-lz4
+		--disable-pam
+		$(multilib_native_use_enable acl)
+		--disable-gcrypt
+		--disable-audit
+		--disable-libcryptsetup
+		--disable-qrencode
+		--disable-microhttpd
+		--disable-gnutls
+		--disable-libcurl
+		--disable-libidn
+		--disable-quotacheck
+		--disable-logind
+		--disable-polkit
+		--disable-terminal
+		--disable-myhostname
+		$(use_enable gudev)
+		$(multilib_is_native_abi || echo "--disable-manpages")
+		--enable-split-usr
+		--with-html-dir=/usr/share/doc/${PF}/html
+		--without-python
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootprefix=
+		$(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+	)
+
+	if ! multilib_is_native_abi; then
+		econf_args+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# Use pregenerated copies when possible wrt #480924
+	[[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages )
+
+	ECONF_SOURCE=${S} econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+
+	# Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+	# but not everything -- separate building of the binaries as a workaround,
+	# which will force internal libraries required for the helpers to be built
+	# early enough, like eg. libsystemd-shared.la
+	if multilib_is_native_abi; then
+		local lib_targets=( libudev.la )
+		use gudev && lib_targets+=( libgudev-1.0.la )
+		emake "${lib_targets[@]}"
+
+		local exec_targets=(
+			systemd-udevd
+			udevadm
+		)
+		emake "${exec_targets[@]}"
+
+		local helper_targets=(
+			ata_id
+			cdrom_id
+			collect
+			scsi_id
+			v4l_id
+			accelerometer
+			mtd_probe
+		)
+		emake "${helper_targets[@]}"
+
+		if [[ ${PV} = 9999* ]]; then
+			local man_targets=(
+				man/udev.conf.5
+				man/systemd.link.5
+				man/udev.7
+				man/systemd-udevd.service.8
+				man/udevadm.8
+			)
+			emake "${man_targets[@]}"
+		fi
+
+		if use doc; then
+			emake -C docs/libudev
+			use gudev && emake -C docs/gudev
+		fi
+	else
+		local lib_targets=( libudev.la )
+		use gudev && lib_targets+=( libgudev-1.0.la )
+		emake "${lib_targets[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-libgudev_includeHEADERS
+			install-rootbinPROGRAMS
+			install-rootlibexecPROGRAMS
+			install-udevlibexecPROGRAMS
+			install-dist_udevconfDATA
+			install-dist_udevrulesDATA
+			install-girDATA
+			install-pkgconfiglibDATA
+			install-pkgconfigdataDATA
+			install-typelibsDATA
+			install-dist_docDATA
+			libudev-install-hook
+			install-directories-hook
+			install-dist_bashcompletionDATA
+			install-dist_networkDATA
+		)
+
+		if use gudev; then
+			lib_LTLIBRARIES+=" libgudev-1.0.la"
+			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
+		fi
+
+		# add final values of variables:
+		targets+=(
+			rootlibexec_PROGRAMS=systemd-udevd
+			rootbin_PROGRAMS=udevadm
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			pkgconfigdata_DATA="src/udev/udev.pc"
+			INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+					$(sysconfdir)/udev/hwdb.d \
+					$(sysconfdir)/systemd/network'
+			dist_bashcompletion_DATA="shell-completion/bash/udevadm"
+			dist_network_DATA="network/99-default.link"
+		)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+
+		if use doc; then
+			emake -C docs/libudev DESTDIR="${D}" install
+			use gudev && emake -C docs/gudev DESTDIR="${D}" install
+		fi
+
+		if [[ ${PV} = 9999* ]]; then
+			doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+		else
+			doman "${S}"/man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+		fi
+	else
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc" \
+			include_HEADERS="src/libudev/libudev.h"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-pkgconfiglibDATA
+		)
+
+		if use gudev; then
+			lib_LTLIBRARIES+=" libgudev-1.0.la"
+			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
+		fi
+
+		targets+=(
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			include_HEADERS="${include_HEADERS}"
+			)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc TODO
+
+	prune_libtool_files --all
+	rm -f \
+		"${D}"/lib/udev/rules.d/99-systemd.rules \
+		"${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h}
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+
+	# maintainer note: by not letting the upstream build-sys create the .so
+	# link, you also avoid a parallel make problem
+	mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+
+	if ! [[ ${PV} = 9999* ]]; then
+		insinto /usr/share/doc/${PF}/html/gudev
+		doins "${S}"/docs/gudev/html/*
+
+		insinto /usr/share/doc/${PF}/html/libudev
+		doins "${S}"/docs/libudev/html/*
+	fi
+}
+
+pkg_preinst() {
+	local htmldir
+	for htmldir in gudev libudev; do
+		if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then
+			rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir}
+		fi
+		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+			dosym ../../doc/${PF}/html/${htmldir} \
+				/usr/share/gtk-doc/html/${htmldir}
+		fi
+	done
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, http://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "http://wiki.gentoo.org/wiki/Udev"
+	elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# http://bugs.gentoo.org/246847
+	# http://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index db76a67d539e..005e1d015eee 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.1569 2015/06/06 22:55:00 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.1571 2015/06/17 18:58:50 zlogene Exp $
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> gentoo-sources-4.0.5.ebuild:
+  x86 stable wrt bug #552336
+
+  17 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> gentoo-sources-4.0.5.ebuild:
+  amd64 stable wrt bug #552336
 
 *gentoo-sources-3.10.80 (06 Jun 2015)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ef22e276addf..2bce189a6bc5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -85,15 +85,17 @@ EBUILD gentoo-sources-3.4.106.ebuild 862 SHA256 a0f88d28e7fedea5985d0d3ab5e5fa2c
 EBUILD gentoo-sources-3.4.107.ebuild 862 SHA256 23cef31908f9884ef074d818d375bde7c1fd1d174db5f4c7fcd5dc7c0bd74527 SHA512 c7e31d46b02870697edccb6b7c4e9b2a63f5ad312d49aef339bba0cf62ecfb537563fe07fd25ef9ea4980007bac2a1906353bda17628120cb83a8e179889c4c4 WHIRLPOOL 8361bfab0f99a34454edb4b2d6725a06922836bf698051c206082caf0a1424016343b35fd8cd6b17ae2150227e4d8513e702866854dc4099fbf7ded721e120bb
 EBUILD gentoo-sources-3.4.9999.ebuild 2262 SHA256 5c40a937692469c313f62bc8aa6909f78b65d98b7e8865e66c4b4fd9f51c40aa SHA512 f896d03460b4c2a470a94cc250d4e4970a7e7f6293e36cb407ecd767f147ef858790a4fb5535d4aa9ea24edc5cee8e87c529c72b32fd4016c0d74dfcc8711caa WHIRLPOOL 7d8c2db2f783641e744d4ade8328a2f2869edab5a8c7291a35e14a497dbcfb5b5430f86fba6ef91645433fafaae21497a851519f7f44234e3dbe39b161c61d5e
 EBUILD gentoo-sources-4.0.4.ebuild 898 SHA256 13bfa8777ab269765e8f11a86859fc22739717f37afecef83030981cf3d7f00f SHA512 8c2caa547bdc7be53fb292992a09f34f9fff19b5d410ce6c54f9068abbd88b9a88e33983a8cf8941fe286138177f661fe7130976a78d5fffe39ddd3617b54c7a WHIRLPOOL 4edca6517243b52de835e34d8821f890002cb37bfe0453e26448e68ffa1f6ec9e212cc6e570a53aab40499e31a8a894a9204857b2e2edd90f35f5195e1935db6
-EBUILD gentoo-sources-4.0.5.ebuild 898 SHA256 4447ec661608da068f02527fc70c847b7f3e2c857a385bd64779bc4fe3488c14 SHA512 4cee756fff1b0730984e9f12895b118c23443815689715dcc972e819a13fb80ddcc6aba6c770434f449815efaf4baa790ada3953a48c8af7b363e3eaebbefe7f WHIRLPOOL 984c5d62762879db32cdbf41cce227d8d828c7f9e93c0b662f680b7176db88719da88600e76784aaa0291c9043489c92259fffb7bba3b7edf41ab9b5695af5fb
-MISC ChangeLog 112658 SHA256 83123ab66b6ddf8f99f7b4d6ddc49324729afc78dba3c70c5af3287ced83de3a SHA512 9eed140eeb9faa1b783bc85e4c740cc27f86a68f0e21d5d4d5f4ca521797ebad6aa9bc751feb0903ce32d2d22e0830ade78d1ba9a8e47d0056c202af67bfadf4 WHIRLPOOL 8234cbbcb2b38ddbc54d8890c0d7c8f68e69338dfd5ecb846bd875bf7a1b7c2c274037dc1529e9b48b2dea60c26cc033ee8eb60905ccb83463b803e3c46f4382
+EBUILD gentoo-sources-4.0.5.ebuild 896 SHA256 723b8489d9b5eb2cbf11e76998ef1e9df12a104ba9639093a5979c50c195ff41 SHA512 6c9a6fe14db218dc52087a86b57083c6c76c4bb9598663c2b2a92c3356362bef962518b67529a7cd758ee19240450a9c6655b94f2f7dada29abc2841b59b51df WHIRLPOOL 0e191033a10d666c71834aba5d5e0cc65f61ba88fa44c55dba6906d3d752a1cdb0c049d9341c3817fb409ae645ec788626b2e7f0d93cbb4ef742555ac7297086
+MISC ChangeLog 112878 SHA256 b0e3649b4f2a7b772d7b0d2536ebeb9dddf5bf98ede819f17ade7d94b4a40f23 SHA512 91f07ac390afe5403a4c37cc43ebfb4ee958cdcc697938d1fde233dfe8c254288f33430022372211d5c963abc2fbb184d40d7d99da6dd06d03e5df7edbf0ab34 WHIRLPOOL 8c2c417be2ab7215d377445928ea2ef6820a70fd033329db125e575b363a165e2c4198dc6cd0538f86e8b0acdd6f15ee231d28d019e12fa404649c2f78208cee
 MISC ChangeLog-2007 91971 SHA256 8c37498df2246749abb2fd1eca05c396257989b91ba5ec0f83cedb25488118a9 SHA512 2215a9856bc1706abe21ad51d0af6176fec226e85a56ad8f54664d20a041bbe076359347f473a87c47904df2d8d2006d56d1535528b2eb7aa756f96ad9554876 WHIRLPOOL dd881fa7bbfc42ca35a46a0fe01d751b3373ac8f4e2ce5626ff26f94244d729e107f57b1be43daf3b73c2f18b090ee896d8a5eb38888fa9ca01097d1cbd46da7
 MISC ChangeLog-2012 101665 SHA256 a60304f93fc4644cdf0b068e586f6036d4463ea4b21bd745a8aa926da71db6ec SHA512 892085806f4c87f64db78e04d3c215ae6bca8939ffeced8a3792fe4a2476e72d2cc9dbc8a3b906943971eb853c337847e6a8bf976f9496be9944e216fb983234 WHIRLPOOL 590f17b5a90f48fa1733959500ce06fd72f95524b64b6abf508653a616961af2c0ea04ca2dbfe5523ff9dcd3bc67b3b24bc368eb84326d091ca449e558555f46
 MISC metadata.xml 512 SHA256 80143273f4462ac67194f8ef90706e5ebf65f3f30ff153b7ee19d2c155f49f7b SHA512 6262ba3cbc6480081a195024fc752ad0df27afe9b71d626d759f747a52a2a181d114379e463bd8741a843622556c1e46820e535e8fbe71e2790828370d70c5f0 WHIRLPOOL b4430c0590efa2c5cbfc85fed1386943f4c8d101dfc07a76ba79c37b1fe2fe4db21f65b58186e1cad1ea3987292c2ea0251f0e2017be018c020f7e2309b57bd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVzd38ACgkQPDPGULV25OOXAgCgxj0oxP4xCGfNcWj8KFH+tCab
-xRUAoJuHGjWbVd7hYmgkorb5R8SrGwvD
-=V6gz
+iJwEAQEIAAYFAlWBwugACgkQG9wOWsQutda2egP/bFjJgw1R8feRFrpOXd92+g74
+GTRrQU3V8lF2w48cUXxesUmWJcuecsQGVhxjxit/tGXCqUTiBHVoVAbK5N8RSAqP
+wpHUlEnKVD//usrBw+5XvBA0uh04QDSjLVsAMHlDlTkbNcWJdJfAXRgMWWGftHxT
+ae5VQfcoZlbVsXxuBfs=
+=hDx4
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
index 517bb1c2fb41..50aff5851c39 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild,v 1.1 2015/06/06 22:19:02 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-4.0.5.ebuild,v 1.3 2015/06/17 18:58:50 zlogene Exp $
 
 EAPI="5"
 ETYPE="sources"
@@ -11,7 +11,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
 IUSE="deblob experimental"
 
diff --git a/www-apache/mod_h2/ChangeLog b/www-apache/mod_h2/ChangeLog
index dfd50fee8697..a2bf475cd227 100644
--- a/www-apache/mod_h2/ChangeLog
+++ b/www-apache/mod_h2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_h2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.7 2015/06/12 10:32:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/ChangeLog,v 1.8 2015/06/17 17:49:23 vapier Exp $
+
+*mod_h2-0.7.0 (17 Jun 2015)
+
+  17 Jun 2015; Mike Frysinger <vapier@gentoo.org> +mod_h2-0.7.0.ebuild,
+  mod_h2-9999.ebuild:
+  Version bump.
 
 *mod_h2-0.6.6 (12 Jun 2015)
 
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 04eaf4fb8783..4125fbac7a9e 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mod_h2.conf 153 SHA256 076c8ff502ab71cc09895163ce79ef87d2deb8b08477609ff74ffaebe640c98f SHA512 318a24017144dc84f952c43dfb04cb2dc01a53a90e63272d7913bef8ade97f0f5fd838b61d4b0a86d56f60e86788218e09fa396556cfec4b937dff4029eeffd5 WHIRLPOOL 4e61ba3745a3c56e51a80103e5f8e9a4a3e317664b6aaea5743b27834c180f6e310377c82be24b303e7e85f423e13df0140cfcc00c8fb42b4af277b8ce0d18d2
 DIST mod_h2-0.6.0.tar.gz 2596664 SHA256 0d306096bfa0a134550adbdbaf4a1a067b66b1463d8041ba741322404f62ab67 SHA512 2b2e2c8152fc384d6f902859e33f65f05397ba61bcc91cff5c9c6c0e79384b3f5ad507c1878be914489a60c78942f41558fee571793e1ea8e82811faaa987223 WHIRLPOOL 150d23829718f7acdc476fbab3c7c106fd55fb574f1bac211d3937bbbd31f69b7457363eb261b87518e92997210ebd382e6870fa9481adc57428d1460955e1d3
@@ -9,6 +9,7 @@ DIST mod_h2-0.6.3.tar.gz 2596545 SHA256 64418954e7a99d963aa0fe8cbba23bfe24409b9a
 DIST mod_h2-0.6.4.tar.gz 2598459 SHA256 89b9ca3947d7c1ab23c92a38ec63cade445c7f97f15ec699b067d5f183f6c9c4 SHA512 e1f9944851f880bc1bd47a8e818a786b720c59d0703ce1675ba7f9d2947eb4957053764c5fca43b569416b6e4c3da4f940643eefeefe928c0c8cdf25d18a0462 WHIRLPOOL efb7868b89c6ffa33ad9a8641732285c0941d9d4d782082e1c4b4cada7840bc05374af74ae6da8074d87c7080cab7acd4414ac7890a62e174dc56acd2d2cd9b5
 DIST mod_h2-0.6.5.tar.gz 2600818 SHA256 bc72199c5245b3339ce1c8d7fd799c9f6e3224823b0d96dabd681c6fbde0f615 SHA512 f44a7aab3644f989cbb5117ae7f287fc005a9b09f322670b2de720db14d21755fe9bad66a186f7b9894c7b0b385f48c558fea0c27ce96b6c3c990601fef45223 WHIRLPOOL e6cab1f37c2a19d52fb927c77d8a5d50c867218202a863c9f897ff40854ab17990d3ff14a318942f37094d2b0f7cc4ba7b3e841e5d3060d6ea493ee9ae547a8d
 DIST mod_h2-0.6.6.tar.gz 2601687 SHA256 1fe3bd66cd0f0663fc784fcda5730b1bfd880c5ef105556efd7489fe7eaddc9d SHA512 6328d45412888e88909602d4b380d7546e4dd0c006f3ec5d1a8078fedffe22253ab4218f13a5dfa3ddd35e6f9d83eba99d417f90149ea30db9645ff2a67f5d17 WHIRLPOOL 8144cb4666111bef40e3440493dbff22044e6872c31e88f29f9b7c0e6abde6b1b4a0ba1d65cca6fc1a4d57224309805613f2d903413804c2271205768eecfad6
+DIST mod_h2-0.7.0.tar.gz 2619539 SHA256 b5f79d5c36edc686ba277c1442ffb43419aa8409345ae7d372137fcab5d216fe SHA512 da85e8154879cad8029487c7eb3d8f181da6661dc266e3d89b76f3f8fac2951634c31e8431ec65f8949a2094bc1a4d41a2ea62176f6f2790270d866a2af3ae5b WHIRLPOOL 79936daebf71508a3a33903f2aa43b59dc2410edbbb54a6b0079f52dfbe03c27fb5388e52681aced665113b18dcc5d20c0832120c5e20d9c725e7924b3b5ceca
 EBUILD mod_h2-0.6.0.ebuild 942 SHA256 a0575e70d35b59bc8ecea22b3180d3ed11bd8905e4784722e6072bf60cc27e06 SHA512 7827b3bd50efeeefe03ce4b1c9c1865e8e735aeccd30231ca36644f61c0f6582b8e91b6fd0e9a4b743a41e9f8b1367654f0614f75f99f4b7d84c68ef683b3b9c WHIRLPOOL 3845b7d765d4e1722f90143f62df4c91b1b9e3d66ea879d325792947c8e59c2c0d8f43265b1a2dd28da2a54390ed3e1a1356cf54a2d30d13ba6d79d7b9e3ddba
 EBUILD mod_h2-0.6.1.ebuild 977 SHA256 217ad711ba3429e6cd060eea57c73701e43196e768de48bc73c14429fe889a15 SHA512 4a61a41b0b8d7cbbb6a0192cc272ca49ccbc39804806efff530787af9a35e0315d27af0cd3ef6a51f6cbc1a50c210f1ad42aa5e33252a9211c47952c0fb96c13 WHIRLPOOL b05bedf78de0a3295944a2768273e949f0ca70d3902d1d9e38667ac89fd8e6a0e02d7fb8d544fa138f48594b175b3cb10e1bae69d1872fcaf7d0ff5c939ba981
 EBUILD mod_h2-0.6.2.ebuild 977 SHA256 7391f646f4790468d594d19f912c0b1ced353404fe558047bb0e687274ee9b01 SHA512 091f9b0329555c0ea0ab1d19d0009d03f06ebc9555b27f0df7fcff39db7ab967fda687fa9cdae193f6c4192342c4c0dc90cafb5a7ded50324570d1b34f935232 WHIRLPOOL fb7909eb86637eca6f222173e7e9a9ce79b7abb28dc38a8717ab282494c17497cf82d94d9963d6c10d2ed54caa435bbf5761ba9514f348efb7a0dafa235403d3
@@ -16,25 +17,24 @@ EBUILD mod_h2-0.6.3.ebuild 977 SHA256 f26bce4c3966cb1062d753fda51d213bf4575b21f4
 EBUILD mod_h2-0.6.4.ebuild 1338 SHA256 89775b9428dbbf7bb94eded4cf98a74d75d35fd6258bfd1b404e677f1a9cd43d SHA512 d9a46c935f888c6f1fa842bd4c67274aeb2cb73a204fee24685890c62f3f71a0798d88aa5c14dcb897e5fe19b82536d7eb70634d2d5286ec74e5e4e1a928b99b WHIRLPOOL c5ac7d2bd9f2209e81f18f4190b7fcf9458d2ce20032352f180c3b4ad89de946a7ba34c573df42514f58b7414b6b50ee55916dd9bef1d9a2351a7e410562f48e
 EBUILD mod_h2-0.6.5.ebuild 1338 SHA256 30ff4ed598cfa7c8313a195928dc78aeb3dafb95018e322d855a9fefc4633e22 SHA512 f10297f074738600a89ec6f6830f71da95c3a8e5433479ee03fd85a00c6cdbb85ebf0ad617d241aba9f7758fe0d19edf17ee3e237829fa8ec933ebc3b380042d WHIRLPOOL 0307066cfa4360d1cfc25242c259441006cc15eaa47b369b808384d5c2e780ec6410fea605e115a57925ed1f778406efd8a214b069eb40ebfc25b6c7d75e26f3
 EBUILD mod_h2-0.6.6.ebuild 1338 SHA256 ca1ad24507e76441674abb68d1340e693bf0f69335e51932475e9fb049ea7b6d SHA512 08fde26a78222c9b18cccd744bfbceb65f113c877a799add42674288c7481a5e996c9ac9d83d88ba4d4c71ba537af8370c0ed270b404ba452f81d4131d191ec9 WHIRLPOOL b95eca62a46ccae24c45617d694977f84ca8217cd0930ac542706b532a84263fc3237bf45b184dbca32ea5aa5010c8d29f5517abe28408d355751ca70e9179c7
-EBUILD mod_h2-9999.ebuild 1337 SHA256 a4aa414fc49cc44c716d06bd99a2cddc06ffaec598dc3ccef4cccf9a48b5e8fa SHA512 2660198ce64ba75813fd52d3269f290ddabb45b264fb528378d6852fef3289feb817b059c45e593069cd661f35e619cc6dbf7fc3e864ca9ce2a6b0ba7d9a5d32 WHIRLPOOL e541cf14d35ec052ab4c1cdf9102c4b17cf202c575f030d70717aeb8f2f105c34e08bd2af75e0ccd3f171481a3a367e258da308781161584c2386840fee6f3ba
-MISC ChangeLog 1289 SHA256 367d17b42ec2129356bcd3e57b22df24fd95da5aa18b1c618875e1ec3766cb6c SHA512 0284c1d51c67c8cb39d126c34e3aaadda124a85544b8174ccda244babb09a6a3c06aeded2b8c1ed8d4d8869ed9f7a04caee0b8677ada4afce2407f56e1103b60 WHIRLPOOL ba74f3d521af9690e1a844cace3724a030ede5334bd2b73a1ae07fe5cab71e6a12c04a88afafa5dbbc98cd466f9f9984bab486771b9fbb2817c9b275c40170a3
+EBUILD mod_h2-0.7.0.ebuild 1338 SHA256 8f0e502eb1c9428c18069cf4d3a44e61dc54c2957caf3aa505e327b5a926540f SHA512 1acfec73435508b142bdc3639ba1066b6e7dd840bb515c35a34b43a2567e948e5402d0b711c158844de5787b4beeb70ca9c90f98b53f46c8cdacbd2eee74e41c WHIRLPOOL dc627288a5eb6bfdc68c1db3657a8798e78bad1dfc7afdd88e936fd7e2e7c4d9e9647fe816e42f78d64119aab2cd6d872758df647591ef06558a4a18b1175443
+EBUILD mod_h2-9999.ebuild 1337 SHA256 cde51d37543331495f775f33ede781caac1a2d6f3061a77ae64e46fc92806b28 SHA512 78d64185a83faa4b80e6861df2c59c9a1e229d234f20ff64f3e950690011b9e682e94da6e99b070d5536c1649dee87d85bead5d8530636afa7bb5c7cb66f2922 WHIRLPOOL 245ec46c22e9a7a2bf5d2d8e9d9067c19c08705329cedb0ed36b3de7e76fb0fa51a41c3cc72b18d5650245251d87f5e253927b2eb6bde9b48818603b84dca6da
+MISC ChangeLog 1429 SHA256 a983f42ca75550d6c2223cec1658477c5fbaa3f075fd2c69af7c66f8d4a76b40 SHA512 cc7f785a85fd55d874ce3debe8178b7aca7419870bbfca3cdce1324bc96dec3984f380f3245e2e33fa4efccd31c30eb731f2d971dee1bcd810555b0f36223de1 WHIRLPOOL 8aa79a5f59834efbe01ef354b7236588fae4e5f8b8921854437642ed370756c0742e8e2fcdf5cb0e4301a2ddd3b858bd409825fe42fbf6a279dd54e96ec7cbb7
 MISC metadata.xml 280 SHA256 ed8af2effd5fabf11ac96b6a82d8a1e914d503f308f39be9989569b8c161242a SHA512 350d78c520e21848cc97d716d905b54e915bc25aa122cadc8df7dad882bc8726c0dc3189b316ab217b2116eab3e40ca7e9224f868ceb900ce5741dc1f3a2e185 WHIRLPOOL a8238ffb793d5f08ccf8f84e23898682550e769fa97a0271b01d243a5fd2f6b346c85a91a14b2f36d5efa55a2dbe95ceb0597da79637654604c96fe6b06f45f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfy0wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwa4QAKDI14J/6O/mZHa540fK8yno
-Qia5EOr49TUFbBZiBK0aNKKYYZfXb/bIVZne+12kfLYpUR83wseAT/b4qOFqU8Fk
-kFQPDlZvnY4goV8BBpKtHeQktPLaYOxk6X7Go1k/Oi0mch+Wk6cNFjpYkNL1PfSz
-01UC2diY6Rv2DDc9+IJmnoP+qgrgym0LvSMhzvcyGTYl4hHPPPTMGdL5VmbNYOgq
-rov0vGKLXy+SOde/9SJaVbuE32tDrw6OMJslPlIexeGvChIDJ1LrF8K/vqeUU1QF
-jVjKUpb1eZQlAF9bHCyPgaYW1I2ZHhnzAiuea2Y+dV19dvXUulB9BELud8w2xgS9
-99Sr8VCkB2TvTXzfRGOhQnEDWXdf+Plqp5ajXIQdRiMVl0FYggnX+IVif0ObN9HO
-yWPvg/GvDVZ+jD+PLt9yg/3/pIWv0Cmgs/U4agdh4vxEEPOz2N3Whb5f7xcj9JFe
-2IzzDQ3l279VpAIYMVTXFx1zGm5OCRZu1EJl1FkUkLXuXaUSLEdxEmvJYSMJYtCq
-i7/xG+BULl4m5PBx0/5IUxZ46FKeMlRKh8v2hQmv5hCZjl/VPMaN7VT0SHjr3UR8
-SuanjIefc1i8QF361DtRSrGGyVzfvlznYadkavzEDNLrdGRLExD7DTdPcoZUf8v1
-odAdn6/CndrRdOoFqGIq
-=12ao
+iQIcBAEBCAAGBQJVgbMkAAoJEPGu1DbS6WIAqmwP/11jvyDBpl6ErpgvSON8vtfu
+PWkCuM0pyKLWD8E7INZ1LTeItfyOeY2EEIYQeM86aE71VXkX2CMoRWSZG8Y3vMDL
++ynK5D99VYp2KBjKof6KOFKE0ieYzg/8kA7YIGsvV/d+aL4tBMhMLthCV+wv9mJD
+ZtqzZw9svVk7r1D0AEk7B600bl8bVWxiQEV8RZGaG3htimyPU0taM1bKFB49zg1/
+5K2nhrlDcPdgWeEe3bqUk9+HiXwxG3LQOpJKAxBWi0R0lwcX/nTYj1LV2tJXdUyC
+LUbbwV0Sev7vTk31hhOZwQQn8CTQZEjp75fWowHGTWJ/ACIx658JLcBG+0JBpLVN
+8syk6l3kIQktkGIyazGOjyi44x8AMbGZODNCGmL2Y4/25Ok1zBAT2LL72pWqauPW
+3Exshfcs+9zzn6Kgtmb1Y2oJSgfNNZARysPleKVLCP/O98ymQwY7cpW6/wA3JQE9
+v1KVRNeAN/EgjmpCK7OkIhTUpfCzwNNVDDdJYOQq2PR69BP/tRiLLxx75PO0Jyjd
+d2sJVYE8laKJ2PwAoXKTVIEk5eOws/aE2dy2Rp3csbFSsfh/YZRmWangtwNV7uZw
+gix+TjNlfHmoSTyGc8UKLxgAHtOmA/D1Et3LcaaW7HrGbY3H0/AyeKXW0Y0b1d0v
+5js9C812f/q8JxzUPWQP
+=dYaa
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_h2/mod_h2-0.7.0.ebuild b/www-apache/mod_h2/mod_h2-0.7.0.ebuild
new file mode 100644
index 000000000000..cdbd7b3b5383
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-0.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-0.7.0.ebuild,v 1.1 2015/06/17 17:49:23 vapier Exp $
+
+EAPI="5"
+
+inherit apache-module
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	ssl? ( www-servers/apache[alpn] )"
+DEPEND="${RDEPEND}"
+
+# The mpm_prefork module doesn't work right.  See upstream docs.
+# The threads logic is to handle the default eclass behavior which selects a
+# default mpm via the USE=threads flag.
+RDEPEND+="
+	|| (
+		www-servers/apache[apache2_mpms_worker]
+		www-servers/apache[apache2_mpms_event]
+		www-servers/apache[threads,-apache2_mpms_prefork,-apache2_mpms_peruser]
+	)"
+
+need_apache2_4
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--disable-werror \
+		--disable-sandbox
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_h2.conf" "75_mod_h2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
index 6cb442be3448..7e561c4e349e 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.3 2015/06/10 11:30:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_h2/mod_h2-9999.ebuild,v 1.4 2015/06/17 17:49:23 vapier Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="ssl"
 
-RDEPEND="=net-libs/nghttp2-0.7*
+RDEPEND=">=net-libs/nghttp2-1.0
 	ssl? ( www-servers/apache[alpn] )"
 DEPEND="${RDEPEND}"
 
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index dde835702016..46a48a93677f 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1254 2015/06/12 15:28:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1255 2015/06/17 18:47:11 phajdan.jr Exp $
+
+*chromium-45.0.2431.0 (17 Jun 2015)
+
+  17 Jun 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-45.0.2421.0.ebuild, +chromium-45.0.2431.0.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-45.0.2427.7 (12 Jun 2015)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 3e91f950a454..6aea4eb23bb7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -18,32 +18,32 @@ DIST chromium-43.0.2357.65.tar.xz 309208380 SHA256 3f8f87d982b5ee14862e49dcfa44e
 DIST chromium-43.0.2357.73.tar.xz 309192528 SHA256 489c66bc6e5d0f07df5b446af0903bb690e3333a95cbbb9566c75e2990f10dee SHA512 3fad45ae54033c8376ee8953c1a6c7127d9d58ca8d9ba59a74d10ea5d725515bd0bac1d642448e9949b2416b597127fab04e2b7a150814e77f00be359a390208 WHIRLPOOL 68b833e3f9318ad43763f2fc25cdd611a17cb4930ee6f2080aa941a837d891e814ccba3c20f5f18806f66707eab4339a2f11b4cd52d8872896eb610b3fa00fe2
 DIST chromium-44.0.2403.18.tar.xz 307086188 SHA256 a5abaf7c2527ca4f629c35230543e6d2e2c40026825b1380ec35447211644a4d SHA512 505f40dc341779d7be00fcf6ae5901a0b83a65d37d60c4deddcc1af30b349a0d6d931abab7c9c504c4de6e4d9b9bb46bc45c2d28638c729e7731a23e91f7e27a WHIRLPOOL 613dacd01449cbb15b80a9068878fe0006d88ceaee2ae99b0a6245a9b2aa5a51b4e09424fe54ece6e34244e6f0605a28ee051c02bfc5003982ef745981edc779
 DIST chromium-44.0.2403.30.tar.xz 307231808 SHA256 7e524d95841aaf9596e04720876015f34b9f80cb6394fedc3e29108987856026 SHA512 85bdb45c555e5d54ce2a77b875d3bb0631e513836464105f3c24df04b79655bff12136e7976369ed6abcdffe9b0ad4fd28c3bad166f399e47669cdbaf3c79c45 WHIRLPOOL f19c220707572cd729ccb294bb85ef5ec579fb2c0c3c918d6cb1d8b29f0a477961f49e404920f7d459491cac314a2c75c6312625cbf695cee8d7f676f48300e5
-DIST chromium-45.0.2421.0.tar.xz 310110988 SHA256 53c34e85619d2c1c600af339c0c8c0dc8cb2ded49a0d7677eedb7258810788e1 SHA512 e2d0c2eb6655f6ab8a7b85013a0b1238a1f58ea55318c1d9daf75c2ba62bd31d8749249a31a9a9da05bdeafc21a9bdcc6f7f4cf8091d8ffc5c6a809a7ed67fd4 WHIRLPOOL c0c834a88f6be38caee7e649ff14a02d6b19f2336b7403e121603dce77679c2116fc17a53ed60088b98dd4aaa197829c68a50554cb77061742fff3d594600488
 DIST chromium-45.0.2427.7.tar.xz 318825052 SHA256 049fb3308ac9178333f3cf8541552f738e00ce6ca914678b8eec2be22a466c49 SHA512 08a976d3fd2c3e6a93fab07381a168247a5389e0821005b7a22dcbf9916fb0bf1ce76a332c6bf7054abe0fe03fcec1a0174a94e6d8b43ae901de58d34f8cefe0 WHIRLPOOL 1b93969b1e217b3a4e8483136dbf517d34a35564c27dbda2b5bb02a09ebe20df904e9a1e295885199a6cb9a654026c9452e05a49cb2959845aca41d9b457b106
+DIST chromium-45.0.2431.0.tar.xz 319453440 SHA256 4a3aca8e29b7c1da879c3bb1320118cf15387c5797bc55d6378a878caacf3447 SHA512 70c21e5c0e36c4fdf607b4e588f553147681970e3554519d1a03037145c90a0ed1167405ec8413f753ec73c5fc7af1c638e6168aa973d129b4e2ab813eafd20d WHIRLPOOL a53114b909d7aec060c36f40936315aa58eb02cf30fee0d4f4dfcf6890ed14f9bca8ad277df65c8f98c3998643e914ff3bf890f17ad07538c021e309d5c45e44
 EBUILD chromium-43.0.2357.65.ebuild 20187 SHA256 1e4fee43356524e291396825cceecf3748c722ff2ea392fdec909eb54183962c SHA512 3dfee723d38bbabfc0f98cbd11b057983e434d8474b08b5d29d1900718b7a7ca20781976c9e8155ad6f3ef705ee401064e980bfafb094c550377c1653c6eb2e4 WHIRLPOOL 8b0baa1e8019703976c631108cc0dac9120ea52b9e15ad6ba524f11221ae3325a221b2ee2939f374f1f85b384889401c8efdd1c98e623e881be8c9e5cfa0660f
 EBUILD chromium-43.0.2357.73.ebuild 20189 SHA256 f769f9f82bd1d1b3589b09e978d38be1f2f1b5c6c4108cf00e1891eebd18540b SHA512 3ef6c7e10899f0084f4a4b3ce3e929d8404ee842bf240b4e969b36e770f18728211692b16f222a20cdf902ae81449d830296618f4720ef456047c339c231edb3 WHIRLPOOL 946752c723b339cf646b37fa4981028c935ffabcd0c8c5315d10acfa1cb0a7a8394686fd1556f093f422be98dcf5c6e62bf40d759c56b6c29ebf3a08fecbd37f
 EBUILD chromium-44.0.2403.18.ebuild 19414 SHA256 7e353e25fcd8eb1c38301d5dd8867b63837b368e4ede5efc5482380c1dfcbb74 SHA512 a62294ea0bca837ea89efd395a1ee0e27868cac1bb0c53ebc00c654fa61f085020fa0417e87466553f2d78ee09c80edac53fca65a5eb51ffb7d96a96faebade9 WHIRLPOOL 7eefd1dbbe1ed3a94ce5f70b3debd96121ad1ad5c62a18b3e41ac170f8e58b85eae14ddf868aa38d5ace014fba8907e6476e4b842a95de906e007065a018d764
 EBUILD chromium-44.0.2403.30.ebuild 19411 SHA256 8378d5e1c871fa95557a0a751ede7575aa308fe28141f3e883361c766a3c1506 SHA512 ebec5f2820d911366ec435557b551faa853ae64d2772786f6c69a267c929b620cd9b19d4b0813c62eece0fbc24f554221a304ed9ba4c3656c8c8c7810e45a85e WHIRLPOOL e9ba0f1fdb0ca7874c25164138bb667326120bc304224a6dda7965ef027571f348492c2c2f9a8dc38e885357caa31b7a506afe75daf7cb3e4fa17577b76ada7c
-EBUILD chromium-45.0.2421.0.ebuild 19438 SHA256 63ffdca352dddd03d24c77d2f4adf5e3d850f9a56895d66157f148ed72b5229a SHA512 500dd5d181b08d243d138bb67e9e548571fd8b84780facc827abe82f746c62676062af93e609752f7bc108ef68ba40f2a935a00dbd005fec34ef8514e4bb8896 WHIRLPOOL 1df62d5f7b84920bf21c809976a2abc06861efeea2708239a6a15a51b33447697e976fb472d660e0dd10ecea92eb5e8ba98ad063651853dc8d835f60c21af5da
 EBUILD chromium-45.0.2427.7.ebuild 19438 SHA256 28a163c7bc7dd7017df94effa904dcae269db0cdd65ecb5bb1b607c574038319 SHA512 ebe6fccad6394723628140775ba1a0173584660e91e84452bc4bf432c4142851c054e680efb3755153996335d38b183e72f6e6a2e76ee8958f4dcec7d5f5299d WHIRLPOOL e0551ee24b7d8e332fa4d39ddb7d74cd1d279a61e321f88a6559725d76c123a82cd56996fe01feac1e9942f93a47e13ffae19302cc6b5a889a6dd629c7018522
-MISC ChangeLog 14362 SHA256 d3c1903e8b788fe34da0db6227f7b8b6c3c9b24e5f6c6523fdecf4cf38dc5a97 SHA512 29366725cf3b225272af8f5deeb049dc9a7fb2639330dc73758b70ee3949c060be861987bc27368000ab3b11516636532b013899454a6377d9412d349a558622 WHIRLPOOL 7857a7969abb8e313cc0ba5fb4730acb0f47bd1c576a6913d6312390311c03b59a6bef9afa99e884483b7c5cea92179c57244810805b0873c44930a77e758a18
+EBUILD chromium-45.0.2431.0.ebuild 19423 SHA256 90c0b14d44446da8be55e414bb0d4b9661f95895d2ec0acd87de5221433c5f47 SHA512 b9cf314388933607fd7f51943c5d4acaad22ff82d05e51be1ce424e41a886ffe3a8f18d296aa3ac1802bb0498133c616e76402869bea9d37dd74da24004615f7 WHIRLPOOL ea866f9b24dda174cf9fe9b94843252a4ddb801f3d9c39a3d43f4d0824e73e43d185a832eb735083c1fed6718d8654bcd31243f6538a6de2e4b75ce3efa03af4
+MISC ChangeLog 14549 SHA256 25d3bbb837d3c324612f1de77cc4141bc2d9b8f1fef1de375fc305cd3d4ffb0a SHA512 1e1935bfe75cc01d0b2da31f8d2ebee34f556a352acbe001fb75bbbfd1f277a98243dc9d9e84ede59d5215498c3d57bb6a48a64d655970125200587b52c12186 WHIRLPOOL 73fced226f172a57be018d85f80a0dca316e02f104a182a70d4ab40791cc33bc8284886c388c2566935e805414ab48a83d63c9cbb708388b65b87783af757426
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 719 SHA256 edbbfa7039ad145f0f22eeb1dba7f7b209d2a58ae8cb930e2e92772e71cb2c0a SHA512 b8cd8c96a404c4e37a9d3bf3652dc291b7bac353e6f76e7989ffd65fec774847c1c9c9bb6511d0532bd2ea72921b60931b0c5cee40a8e20022e4edecebcdf47d WHIRLPOOL 097471d7c223a4a17417ac24d04a98c6661ad758ad83456333724017592a41a505a391ea8296a8de062e9271b41649a588f9f185625e485a34a389f717664652
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVevqrAAoJEE8aJVXqcZkdbFEQAMKtpkCIX4Ks9zOj8TGqUYGj
-7nJI2++2Bu+XaW9utMpAaNsy+7DXusKCYj0WkKfD591XZMhAS1GD5OY2q9mh9LEG
-8Z5T1erHxHTsoJQyIy2mZhZyqWTOkBl1/0HM19ofkl7gX2qK5J+EJsge3aId7jK8
-0RThNzntSjRNxloWPN95wygJdU3Qfu0wBfEQZoZQk86hCjPPrUM4q3lg695/iNY6
-z5dp0YsEcpYuIV8WpcLmkB/HljH3wfZV/WGTdEDJ2zMZaV0Sk7F0SFf6RDxKFreu
-UhiBap3GIdUacI60yQ1CrMkWj8CDPBcYNixQiCDWN+VmXNC+t6rRah6Vc3ywrrEQ
-lIuf2EJnAv0CL8kJ53pHtu5Q7ay+g1f3vqgutMLixurY358j5PtYVn3t2Y1CCCQi
-+LnFtCXF2kwRPLaBBQWWDg+gj1SfvUGYWRp/qGXs67cTbeVX12FXWWh9vfjbh/iR
-j2YL2sauQEhI7HwPiMEOiTX57jPLw3kXUSX4IhispIQiASVZ0hFSpQc7eOcN9oMN
-akHjJ9Dcseddit+6his2TJib/H7Yr+WzA+vcM9Z0RuWl9hyEyPRjY7U1dzAH8vQ7
-CxIjjFLurP8PLO5awlCshQ7goYEwIibk6PfqysOhTOKZezRgM19+5TG79zwKIjJs
-LDJWOl6MigFvnGxm7IN7
-=H1YY
+iQIcBAEBCAAGBQJVgcDIAAoJEE8aJVXqcZkd+yUQAJcPaPN3+QFmrrX+r2sZfqtQ
+hAES46u+Js00l5gUFceADZoFekVy3Y5iQV7WH7rAPQvUEB8nrweMO9WlwrZWbJv/
+xCB+lgzgc1fOoc/ATDs1TO+DOzG1tq2bXdjB/GS9fhbsQ0lu2Jzk4QC+XFwkHvnb
+8q93RK4Vv0xkw0D2XZz9S+unTEsyHdLMkYQLjrhMEcX9AuM3LWa3Ie+ArVYXPdAV
+Ba9htnR84WNWVeHC+b/F9R7bVVcmGs8JXPniTzxBGTpxs3ZtKjMI5A3QX3oflh0k
++IwIq+ZO+wxd6uwDrnpa44BrgbjLDi3QgPPzDxy0ufQnYQikalutWIVdwaYblTog
+lfNWIXyAEs529cr+sGl1VosIFXoMBf6y2bVHZmH6Q/ic1EZdn1JiQ02VNKkx94Hr
+ubB04C2ApIP7HmWmxRpAXORrcb+GufWg1bFo62uQy2Y6Aw8xVEoQdWNf2g/ii2nj
+RE1baVdbTaAnM/Bp/Rn/IlsOYbLRVC16x3Ums5tV+CSggrDUr7p2Z/yseohd8Byx
+Xm4AMKfm+uB4jE6lzfkbZTW8D2+7hQQF5TCkDk3b9KbskUZ7AXRSC0a8L87RDMx8
+mp5aF1alg3okbOAKY2yOLT0QUDTswv2m/MxpRdpuSWRfr7bfmuvMTpF/WuxdrJkO
+r19WZLt3RDlWLOExQRtr
+=53Ae
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-45.0.2421.0.ebuild b/www-client/chromium/chromium-45.0.2431.0.ebuild
similarity index 99%
rename from www-client/chromium/chromium-45.0.2421.0.ebuild
rename to www-client/chromium/chromium-45.0.2431.0.ebuild
index 9dea02d1e46b..3d0a84ffb470 100644
--- a/www-client/chromium/chromium-45.0.2421.0.ebuild
+++ b/www-client/chromium/chromium-45.0.2431.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-45.0.2421.0.ebuild,v 1.1 2015/06/08 20:32:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-45.0.2431.0.ebuild,v 1.1 2015/06/17 18:47:11 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -216,6 +216,7 @@ src_prepare() {
 		'third_party/cld_2' \
 		'third_party/cros_system_api' \
 		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
 		'third_party/dom_distiller_js' \
 		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
 		'third_party/ffmpeg' \
@@ -579,8 +580,6 @@ src_install() {
 	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
 	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
 
-	doexe out/Release/libffmpegsumo.so || die
-
 	# Install icons and desktop entry.
 	local branding size
 	for size in 16 22 24 32 48 64 128 256 ; do
diff --git a/www-client/opera-beta/ChangeLog b/www-client/opera-beta/ChangeLog
index cb9339c0af69..6501dfd1ddf7 100644
--- a/www-client/opera-beta/ChangeLog
+++ b/www-client/opera-beta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera-beta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-beta/ChangeLog,v 1.25 2015/06/03 05:02:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-beta/ChangeLog,v 1.26 2015/06/18 04:57:07 jer Exp $
+
+*opera-beta-31.0.1889.16 (18 Jun 2015)
+
+  18 Jun 2015; Jeroen Roovers <jer@gentoo.org> +opera-beta-31.0.1889.16.ebuild:
+  Version bump.
 
 *opera-beta-30.0.1835.49 (03 Jun 2015)
 
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 603d509de6ec..43ab3e03b5a9 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST opera-beta_30.0.1835.49_amd64.deb 42193734 SHA256 712b507b71505bd17a04f1f7b941a16b9a9ff575e67494d2e26e4adcd047d442 SHA512 db1ba21b201c03281a764a085820caa9a45d08f3601066bd7e226e9763693224f51077c195c536892733e684f86832f9131cad3605f4080558e991d80d9f5676 WHIRLPOOL 28c1b969a0b6d22d09409d383be9a762293cd33228129138b009a455e42276c4555bd95b4749d5587c2c882609723e217bfc410c374b5fe07d0c9d6230e32dfc
+DIST opera-beta_31.0.1889.16_amd64.deb 42649554 SHA256 6239dc0c843858a19c4154942b9f28988285d5754daa1574208d5b091f09c8f3 SHA512 e2b6e39870458bfbc46ae4f2c56e52c93024e3953320ed5b96cd449a420e84e5d7d760d74112659f5132bfd0bbc3d4ffe6aef57b4b9e846c9089f6d5a66991c1 WHIRLPOOL 3763b3ae7006985218a67e70dd100be0c13920f2bb2a90249325b5386d749292be7b554db7700219ff1f25cc0950870038faf1a29cc2184d5b15ccf8db01edcc
 EBUILD opera-beta-30.0.1835.49.ebuild 1969 SHA256 a7766fd5259c6a66b764981bf61770dfb3ce87a655365676283736ac1768aad3 SHA512 b714af25b3f530793ca646df73fbab44e2b61087a6fc7f32ba40ac24c53b1665ccfed9294b9120f54dab2f9b42d6fc693ddbbc146df6da759233396489d9a80c WHIRLPOOL 93d6cbdb42694b6bbba293319096a8807b897cdad4e27657d690393b129ad6d8f446d1b8a25ab6979afb38cf76f99fca764da24e280a02ebfc4d37db70f38523
-MISC ChangeLog 4530 SHA256 ed9a1ce81a13be4c2e4e3ff125476f20a33e50d3d49da09d7e274a64e0ef4b05 SHA512 f6f5f4b3f0358298a8c7d8432adb91d457ee2cf380e2966222b8a4257c9e7f87ea32cd50eb205669e97d05b6d60d3da09cada2bb96f6abe8541b47968a0c4ffa WHIRLPOOL 1bdf56044c59ea13d9543b0996570dfe09db7fa18f127fa863db27518daf3ba53605b3bc5c71357d3e14e8b68351b60250f22a88c6975c42b3af26d0f44db8e0
+EBUILD opera-beta-31.0.1889.16.ebuild 1969 SHA256 3f14aed058d9d2bf683939cc309d0b1af6d8741249638af34e4b4a79f28b2e3a SHA512 e5db7b1e1fd4276ec385089ca89101efb1e600650c7b41fdf887cf8e15eda955346fe863b963047cbaf520a2f4ef650166e1a8649e768294f6ff59d6bb1ffede WHIRLPOOL 4e23099b147ac6e7cf8eac86af077aea1a4cbdf94f0ed9324b6d2d8557c58f3da81f53e7b1e1ac7d008be4dc5b0704e9af59bb0ca6c29fd8ed2c3d3fc82f1b13
+MISC ChangeLog 4667 SHA256 5c187faf72b730ac55749f41b7796a849b9185639a722798fd2a127069749862 SHA512 6862e0cccefae9e7b7c2c95ed6561f39f0248b6ef42264ee95b3f21f1aefda50335b9bbb314b25d27f5390999cf977038fa385e644089d830a5794c2d79003bc WHIRLPOOL 7f016e5f73e0633af453b4eb3de88f715bb8b3efad1a561dd96fd4a6e07a2764f53907ddb33b24ec651f3123936c1f663968e4dcdeaf98c2dad4cb02fa763f40
 MISC metadata.xml 224 SHA256 d7ffc52704d4bc0180f6f1c448ea4bdd0e3ff3a562384dc944af4a00debc9620 SHA512 6487ad35c6f3d2e4876714919e7bb01fd65f57e7753cbfc318130727dded4fcf8632a06ab9b7a3016fc1ab127434d1d20de2dd0ef2cc63ad162023f2dbf64b1e WHIRLPOOL 879ad2c41f2e1297b677803b2b0478ed2affc91059b198524795e1a128cf8ab6b9fbe78b53bdd3421041f27b419bce387a267e389111125cd55b05e260abc998
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVuinsACgkQVWmRsqeSphP/5gCeJZIqJSP/4yQB6kD5C2LUUiR3
-H2sAn3zdgPmFKNyQrHUkjMWsVxeSevfl
-=Gf8w
+iEYEAREIAAYFAlWCT6QACgkQVWmRsqeSphPVNACfSGkCdqglLaVty2gT8j8cwmgx
+B4YAniG8WrrN1vkWCR1nx2VOPE/SsjDY
+=6yw3
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-beta/opera-beta-31.0.1889.16.ebuild b/www-client/opera-beta/opera-beta-31.0.1889.16.ebuild
new file mode 100644
index 000000000000..41a2e4ed20c4
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-31.0.1889.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-beta/opera-beta-31.0.1889.16.ebuild,v 1.1 2015/06/18 04:57:07 jer Exp $
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.1:0
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+	rm -r usr/lib || die
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 48b1016a532b..4a3e14c3da86 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.89 2015/03/25 13:40:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.91 2015/06/18 00:59:58 blueness Exp $
+
+  18 Jun 2015; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.5.6-r1.ebuild:
+  Use /run instead of /var/run.
+
+*monkeyd-1.5.6-r1 (17 Jun 2015)
+
+  17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.5.6-r1.ebuild,
+  -monkeyd-1.5.6.ebuild:
+  Remove require_php_cgi.  Fix bug #549974.
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> monkeyd-1.5.5.ebuild:
   Stable for x86, wrt bug #541974
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index ad925186e10d..d24de69a68e6 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -10,23 +10,23 @@ DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 EBUILD monkeyd-1.5.3.ebuild 4661 SHA256 9fcb34841425f8090cbd51c7fca4a4dc92a222a4da1ef585584252b0c8e2866f SHA512 10c4663cd34c9a8390be1386312a79599df6c9b93305e2c39e6a8e3c4d14c34476a72980612666f1e86ea7ecc6067a52359649894688c0dcb8673679c8807a77 WHIRLPOOL f89391785fb32d11a4c506ca40ca53b6aa1150477e5e5aa7dea70688200abf0ffe8d63b5021a1c22778b1fff372da614d1d95e44037e538a63ce8814eab16523
 EBUILD monkeyd-1.5.5.ebuild 4656 SHA256 b8b9828e2d1dd39723be9b19a58b37923de8fb274b257b422dfe3b8eb0ba8f73 SHA512 9598701e95868c92536b24e52badaa1873d11b20984ca0c202a6ff90c0f6e60c30104fae119dc978c2c1256247b973bdfe158bd770649bb43b04072bea84b568 WHIRLPOOL f80a50befa84f3a998daa8b8f962c134e43e90050e94b48d377e2498c26a0030bc23779aed7d347eca020a8002f8cc22089b2f844da988a1fe30ba5624a41ac4
-EBUILD monkeyd-1.5.6.ebuild 4666 SHA256 377feab7daf5418d845bda2eb8c5eb158f49dcfc472398cfe5986f1b2f8e32cf SHA512 c0971edbfd4d594dc4746339104b226337034663c401fb779ca5904277e935457a04f07ca5fffa08aeb45d64f75fb2c6c05894c710ae6779f7a6004bf6e092be WHIRLPOOL 4da716d55e3ecea9ab74ff6c4b2a4dfe987ae34ec0f056e637e62fd87b68c128f4816b3ce3d7801a97345cdce59d3cff26b14ec245a2ab1739ac0a96456e6a8f
-MISC ChangeLog 14030 SHA256 f971aada95f4facac234aa3b60c740838e70e26c90ae0c088a1a3d8f283dac71 SHA512 03f9f3dfd2014320e5b7547ec64e211b6912bf9a17f6a0377c74bc36bb074376d52714f62e96d51b8155a35695cc38141a52a69ff5fa3aca31eac995c383e70d WHIRLPOOL 09e1119bc548b3ceaf8a79a657b92b16adfbfbfcaa5f5051aae24d472020b890c8b79a30e9b9bd6da7f9f0a0e23aa1c355bc814351d0694fa8e5f4791994b37a
+EBUILD monkeyd-1.5.6-r1.ebuild 4716 SHA256 6fc3ceb505fdfc1966eeb766ea4ba80017870ac0bbbfc878c1fba0b33201f6f1 SHA512 813f573e0658d02bce5959eaa4b6690a94d5e482e475e2424c82e29336065217d5c147030129e2a3de067a9b8ceab817d5721119cfdc8f092e9ee0c5b79276e1 WHIRLPOOL e2baf0dbd52a483feec8bdbc0f7e3de32196598882502b9be0512f419de7bc8ce2604d3b09f2b3eb750749243abb7b2ebb07b9a2de2c6321b6cc9daef42353fc
+MISC ChangeLog 14332 SHA256 d783f7ba5d06c7b5e443909f4b4d0dcc29455c78f3812dfb037d953bd7c999aa SHA512 8974a0f08cedceab5f79d9967869449f85d33534312cc4711ecc153f342289cbaae88a54991319a3430dad2fc5464046e5ba1f62851b78b616722d633e523513 WHIRLPOOL 84a0ceb83e550e0eff1d23ed72eed2359d2b7a7ad43559c77ea5460e8b1dd7e1636d601519ffdf31abb5d214a1e9f8460ce3d9ff60f4edf58f17841fbf3bd9ba
 MISC metadata.xml 454 SHA256 c916dc93db8fabd28ce958c782df8a2b37765a52897e25a4d4a32a183da4a52e SHA512 c88500a432b7753b4630a35c37970f5c98e83812c3bbb29e87abad4bf6d965275e57374520e02f8c7028be34cbdc9c0f94b585de40bebff4bd9eb5826da22c55 WHIRLPOOL 29177e52eef3ed11c150c468000ec0a492a89a549ac06a7e4c9dc5276df7fa791c94e0ef978182d57842b5c5359a9911189b861a89e2ed8b95a89da34dc8e06f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVErrqAAoJELp701BxlEWfUj4P/Ran2tThI2p4fV6e5tqCxGNN
-ugKun2q79HKP6d8vTlKzeewJ5HR3VfLF1l0aIZb3D4Uc2kK9GdTKM+3r0N88LRxL
-mo2PGBlJWfVe8c2uDzliWvDvMubeb/W+fU9Chq7yd3tEkacfvgK1AHCrZfmHsq6z
-XOWvZDwKn2WK2jCcNGFtEXl7+UKv4IXF2pkPMdbVwANe3sCqyNO59e1zN1InqNEA
-4G+9PRqcVS7BmPjNGvJ3b3c624h8Q+upT+2VuzAGUSl8cJhprK1ROSFUu3wT9LuD
-g++82S2o0prOpD3Ghh4lBKqi4GB04DUB0Qym6+N8Edyv6QMicmRYj/8SCzAb3EvP
-0kyZ1DW1T+dSsvvFZ3rGqRfjpnW80oG0XkLDhZvtfsrTJfqcO9GnFgfUwFl/GCv6
-OuNTSr4ra+olUZgHat2SaCS7xCY0IryM7Wq4mZ+ZRiaX0XZEu93+Fuym49Vd/H4z
-T6fJeaxY2HaiYAG09iqIJf7yc1xYL12fBitwjDV0wAV4H+takWWmXDjMHbCrPLsr
-fjv+yMh/TRvTsTtx8F6O4VfDf7tpBt6hObxAhBlLt0yccZBZ+mZtLp9B3V/qNtjs
-lspUYg4qcRpZkCoEkOl/fiYVEE+zI9W1P51wFXsK7dKHq9MZZYGi9+avjjOpQ58M
-+QZqPr6IDYY66LCESs7H
-=ZQP5
+iQIcBAEBCAAGBQJVghiXAAoJEJOE+m71LUu6ZOkP/0eACKotwE+2eJZHDW3HCs1K
+s1qX4IjqGe/Kqsqzj1yv2KHhgKOuF4t+N6heRfJXuhOlYbbeMYGWx/8JGkthjjhy
+9yUZ2TURtTVfKTLRYZvh0NSY3iWuWV2TPccH+wCgJFzwuyxS3rgitTSB0Uar8nqE
+xuTZp3os+dMVJAbjVD/KYDfKyWADdv4wlMpVt5FB4m3tWdFuCuRUILj85m5AOqYK
+6dgrJOEmXY/Bv+DiKW/rE0wVZhr16Et7fk9KaH1JAMXBq/7543dWh25XOGnh9qgZ
+XOCy82Eus7Or+jsAiMeWZcKpofp0bn3y0xECjZvEp5akx5seprwCARJ2uRnKrEBR
+3qF7x9Q8OMhebesctJAEcQwAuDjPCw885QZNS7DfRS4D3Gv0vUmwH0uvn1I8BKlS
+rry3ASGR+//hwgBPT/I8EMSYZY3WMVAftzsAfVVGn/QbmXEPP3osLnhtxsn23lIo
+CvjLzQIF2t/46Aqiiy7NzCZSSaGrMZKMUGVglzmODO2Ocb01Ry7FwGEV2Zhgx/0f
+Gx/yP3//+CGIOAykUGI05/2eK9xEIc6qprhK+p56PUvJ/ZJE3eoPb7h396obrAc4
+1eiuh3Q237eSgY1L+uXt0zlq1guMe9YYjmXSR4unZvTe8uty8PBRm0YZ85oFyg++
+Y74nK24cq0yi6CFS8l0R
+=scxx
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.5.6.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
similarity index 95%
rename from www-servers/monkeyd/monkeyd-1.5.6.ebuild
rename to www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
index 190d23909ddd..4eb3a461f663 100644
--- a/www-servers/monkeyd/monkeyd-1.5.6.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6.ebuild,v 1.1 2015/03/03 11:18:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild,v 1.2 2015/06/18 00:59:58 blueness Exp $
 
 EAPI="5"
 
@@ -21,18 +21,20 @@ IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth m
 # uclibc is often compiled without backtrace info so we should
 # force this off.  If someone complains, consider relaxing it.
 # ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="elibc_uclibc? ( !debug )"
+REQUIRED_USE="
+	elibc_uclibc? ( !debug )
+	cgi? ( php )"
 
 DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="php? ( dev-lang/php )"
+RDEPEND="
+	php? ( dev-lang/php )
+	cgi? ( dev-lang/php[cgi] )"
 
 S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
 pkg_setup() {
-	use php && require_php_cgi
-
 	if use debug; then
 		ewarn
 		ewarn "\033[1;33m**************************************************\033[00m"
@@ -106,6 +108,7 @@ src_configure() {
 		--logdir=/var/log/${PN} \
 		--mandir=/usr/share/man \
 		--libdir=/usr/$(get_libdir) \
+		--pidfile=/run/monkey.pid \
 		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
 		--sysconfdir=/etc/${PN} \
 		--platform="generic" \
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 93caa1e5a02f..14afb6d55741 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.849 2015/06/14 19:50:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.850 2015/06/17 08:50:32 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> xorg-server-1.12.4-r5.ebuild:
+  Stable for sparc, wrt bug #548002
 
   14 Jun 2015; Markus Meier <maekke@gentoo.org> xorg-server-1.12.4-r5.ebuild:
   arm stable, bug #548002
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 37442c146101..4bfc23f3ba12 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -24,20 +24,30 @@ DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79
 DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
 EBUILD xorg-server-1.12.4-r4.ebuild 7249 SHA256 fce2621cda7c9836217c0ccd7752f3c339cafb04bc16ce697c84d5d5d2b9270c SHA512 de63e39d6a0fd2daf5544773050e39417d40c8297e2e70081cc88a9486a128d0fa7a11c755c60272268a6667a6dbe2f785aff0c257835b98e3da7057632ea55a WHIRLPOOL 267997b9084aed0a3c76b82b8c4be8f8e9743288a7e8dd6f8d6ff28f1d0a94a75f369dc30a5acad2e3c0e54d4098348ebe4b40c0cc14d4ff3b89f9c6d46ddea9
-EBUILD xorg-server-1.12.4-r5.ebuild 7301 SHA256 5f6746cde02239cf71f4c88a4bfd211bb9239162c6ba9f6ff32a6ae9aa80347a SHA512 82c66f662276b609dcac8c0668be62f6c779dad802339f12e16b705f68957de6b7ecf58b16e0d6883ba98ca550ba6d6a351cc6edce7648d4370cbed80f4fc7f8 WHIRLPOOL f2951487039bb166088c17d803df2f6671270715b7b8e66fa0d31fad874c3eb91ee25e906c7eeab0b2f500542d3b740e014d2c0aeeb8b525ad26c1d6465c8af8
+EBUILD xorg-server-1.12.4-r5.ebuild 7297 SHA256 926c26be539e6a6f706996dfcc5b798a257da332ee4e9b8b5f9d5afd1da1a820 SHA512 8ec097156fd2ff780503f1e5681bf47a2c01a30fdb17cf63150b3f3de61ca4418ff6d622427d8bd3352f2cca30d1f16cca84d6f8b0bac76bf2680796cbae4df2 WHIRLPOOL e329512b7c1f4ae5de4f9c2141c939eb4460db47f4e91406bf193134e77dba418d2e854fe20ad591b82acf93b6bb9c9c3f49da9aa970d24f01ab0f88dfeb5623
 EBUILD xorg-server-1.15.2-r2.ebuild 7379 SHA256 e848a433ad697f0537e2b092f4ed3bee51d31cd4d2a8e7c554fece9b8240d4c7 SHA512 e318666d68eb694210ebc65c1b5bb2804aeddfafc69ad5b9abc95f78843fec3ad385304280eecbb9af74c2cde5e6a8f600afc29e10705f82b3f439ce7a81a529 WHIRLPOOL 6b50bf1f1358d9f1507b3d26aef32bd5cf052ccfee4b394452bece06bc244b80fed6d2558fa3a07c694aefd4969f48f09805f842711e30750089cd5ef6a798bd
 EBUILD xorg-server-1.16.4-r1.ebuild 6037 SHA256 315b5da049cadf129ded553493adbc4dc7838e0c34a813e1c801bc96a53f4096 SHA512 93b1f3fbb08bcbfa3bbc9ff7652db671fbc93784deabd04cd92a879d43e8ff06820503594a0cc35f097c6bc601d78718a87122d721328cdb6dec3c44f6e35429 WHIRLPOOL e99201503b3ae801cabef57b7cca1465390b63015807563721fea10fa50c52b87bbc1c5700bc01cfe7110267d866520527833bdc406b1cdf65ad6e316c5efbf0
 EBUILD xorg-server-1.16.4-r2.ebuild 6147 SHA256 8f7622700516d49974565ece81fbc019761fe75862916d09910a5f5f6467846a SHA512 a45971228c89e8675c5a03e59f0713bef1ad6c488e27467ac25c29605de19b5fcdeab4e0483bf6ab97068acfec4b1e697684723b28a5c97c7a5da39886e11ec2 WHIRLPOOL e7d408ebea2b6489e2fe392eb9356f736458a3b13a13be35845fe08e51e75d623a78422471dcd37a8e95724a6adf179f53186f8582e77c984252085176646925
 EBUILD xorg-server-1.16.4.ebuild 6932 SHA256 c8fb69be28fc621fafefa98f63e166404771a185bdb3ca511e899fcec58d8cdc SHA512 e6fca3348ae29b3a774ae86da0c0bdc2387eabcfced47861555482976b12f1bc886d58e7bf836c6cc9812e87a06a8a7ec45524893f02f5645430083d54ca0294 WHIRLPOOL 6543e9229ab05a3e2400e00e1d6499b4f95e233851c444d27eec329080cf5d9933e8b29cda1d5e8ad629921e76ffe112b6e8d60ce83e634edef540ad4a98c93a
 EBUILD xorg-server-1.17.1-r1.ebuild 6405 SHA256 eaa922f868f1b7c4df332ced44d75c31bb92a347535706ff8fad7eaaceccd67d SHA512 b4eda85bfb93e30a367a874ea3e1752671614631968256a5566664fedfd2a391215bc04e8c8439eb66b17301d943de8a0028da50d0fb2fb16b959777048341dd WHIRLPOOL 7236e4eb472e0e7581aab58eb9cb840a3cb510eff7ecfdf1ccb2eb63b5f94515f8d324d3926973b3a44d5de14ac86e42beb2794a4d85b5088772233099ec1428
 EBUILD xorg-server-1.17.1.ebuild 6292 SHA256 fd97b96778ef24a674d0c73c12611a430cdc6be041b287061f8a83ac673f424a SHA512 f69acaeba70b6a2c58106fef7b4f8ab825e5626013408fdbac94ad316bcbaab0b0cc7580c6cd83491ca5b0eee4cd8a69603983ff152b90cfeec34224923cb662 WHIRLPOOL 454ee70083dec42c4f93bbae6e9fb9e611882b6fd5de43b5aa7dff9c0fe1f6f8c7e2ada52031c3754026c5f68173734b86cd0ffe3e2108913d17ab7f58e52997
-MISC ChangeLog 67128 SHA256 01d4f2fb0ea0a72e8307baaee9598c9272ac0299f25aae8fb44e89983025baab SHA512 b0770401d0040ec915be75a3a7c9150fc0a8f812d1e9985ca8af22d53306257d3308de619875e5973225f8cc88e649ce5ef00359a3849b8b33b4b37cdbcd0c5a WHIRLPOOL 3e4c9d35c5df738c3af64a5fe50aa8f414342c6289033ef921470c71624bcff49f1295bea64c97ed22b5e4992cf1cf9fe230e965d9713c61cd6909f3ec028a34
+MISC ChangeLog 67241 SHA256 ebec5e4e26a859d682b230e0b7a8174025225bcabdc84955b78153e43d86dc1d SHA512 85cf865fd8df5e839d4b812d2b024275b300e373561c0820d8c86555a93ecc5a9aed2239daeb38fc21661ff8ed3cbb1f5bde9a178bac9ef78fa475e01c96568c WHIRLPOOL ae4852a7f0d2cf864009acace90d8cf70529dd3c9d7e6bad1c2215b04e8ed721fa8eb040db9a895c9d6f641728ff618bebb73216c561bdfce25e0315435376fc
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV92wcACgkQkKaRLQcq0GJiOwCgjfmybKcRG9OyEEFY6dO/CFOS
-sVwAoIRnGY1T4nC9pcjFFA9oOQNi9AKi
-=JXb/
+iQIcBAEBCAAGBQJVgTTYAAoJELp701BxlEWf240P/2yeVGSpeveg+SNaZ4zLa6qc
+JlPLerF2NFhoBvhnsuPmBe1NgykXzRQkZnOOTSucQnrRjsfeEfGvVvtbb2N6fQGV
+opgC0B9guvTqaenxgQ+t4uptwfB+MFDMMUqulXR+xcFP0ek8F5quljPmw+iQijYb
+aEox0Hq/Wp5wgDQqTZQuooTIQku9wZ7JdqY2mRLLEFJtO7A+5wRF55PNxL2IQrMc
+EEJ+IOuSEbW7ezV5TrnjR6CTElQ3ngeFGnYHqcK3f8t9rcvKU3wPZSPZiSJoZjtd
+AbVm1Vh4QjrP1W7uF/YN5QDhke0hsgARFeZeENl/k9VhIzlQGXwUu2akVxkLcF9g
+r9viPLODkdNLzX8PGuF0rn/oNMTFZKgKxNjqa6E7zpzj9FiJJolcNFXWyGFVCVMA
+n1I9b9hZYSStjlXi6/NTMq2kysCx7lfuRYRRAfNz1LcoCFDQ6tEfYT+wAgYiY97f
+6kfbnpDNGXF5SYsv1NYwj94CcT7vhJHR1RiEOn7S7ZMkbwby2xbWFpjBTcOZBGsM
+3CSE7AhA01RSksSbeSppW68Mvn0fzCGh/Fg25NJGrcl2UEh4QjwcUMxBme9OFHSJ
+fhkrt/kzL+7wWF/BFxvHYNTdWQinaPmEnUA9FrG/EPEmNb6H0uZnA23IG4NihzfO
+ATntLn+t2h4EuI164wHg
+=sO+U
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
index cdd83ade9d5b..8648110c1f21 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.5 2015/06/14 19:50:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild,v 1.6 2015/06/17 08:50:32 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.12-cve-2014-8091..8103.patches.tar.xz"
 
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 509a670a95e8..88a138059db3 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.624 2015/06/14 16:55:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.625 2015/06/18 04:48:48 jer Exp $
+
+*nvidia-drivers-352.21 (18 Jun 2015)
+
+  18 Jun 2015; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-352.09.ebuild,
+  +nvidia-drivers-352.21.ebuild:
+  Version bump.
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> nvidia-drivers-346.72.ebuild:
   [QA] Remove emul-linux-x86-* from dependencies.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index ed90981cf014..e0c7d03ea7e7 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -26,7 +26,7 @@ DIST NVIDIA-FreeBSD-x86-340.76.tar.gz 59362290 SHA256 0abbcc3bed3f017e7f1887a5c2
 DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355e39ae9a7e16642648e671a6c9339ee55fe340c SHA512 35fcf57d5e830cbe3c07ec70362ad9f0ff6ec327c6b11b6d3c533315e59031501501b9fdb80a3bef720506e5221ad84496745ce13d2c9885076f1c8e8537ba46 WHIRLPOOL 3ed3230dc190e7670c960743d94b8db1c0d9908b597f952746d851b403847e7b2836f1c60e6af0fe73072c1fda3971dfacc37c21908c227b2c20b5045dbfd61f
 DIST NVIDIA-FreeBSD-x86-346.72.tar.gz 57987372 SHA256 2a630e349f20795b5660542e3f22c595826779ed7c92d8bac4e11c8418e8fd79 SHA512 6b49597b7fc7c6bbbf1d2a65573f8dcb30f84e648a2ef756a4377a4caa1633c36f87bf2b456d33f52ec310f1598d760177f5b7afe3728e01285d4cede89803d6 WHIRLPOOL 86da1cdbdab5dc6fc6b362d8492b4f7b00dd33dff064a2ea13a8eaaddf8e426f2de57b4369b3e551914d9afc627be1b8e3a5b4bdf88aecd323f7ac51b4e6f833
 DIST NVIDIA-FreeBSD-x86-349.16.tar.gz 59441939 SHA256 d8b633790036f032b48196503bc6a85ca82de54edd2409f7c1ec86c053e89e07 SHA512 7d914c74b8b4b50931f27f085ca587fab9a4ba0dafab1cdbb751605cdf702b84e2e31b999b374c7adaa096d6dac6268e9b2ff6fcde5ac37b6dbdfd0ebf4a1422 WHIRLPOOL ab68e75c05a0cf2df803fcf3755c366a04cf6f973bb02b673df58dcdee6cb13a4cb5e6fec5270918c725603780b2fefbb89927789b92ddd01647852d34562b9a
-DIST NVIDIA-FreeBSD-x86-352.09.tar.gz 54961099 SHA256 888499b825e46e5a479828204ef1492dfbf2d9ce2bef9ba5c75ef228f8e17173 SHA512 002bb20ef61bbdd7af0cce70cfae1f8b627acaaf0b47be71cf428c9216b842e6f23c7c8a5f19d52ed4c9d9a091f3a7a4a3739d592970e6067e6d30e5239527cf WHIRLPOOL 2913ee8ec74692754de9583854a2b0875da55449bdce2b1d17f36d2739f273a97eeb82d724e5ecd287134a70e4ea1513762d629cd0f2f11b8e4e5b8aebec5375
+DIST NVIDIA-FreeBSD-x86-352.21.tar.gz 54992259 SHA256 4b8e0bef07c31f4d1a4d59d6445e7e1390fee084f875f6a8fdf54a7a26830ddd SHA512 63c3e462b2527a81505700e4cd0f392d00d75b600b2984aa82e905200ff2cbc798caa2126c98da74e4fe01f25ad87284bad49e80374af03506633f81f1ee50f2 WHIRLPOOL dde9adcb113d8abceefc91486a3a0a2db9ccb13fca2dd9f8e87b538dbb1bac2776d65c190e08bdeb6efdb8b178df22e53e3a24331df190ee5d17994c343bfbf7
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
 DIST NVIDIA-FreeBSD-x86_64-331.113.tar.gz 47509194 SHA256 c848e187c79064ea3f52406312aa09d06f0aaef5063be7522b2b2319c43c872c SHA512 4e206719afcee47179e0756ac67fc4e61d513efb1cd0264b28726d6de16846feee873a2df362bf645b0527d395b6d82f5b54dbc447bccb74128d7bff37bb7b1b WHIRLPOOL a51b0bd9f7301d9bb76b54ffa44337ad4d875125281c4b9921e66a76d434879832f542df9c6ba436ef83fb3fa0afe5197f3425f1b7aa16274aca5080259f343d
@@ -34,7 +34,7 @@ DIST NVIDIA-FreeBSD-x86_64-340.76.tar.gz 60206978 SHA256 60037d035b9af9f1d4dcdd5
 DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8dd09dd15c06f6b3ef662fd3d960b4853c485cbab8a SHA512 23c38de071ac6e2c87db2c767b07f243703e55cd6485eb8e538fb72f38e9856b7ff28430fdd7eccc4728f3d36c14eac8b1fbf7155fe864ead93ed4218d5b65b5 WHIRLPOOL 401cdc5675d5fe60b6ca492be912573e9fc56a0a67ad680e2cada783ec8a34c15c6ca1a495c8fdbf09e384bc420295750540f5c77907c459c80f400d8291e44a
 DIST NVIDIA-FreeBSD-x86_64-346.72.tar.gz 58751579 SHA256 efdf4536b0689a65e95fae28c9f8fc27dad817bae8a3101a52c07d0191245ae2 SHA512 c52a51766cd96f5f80f808f8e173a2d8816cf896bcc1be5c6dcb8c0d834c2978fe5a46b78bd2c022cc22f513578d6e9c5ded6677b5e43df03ad7a2c19c89c936 WHIRLPOOL 856caa2dfe040a2a807d55300d2b365ad349c5beb752cf579067c45e987a118fe205bf1e0d12ccc241e7e982c0a31283f95cd6a81bb553d63355f44031c6ceb0
 DIST NVIDIA-FreeBSD-x86_64-349.16.tar.gz 60290477 SHA256 b4cb3f3738f8a68b90fb7830ff9b48d9f1e51d3aa6e2dd555b690b4848101a86 SHA512 47c3f59f76b644e5ac69197a22ec8d17d764aa9090049633d274c579d59af8b36780e7a1aa97fa92414eb3c0e76d36e7bdf317f20ed2647482866cd5575f134d WHIRLPOOL a5455b5329211f92ca8f6e87fb796d9844e293878d4a64d2ef6a40a15b57687e66ab81baefb0132790d922b6b4e0c577469c75f98ad208433e14760cc77c6bf7
-DIST NVIDIA-FreeBSD-x86_64-352.09.tar.gz 56595665 SHA256 3235bd2f73eb183fa23efdceabcf7057d9887acf42aa0450b545e04ff6512a27 SHA512 a89fe101bab5e393975fd509fb107358b139130fba88e5aaa5910b4f40b87729a9e1b383416308c90618d74b807b2ac6bf00e5db01057a32e564ed2bed3b03fd WHIRLPOOL 3ed28a2d72429a80787421d0a10073ad8c0dbb64ae7bbf99787711bf3179e4fc98b01ae4688f6b10d89a08db2310ede9eb5df7c2c627385d30ae95da96d3290a
+DIST NVIDIA-FreeBSD-x86_64-352.21.tar.gz 56622434 SHA256 48907dd9f611749ba5a390cc5ff1dd5477f5913848586fdf7fbde89742a98151 SHA512 e964a7e1935f08b337891e745fc81d009a7899aafcce9a25c142355c5616f81164ce2cc2384055122524df5a7b949a47f45798b9956c191cc19c6c6bb58d96e5 WHIRLPOOL 60be5eb8fa7355829437afec3cb2cb9c2d178f235835d791fc7bb95724c344d72edde56164fa16ad72acdc8e959db2f5ac622aab93e183cc11c3d2e564919c0a
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
 DIST NVIDIA-Linux-x86-331.113.run 37300924 SHA256 42535a99ab68452d30d9c3fad2fb162db01d1f6821115a3c1733ed203efd588b SHA512 bc820609e0379cc5805a5428cc364795b8a5d9e5a2a4395a1ddaa1dda85e6acc59368f87f5974a39fb42bd272458627b2c742fbf1f7fedddb17102439883b111 WHIRLPOOL 1d7b5cb8be5bb76dbe1b238aab4e39ccda0e5b07da268f0652966e79d5e0d2192773316d8f22a2d6a551305b17b610242918822e94e43263c9dbfba8a48bf49b
@@ -42,7 +42,7 @@ DIST NVIDIA-Linux-x86-340.76.run 38818911 SHA256 9b29d93b49009caed84a8852825c3e7
 DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e SHA512 a6287cf8ad6379daa7c6d7ae6bc08f9985ad9e9353de6d88eb72d8a1acad3e25eb65076b904152c6ddd8ac54b9afcdbb7a5dfb9a46e75c5654be87b3df0e48e1 WHIRLPOOL 7aaa7977a850314045bcfcc36a8f6ed8b3f487ec972e109ea48cbe3edda4ff29c0bf02e7c11dacf6a3e71783259dc809840c32e301aa16f2d4394d7f07cffc0a
 DIST NVIDIA-Linux-x86-346.72.run 41349283 SHA256 1c3de9895809eb4a61306a46902d12ddfc6c6305ac99d369c56270a962200c2e SHA512 3db4221dd6e0be90023b29d626026756003b90321d84e5b65c2ec3872f2b8571ab39289497a90fe2b196acacafbbf3b6d364ef6adea129942672667ce9689eb4 WHIRLPOOL 9bdf95ba10913f961cc20c4c676654fda6edd44439cdac370f5fd06fae3934f3de18082b31e4e478a386d49055851a7211d11abf0543e33f55e9039ca8fbf810
 DIST NVIDIA-Linux-x86-349.16.run 42751511 SHA256 35c8d00ece6a450e8e72aac2bff45e89ce40ffbe3278802e8a0b4ff65c793d11 SHA512 d3609c4ccfbf6b005a8c58dc5bc3091c7b603229bb27bf48c545fafd9d7175a06ab4d5b414586a5234f2699bed4f613b809c058dff4e1f5fe4416adc53c4d3ab WHIRLPOOL ff4ff2f83e50c6675ec35035a2bd0d534acfb2f8fbb4d5b2d00770dae3b4f48db83fa789c57a6f958f13d8bdbb68971c5ba10cf2fc7b0c4a5a8cb836a09d4586
-DIST NVIDIA-Linux-x86-352.09.run 42942607 SHA256 a799e5e9016f23dd7f69a74844652dcebdf0f655bf2d8b72370e22b19e8b98d3 SHA512 07426cfccc526c0d701050bad71c6d16d2b702e03b0287c9205fd0c7642e0072bdd28ad771b5e8f4e949a5826989ed340ed44eb2e23653db2af3d58dce928583 WHIRLPOOL fcdac943b5fcc70a0d8586d5914377bff6681556d497edea6f670f26a93d0add5ff9efbb45b4cb9ca69a03d0d2a93c5de23b9bb2e344cdea52bcd06825b57fdd
+DIST NVIDIA-Linux-x86-352.21.run 42352671 SHA256 616382a5f47e62c8f35509ce684a6ebc94e4a62c51208a11c5976517123040d0 SHA512 0dc12db8c4aed788dd85ffe7c504555ae68acfc86f1e944bb87fcead46782da93fb75273d548f85d2d250e65f308c099e4bdf53550cbc1bd308d97160deaecd1 WHIRLPOOL e13636dc261b663231c7374b7400fc192a893ec6a03b3cbbe52926a7970613b0dd567a718d89dc2b17570ef6a617154fefa982b5acdda834cbfde5e518299cbe
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
@@ -51,7 +51,7 @@ DIST NVIDIA-Linux-x86_64-340.76.run 69955037 SHA256 3bf670e9a2bdb184648dec54ce06
 DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a09403630a674c32e514bdcfb54cec3c81810fc78 SHA512 6e76e54b24b0c1fa16e94eaf0f99d2e7dfd28e5aaae0bcb6df3e6d4e20c7a13d5d30902e2bc9bc7609c8d87e5ec8fbf16a5a2dd513bb9d761714176c4ce5e283 WHIRLPOOL 73040a3f3073486c5d6d0a5d84be7d478a3c15bb4aee21f3c590592afe2845f8e9c7064010ddc8f93b764e48940e523952abf9978d09cd32ec1ce8b644e59eb6
 DIST NVIDIA-Linux-x86_64-346.72.run 74095832 SHA256 2ae3777bcff6bf4883b6a903c82b82257bf8fc323fe174992df96a3208c50cef SHA512 22c665be4d4f784029e148e907ef9d747b9cff55904fe64a0893ac8675fd97e9b6100791aba82974ee6bde03e3917b5521d1487c325b2c0f7011cd78b00f7347 WHIRLPOOL 6f73ba2b0557997056113e64820dd1d92afc5bec2ea98374bcde8ade6c1754b041943e4208b984c1ca190f46e4cb32efb8059df6411f478627c10464cba63798
 DIST NVIDIA-Linux-x86_64-349.16.run 77513301 SHA256 f980b22729b20c9eb3a3a800af524da181afbc78e2409a3f83845894983f8322 SHA512 143999f5401ac8634049786073203fab7e8d23dc9e0d4d62d4c6ba9945c20f7d4034c37d0f721aae540503f6bcffbf200a0af70520ae7ee10a2529ed92a14866 WHIRLPOOL 9a6817c03d11253ed606294d2cc2b5f2c4c612af2f8b6f72228a9e21d4991f8bcf248a28ff70d6f477860a64bcf795ec0ee2f73c34904e5cdf0979d41e370042
-DIST NVIDIA-Linux-x86_64-352.09.run 77584888 SHA256 a3ec271896b775c936e1a14e7af2e8ebf02b0bd59381217510185b313c5a5fd6 SHA512 36c3aecbf0cec492d29905c0b1d0bfa09e93d596d6a49dde1ddebae917de3c2e4941591b520729cd1f8139d1cf66c3bc86144213fbe04c264fa1120aebdd0dbc WHIRLPOOL 9f49beafa66b2f2d124aa2f2f42a876e9b10ae88da75062f02ccd7d471feffccf10ff13212f805dd86f20ede53da27dd1fe45a26586edda3bd3d0d72e8aa8b76
+DIST NVIDIA-Linux-x86_64-352.21.run 77633229 SHA256 aadfbd991b5418cbf89d2368cc49485a4194196ef08362a18f92df049381f791 SHA512 ebd5eb3022d67a554a978d339045b352ca7afe56a1b0d89af521ef47f853357647d85576fc5ed743d0694226adff38af5b29aff3fa444a91c17efdd67caaf6f7 WHIRLPOOL a76a305aa610036da8fdc54097a65a886ff10c0a65c5882aa5d1933840e0e64b91048b6debf3b7bcbd00898f1b95a520191f5a07cdad721eff5e5edb696aa4af
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.39.ebuild 16573 SHA256 e575bdca8266b186769167ac48284933e977ca294e3e66486803728050dff57c SHA512 14593523ead8a0173216ee9aa9d7ec11f4618c88f2704c2c3e34de04ec9e7990b6d3276ac24e3b37be2288b61f377ce03cda227977f9418db8afa5909f1b9379 WHIRLPOOL 1e3b46fd4ee28b354316004ed779b444a8616df83754068818d378f4e7e8e26bf7b2f65ce8566d42d869badbb06922bf693fc3ea371a2f1632f6f5a869c76ecf
 EBUILD nvidia-drivers-304.125.ebuild 12507 SHA256 21f1b9c385e3ddf25e5d278b953520f473a8809027843690193ef0ad60159bd1 SHA512 cc1da5befd47a7245f612568bffe31d40a084fc4da767b19b8e16aa33695663c7eae5c63d5ddbcd44daf74c1a91d9d0ed5fd64875271d0e056e2e02e15d765cd WHIRLPOOL 8f208d3a31960fff8148ca2e71497690b6d887ad1c2eb1839561787e90ad26880ce16b0def8ff6d31efe32780b087fbded13b9cd291cd4b25269c5465738d5a4
@@ -60,22 +60,15 @@ EBUILD nvidia-drivers-340.76.ebuild 13564 SHA256 d3ee4e07bed9f094253db42272bd0ac
 EBUILD nvidia-drivers-343.36.ebuild 13564 SHA256 669011847bfdd3dc422668674371d42dab2501be153f8eaa7f07ea433866f953 SHA512 2a896224728540675c35e33b7c1d67093cdf1acb9416e3512347d098e311da3b687d9a7e46e28390289a36b995c3a3a4c2f929cdeb4c41072a481af476522f2c WHIRLPOOL 4015b21a7a25cf864061e9b62dcb3a6dad577236b916fdf9077d1192cd7cb74fd4a6bdd029ddedb365099e396e018fd6ea4538fb06d0f38c495824f88a293e1d
 EBUILD nvidia-drivers-346.72.ebuild 13873 SHA256 9ba57d4d7bab17d96c31064d379f538ae8ab97bf937c3cd62e0ac1642cf2135d SHA512 2dbecefa6356ae0866642c976a54dbe6b15773a2248d0ef0a49e2451ec2ce82c6da98ed28efa8bd5b6de588c2456a15d6e996d848a024d9b2c5f42298f0e7f28 WHIRLPOOL a105e3d263bc9430f180589f76091ed53362b3274d5511e7a654e9db3f5e482eabbaac6710dded9d213eece4072e33aa56faa927564a845be966b2bf54f85f06
 EBUILD nvidia-drivers-349.16.ebuild 13873 SHA256 0c1bc14a72e6eb90a02bc38323773709c886c172ff18b0b08a01c6cea2a21d3b SHA512 7f865beb54d147da87285d6809ae725c52d0d6d90a4db9a00189d96ed526b6d5d3175f479ff505f26858649a1f5f1106fc5438a4d27f76460cce1143f185f6d0 WHIRLPOOL 454e7a4b1e29e0e29cd32b9370268ba0785d20a82ab6930450afc586d9daf9c3e4920e2da69538875c1f3cb187bcd4610d9ef7a95c4f8c895e13aebd7751312a
-EBUILD nvidia-drivers-352.09.ebuild 13875 SHA256 538008b43b8a4b38395c1061dfe04600ff40e9f29659f5fbd637392d51ad8fde SHA512 010dd6b32442c82a400b6be5b75e10c27b7a97fb92d104ca040b7b8883dc837e744ad13f8121c454f2ec6f68798fa17cbdcf14be6442fad6ae971a71f39d49d5 WHIRLPOOL bfbd785554c47457e9597eda647b750b0d699522b5f421806e055bad5eb39c3f1591696068527e0f111f7d156d7aaf3dcd989ea3dc94197cce852e4ba04145b9
+EBUILD nvidia-drivers-352.21.ebuild 13875 SHA256 665b2544de3aad7f51b25ece69952598e52c885c5ca5b4d84ade149c860a7ac9 SHA512 ca96967cafd2a75fc6056f7b9a04263a78a2a594031d393137f5098e87a5e85d5b41d3b9ffc86a1ee3e6a8abccfc3565d2242e4366e3456766519c36c8d40e95 WHIRLPOOL 217efbe4096ffc36cf25af61ddc140f596b0a310187fcd7c7647c198ba7c91d7163f0493bdc3f081bcc12ca13309a4af4d309b92053ffec5e98197ea71be202c
 EBUILD nvidia-drivers-96.43.23.ebuild 14838 SHA256 7a88bb8d5f50c9233ae7aa52519af39df28764f76f2dba689aa1387e4ecdf13b SHA512 610e76e71639adf700fa1c6342965ea92ba5f76d1ddd50d04efe2f4a472f69f356260096fc0f3e7105439d1a44944289a57be86b891849d14c9dc3f57d4c400a WHIRLPOOL 4033ce529f13cb0ca15d53584f442755e57b5cd2d748ccfea3d4b1ed918ab51e0c4675e4ae08a89f0d37cd007fc52b2a7e4eff1317a3ba8d8e128fe7980c8c57
-MISC ChangeLog 20545 SHA256 b1d84141120762023f1983c19986edfe3243ade1bc42cf10736ebf3e3087ca1d SHA512 f8e6f7d7f5bf2e7852754debfdcd782ec98d21babac155c5dac601f1cb8bb87c5aaaa66d2466058192ebb334066ef7d87a0def182478deb591ce4197e98d1f0f WHIRLPOOL 640d0f4a9e8a0551e5e5dee8343d8121c48c36970b079312cd283bcf5ffb1fc67046baacc456f86bb3b43631e7ebcdd54a88d21c589fcccb232bb006b713f410
+MISC ChangeLog 20711 SHA256 5c04208df8be8a0ac04ddbcae0fec0b296abd0179e3c3f317c5f4fe1c50e93ab SHA512 f7ffc990dc9dc93113ddd213915d544ff43e0e9e0a69466e70a779ad3c05affe20dae3ab218e3a32665d0584044e23d93f2079c66e044a8904cb59d1882f7fa9 WHIRLPOOL 805d0727bed8edbdb6de5b831c97d940697383d7763a54f04cbe9a71a8bca74b8a137f76343d741e0dc9d2f349cbc57bdde3f5874ab92160b01747c1a6435ac9
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVfbGNAAoJEJQzkH1pP7W4xKsMAIHeDNagH0WAh6fVXG/MaVLM
-msHWRD7jB4wjXT8EM9kkYjVVsbtv7jNjtx9lo5kIhy1QTLBIpYIANzzRINE9XiSg
-gsdKS0+4DNEFfbpMDQ3QIHrk0+XyZS/x6AKhsaeT0Yvh2RbhR+7FV7STsU6L1YFO
-IdF9Z4dl/t+760Yb174V3O2N2qcFrZn05qzWxQjh1pvd4ANzDMGBO2WOLGWuidAH
-JWdJQH228ZqKCKVQZq5ZGyxYXVndJQ58T1hELq2qFiIlr7Nwx8fK0YvvSgCJslE+
-waf6a7p+3hX8GpZgyCR5Hp/9A8jBcYdL+KDU/CIXmW2kPI/PuX30cRzxKq4GCS3L
-yCCFfHlmvJj60mrwzh9Wi2EwYZyqZ5NvD2RGbZE6j5W+fbNfdzBxCgksGj/tHorn
-GEuSlrR3x2VvWyJ5bGleCWz67Z2qa9zysIxIr/fRHwLvN80NNZz7yntG8o0SiwO9
-8BTivEXuvPxDjyJNybeRR1tph1CQmfj1NlJlB4t8sQ==
-=K8Pr
+iEYEAREIAAYFAlWCTbEACgkQVWmRsqeSphPV8wCdHAWf3Yv/fWD1PULm+ClyREXT
+y1kAn0i9UQDOKXDkw7LVDyL0RXlT8Dx5
+=8j5k
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
index 6bdc88029593..6e01d274762e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild,v 1.2 2015/05/30 12:30:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild,v 1.1 2015/06/18 04:48:48 jer Exp $
 
 EAPI=5
 
diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index 80b87b673509..928d4a2df6c9 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.125 2015/05/21 16:19:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.126 2015/06/17 08:58:38 ago Exp $
+
+  17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> x11vnc-0.9.13_p20150111.ebuild:
+  Stable for sparc, wrt bug #515268
 
   21 May 2015; Markus Meier <maekke@gentoo.org> x11vnc-0.9.13_p20150111.ebuild:
   arm stable, bug #515268
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index c44f6e6429ff..ed2ea8e6add2 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX x11vnc-0.9.13-shm-cleanup.patch 1262 SHA256 2e69b15f9d3a466181cef7ef0e5963449d4fdc473c9933d4349ddf37a6ae3521 SHA512 fe63d11e1f81861438b9d6469cbe6545c5351a5791f8d2ac4367fb540ade1e53e51cad8369316f95bd27db47d11b8e925bedf9941128133398d2bedbb61d2946 WHIRLPOOL 35467350663485c803287da7c467652bd096b88434ae2cefaa9a9af4683531a9a2102687e48a95c3f2285758140e78461036273eb2f686718fc6486e691338ed
 AUX x11vnc-0.9.13-warnings.patch 1363 SHA256 4db7b0b699e009362eaef6be222041cc333541273cf47db52dc71e521a0c4ffe SHA512 42de5aaa3f5f67f3f7f0b8af693811d6070bb05270a3b41e88705c09e436e37beb343433d5a4cd2d6922f2eb7e67c1584de1278b0ed0f92b3d01f2f233050ab1 WHIRLPOOL 408f7e7f887703aae39c9ffff70cdb7334cbb9d410d80d9b36c9cdfbef0aeaca8ff1dc1d53fb7c1f53c37cb90959b3e8815d5dc077eadf66deea5bb799ff8de7
@@ -7,25 +7,23 @@ DIST 82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip 1830730 SHA256 fc6a28df089e47b
 DIST x11vnc-0.9.13.tar.gz 2853769 SHA256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b SHA512 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 WHIRLPOOL d812b257e70d6caccc6669c7fca89cacc590b5908c7877f62bdd14a159b0712b5b60e8587b6a385a5a68c46e15296ab838b07196786ac354fccb0759725685c4
 EBUILD x11vnc-0.9.13-r1.ebuild 2102 SHA256 8014ee0fcf38aade53a65b15b59eafcc87765c2b31c419cdd390d3a43571c8a4 SHA512 39888991c74e73550aadf3b96ae3e659e700f94945ae26101b0e198392ae5e44ecd67755e22a63e5720eaaadedc0f0143342c2f39dd6f927d8d43902b26b168d WHIRLPOOL 990ca1066f256186c80f42df18aca7bf28d74c05b0a620e2a711078d52f9cce4c6e9a2a4e0b004c38073ebca6cc8ee5be50aed1702c843d14463ee59ec75ff46
 EBUILD x11vnc-0.9.13.ebuild 2047 SHA256 82a2e0167e43ab2947fa8314e7165f93475b8b27fa4b9b50c4f2fbf0a9ed9a63 SHA512 8445604f172f4650118d3514f619529eed39576fc1fc4393b118025c1eff98b56ec55718de76f445c4b5ac32915291ae4ea7171bf4e7871d1131d8a06116d9ae WHIRLPOOL 6c1381128ee558b796ac512b1d284e2480e5d84e929a856e9984fb2f98a965d23f2aed22743b93f47b1d06e68ce109c743831bd1b6893373b65fd02fd5ba8cf0
-EBUILD x11vnc-0.9.13_p20150111.ebuild 1523 SHA256 7ebb0f2bcfe10d50af66cb7662b1490d5ca3ddf6b0812cce37839f6a0d86e0aa SHA512 f1763f5465c4f17d45a0709de194677cc38908baa7f18a75497a605b59c29c513961a6c173c6ac2a5ff88880416bd05894e746183ec4bf1658ca7a829f138797 WHIRLPOOL 3ffab4880fdb94a745984b1a87ce90e8d589d5f81ba7ffedd2b5fbce4dcb95d75660dbc6274c4ac537e47d47a7ecf2c07b042f4e7da9f390a2f495cf0f01a002
-MISC ChangeLog 16419 SHA256 387ef900e814e2c3a22f8916ce16f2affcef898fa791092cd4f5afd4cadb0258 SHA512 fd0d3c13ab797cfbd38a0e2373532e582572d95efb6909cf3a6d69fbebb4bc8d86ef80ef3a464b912246a972e87e14788ab74f76b6c7f33be0ba1a5cc98417fe WHIRLPOOL 883344999966fdff227ed7eae039c11b2c7eccdaaf303321b701e80680373a758b6a7167323f5f29ec75dfe6d8e61c3886124f125fbde4bb0ecdbc09794cd5eb
+EBUILD x11vnc-0.9.13_p20150111.ebuild 1519 SHA256 85c3a66692cd0c355f1ee0debeaa4d3f518111f4c0d34b281f233dde332bc2a0 SHA512 5fc3696235d267b3638988aa85294a308446ef98220ab9f77156d95c4e6e4dc9eadd4a5db347d6f001c7faccb28a6534348cd8a3776868b4c4b6dcc4f704a20a WHIRLPOOL de225dfba0126415ef563089995c13963fa0726c8291ca9e3e8a3fa6cba335e6dfdb429e55b68dd7af9ea7313170cbd8c965ece8db58f2ef8e882b0e2d4999af
+MISC ChangeLog 16534 SHA256 e00fc92438762993315d9f0dee8ef9c6c14899a23e726915bea9fc7002d2a1ab SHA512 0b7aaa6b11e829655af0e42fbb86311e56c8e837006424df2673bcb8241955251b801feffda645ee3d897f4e8d176ca8b8c77bcaef44b4dbf621703894962606 WHIRLPOOL 098d3869aa4ca8b3945810fea751ade0337eeb3ebfc82a7a32e1fce16ea0094134c9a853185ddbcd52bf3ce998759347658764293927d1ac474c2350e0a96375
 MISC metadata.xml 787 SHA256 64ad995b0b6204b341fc98ea1653e64672ffb3f809f355c2859a02bee6867945 SHA512 3a4e1c0cfb53204c14f6b7da7e577640dcb78515cb08be0f67de9768e8ca3243c7fcd22a1794a8d93a7c407e8bb120c3331e567f5a0839fdff61176540e86706 WHIRLPOOL 0137d373d8faffa0d58e381ff6668137d0125063c9a61acfe3494cb60321667cddd0a94434b7d5a1f88f5fee54df1b09b3d0e8d20540fe82a7b6a9c88ddfd0ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVf8HaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyjkP/ArkkEepftm3zo71KlEEhr7v
-LgPZCFgHdvRwJ05+YyRAIHq+KZfXtFR4xJ/vq7HJXhfjyR6vVpn9JJ5+GlBhXLDj
-53RGrNYdtMNfLyCrhhnUjV2xP6jYd4frQJ0aJ4d0CV6K0+Y5Sc58CBZqQkAkxn69
-7BFDZLt5EvvybvZaMJ6qb8DKjYcaAznz2OhsSy3BxGJkR8aaMRHMpd9VyOCCUjL8
-9gFQQWCB3Tc2yOD96CsMBoPFoMgScZ64HW5Xn4UBzoqI2HgLk7huY2jB9C5vTsR5
-LGJFykhf6SpKVe7gco8cFSuckBNmSsjsLsL7fNG8XvQVVf1p3u9Oe36h4lOsKFTh
-L5oHHDlzxA7NxPTTDAFvv392Osf5TVfWy6XBbzVn1smiBgafY4huEW36b0TgZQeM
-Jf4OuDxM1vBkJFQvb087tO/CIgkARkePsowzBEEY9d16+FiUFYQoAM2SZoCZUb1p
-fbKdvVqZFXpZorNjaSj7H9nU6m0XQmIs5t6EZ3DEvCJ226pwvkqSD/AhnCgJmSzC
-mnHO1+RC7zgquNA4ylbv0EHQiX53Y0B4QryshGO8IDon0DNh43w0UKo3FIvVgEmH
-z5PXtFbSzRj7958n83eJPEI5sl3e/87Xwyiy6ntkTP40o/giGsXdDHNuSHEk25o6
-TcEwISKG975R3b91p6m9
-=zaag
+iQIcBAEBCAAGBQJVgTa+AAoJELp701BxlEWfY6cQAMim91zzHrcPrIswIiJwVMLg
+Wx4Zx+NZwucA1u+FyGgKqIzH9eWe1hASS7Bq+CtTM0rjeW9m5cV64DtQC/2j+mTd
+3X20yPv3GRVrkDKs8IRRgJFQPbvF5XadhAMeWZzfrY55fC3C0NFhARi+tsKVyFGU
+wcv257RmERkkcjQ2DpGi5eP+mjEhSzvJ7uMQIIwFyBdp2RY/23tfvrLn5M8kSTDJ
+YsV3J3PXEDAlEYk+nanBRhyM4e97u2f9CJ/S1qLYmuabR1pKYbfFSJSJ1rgkue35
+RWvLkPlY1RKFRH6WiIdAh66D8HYouoWTN+w0wDjQKV01UJxhKDXiBr84Ewm0WILM
+OKAYU13Yizsg0gVRtMvEMH95wQ9TplPvJK+UXOjJV0gd9vwYSr3cMkAd2Az8qldd
+vtZ0pf1ik5d1GfNqdFYh2HFJCTdoMcB/eSKMQQnZs5zt0xa+FluNWaIM9cSxaEsd
+AXKRUQJpl6U4I4n1Qfgyv4oj21iOfOHb38DKd0v21YZwKoDI8jsuJHlAemJq7kHg
+VyivY4//XJ8dcenLOn/Ughfed1AIrtrOHcQzk7IQ6ygu0Ps83oo++Au2aD2iTS/0
+wwJO6zOGoF9gHqjH9VD/5DqZa+HkCxWN3OSSAzUynvIUW8nlN3u7+QhUK7CHEFJP
+P9TWHkhHN+4hdmNTCz5c
+=Bnb8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
index 55eb42e47fbb..abc10897c473 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild,v 1.7 2015/05/21 16:19:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild,v 1.8 2015/06/17 08:58:38 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1a
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon ssl xinerama"
 
 RDEPEND="