diff --git a/app-admin/cancd/cancd-0.1.0-r2.ebuild b/app-admin/cancd/cancd-0.1.0-r3.ebuild
similarity index 84%
rename from app-admin/cancd/cancd-0.1.0-r2.ebuild
rename to app-admin/cancd/cancd-0.1.0-r3.ebuild
index c829de6a16fc..bf854e1bcff5 100644
--- a/app-admin/cancd/cancd-0.1.0-r2.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r3.ebuild
@@ -1,6 +1,8 @@
-# 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/app-admin/cancd/cancd-0.1.0-r2.ebuild,v 1.1 2011/12/31 15:42:32 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/cancd-0.1.0-r3.ebuild,v 1.1 2015/05/03 17:27:52 bircoph Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,9 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch #246734
 	epatch "${FILESDIR}"/${P}-c-cleanup.patch
 	# slight makefile cleanup
@@ -26,12 +26,8 @@ src_unpack() {
 		Makefile || die
 }
 
-src_compile() {
-	emake cancd || die "emake failed"
-}
-
 src_install() {
-	dosbin cancd || die "dosbin failed"
+	dosbin cancd
 	newinitd "${FILESDIR}"/cancd-init.d cancd
 	newconfd "${FILESDIR}"/cancd-conf.d cancd
 	newinitd "${FILESDIR}"/netconsole-init.d netconsole
diff --git a/app-admin/cancd/files/netconsole-init.d b/app-admin/cancd/files/netconsole-init.d
index 8636131be587..9f25356b9582 100644
--- a/app-admin/cancd/files/netconsole-init.d
+++ b/app-admin/cancd/files/netconsole-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-init.d,v 1.3 2005/11/19 01:33:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cancd/files/netconsole-init.d,v 1.4 2015/05/03 17:27:52 bircoph Exp $
 
 depend() {
 	need net
@@ -45,7 +45,7 @@ checkconfig() {
 		return 1
 	fi
 
-	LC_ALL=C /sbin/ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null
+	LC_ALL=C ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null
 	ret=$?
 
 	if [ -z "${DEVICE}" -o "${ret}" -gt 0 ]; then
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
index 5d7402f7fa29..6d9dd2697ed1 100644
--- a/app-admin/fleet/Manifest
+++ b/app-admin/fleet/Manifest
@@ -1,3 +1,2 @@
 DIST fleet-0.10.0.tar.gz 427728 SHA256 024b29cb217a81d04a48e6e5017549149fccfe76042a3570e9a3b8206cefcf48 SHA512 e9ffb51ab6be508e8c5f07860f6ef7c2beabed039870cd4926397ff8d28c9dcdb01c6d18fe513bc429ab9bde7eb8a91644b0534b8396d5ad33d1ace8e7dd7ac6 WHIRLPOOL 458830e2fe0c0937665e4e4ec23992801aaa6938e62b08f1486568fe92f70731f4dfeb83a8b13f5161d8819df7a409388db1c1849ceb3f4011179ea86303b3b0
-DIST fleet-0.9.1.tar.gz 404954 SHA256 573387652fb5b4d6fad99ec344502edd575550bc649ffb6bf43b38309cd85ce7 SHA512 acc80707a6a0142b731c963474a7b31d43790007a28eb05e05f229bc1fb7775cbd64e0ff8cb469954ec76a0219f7501f4b8b51dce4b772ea5db7b3afb97fe50c WHIRLPOOL 8536f5d92090ac20aa2da26153f1c0769ca3288016b27619921036126dd94611e59a678d5f78847e1df61328e6aa4e89f5a2b001a4ce2ebe7a2a3067b57498e7
-DIST fleet-0.9.2.tar.gz 405420 SHA256 7b5c1dd091b304f8e6cbf31a102533a697d4e3212d34eeca53daa69445f71555 SHA512 b7280b1d714162569942db22ba029ff46b28413d81b1c3c9f94876fc7a1e879c58bf4471d813d5121a0a9a0f76d580b9fc146a01af5dc2303bf43536d6d23c7a WHIRLPOOL 9e314a6328ea15b876f083a3b68478b85d1c12d314d210b40e7ac7a1a5950716c27cb82d60a3c950a64107358c97b9ac9b1212bd4d24ece8e8a8f5389359033b
+DIST fleet-0.10.1.tar.gz 427799 SHA256 395d49fcd506803acb6e6e1d9528072ea7469b66d7d317ffbe45e6fe931a53b6 SHA512 5acc5033bb8080863fa8585dc69d1767d6f6697f62982d9629ac9e0272d9de01c6a301114851392106f58880e63b490c5ab7e57b1a0a9c33b6c63e1e1622d80a WHIRLPOOL dc8f5f2fb73fea6c0456eb736688b6fcc73b0ff992ae5d65c0b8668c7414774b1ac16776cd45ac649e674b3c5c7539af663f9f776b2131042e436a3c285a8869
diff --git a/app-admin/fleet/fleet-0.9.1.ebuild b/app-admin/fleet/fleet-0.10.1.ebuild
similarity index 56%
rename from app-admin/fleet/fleet-0.9.1.ebuild
rename to app-admin/fleet/fleet-0.10.1.ebuild
index 63f49d224905..5a10e5ba6198 100644
--- a/app-admin/fleet/fleet-0.9.1.ebuild
+++ b/app-admin/fleet/fleet-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/app-admin/fleet/fleet-0.9.1.ebuild,v 1.1 2015/02/28 21:42:53 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-0.10.1.ebuild,v 1.1 2015/05/02 15:52:50 alunduil Exp $
 
 EAPI=5
 
@@ -31,7 +31,8 @@ src_install() {
 	dobin "${S}"/bin/fleetd
 	dobin "${S}"/bin/fleetctl
 
-	systemd_dounit "${FILESDIR}"/fleetd.service
+	systemd_dounit "${FILESDIR}"/fleet.service
+	systemd_dounit "${FILESDIR}"/fleet.socket
 
 	dodoc README.md
 	use doc && dodoc -r Documentation
@@ -43,8 +44,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "If you're upgrading from a version less than 0.8.0, please read the messages!"
-	elog "The fleet binary name changed to fleetd."
-	elog "If you're using systemd, update your configuration:"
-	elog "  systemctl disable fleet && systemctl enable fleetd"
+	ewarn "Please read this if you are upgrading from a version <0.10.0-r1."
+	ewarn ""
+	ewarn "Starting with fleet 0.10 the fleetctl utility has"
+	ewarn "'--endpoint=unix:///var/run/fleet.sock' as default argument, which is"
+	ewarn "why we have introduced the fleet.socket unit and renamed the service"
+	ewarn "from fleetd.service to fleet.service. If you run fleet on system"
+	ewarn "startup, please re-enable it via 'systemctl enable fleet'."
 }
diff --git a/app-admin/fleet/fleet-0.9.2.ebuild b/app-admin/fleet/fleet-0.9.2.ebuild
deleted file mode 100644
index e790a13af502..000000000000
--- a/app-admin/fleet/fleet-0.9.2.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/app-admin/fleet/fleet-0.9.2.ebuild,v 1.1 2015/04/05 15:00:43 alunduil Exp $
-
-EAPI=5
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples"
-
-DEPEND=">=dev-lang/go-1.3"
-RDEPEND=""
-
-src_compile() {
-	./build || die 'Build failed'
-}
-
-RESTRICT="test"  # Tests fail due to Gentoo bug #500452
-src_test() {
-	./test || die 'Tests failed'
-}
-
-src_install() {
-	dobin "${S}"/bin/fleetd
-	dobin "${S}"/bin/fleetctl
-
-	systemd_dounit "${FILESDIR}"/fleetd.service
-
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	use examples && dodoc -r examples
-
-	keepdir /etc/${PN}
-	insinto /etc/${PN}
-	newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
index 03d99e315992..8b4d028df78e 100644
--- a/app-admin/fleet/fleet-9999.ebuild
+++ b/app-admin/fleet/fleet-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/app-admin/fleet/fleet-9999.ebuild,v 1.5 2015/04/17 23:27:25 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fleet/fleet-9999.ebuild,v 1.6 2015/05/02 15:56:46 alunduil Exp $
 
 EAPI=5
 
@@ -33,7 +33,8 @@ src_install() {
 	dobin "${S}"/bin/fleetd
 	dobin "${S}"/bin/fleetctl
 
-	systemd_dounit "${FILESDIR}"/fleetd.service
+	systemd_dounit "${FILESDIR}"/fleet.service
+	systemd_dounit "${FILESDIR}"/fleet.socket
 
 	dodoc README.md
 	use doc && dodoc -r Documentation
@@ -43,3 +44,13 @@ src_install() {
 	insinto /etc/${PN}
 	newins "${PN}".conf.sample "${PN}".conf
 }
+
+pkg_postinst() {
+	ewarn "Please read this if you are upgrading from a version <0.10.0-r1."
+	ewarn ""
+	ewarn "Starting with fleet 0.10 the fleetctl utility has"
+	ewarn "'--endpoint=unix:///var/run/fleet.sock' as default argument, which is"
+	ewarn "why we have introduced the fleet.socket unit and renamed the service"
+	ewarn "from fleetd.service to fleet.service. If you run fleet on system"
+	ewarn "startup, please re-enable it via 'systemctl enable fleet'."
+}
diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
index daadc93eea43..61f11f2cfaef 100644
--- a/app-arch/cabextract/Manifest
+++ b/app-arch/cabextract/Manifest
@@ -1,2 +1 @@
-DIST cabextract-1.4.tar.gz 222490 SHA256 f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e SHA512 013c55efd8847bbc42432cde1bc4f6232f5b627ef8d7fadbf5793e47e3e06b5c1d428846cb38921d6c758fd508abfcc68aac3214762b9d4bfcb7277bd8bbbb94 WHIRLPOOL fd1e8e7b9dfa6c8e8e920371a44f2b641d2fc1a8429f2924fdd12cca583f71e8e6d972b251e2315359ae0c469b0127993dfe2840a65265be134e3f4dbc6f8cd2
 DIST cabextract-1.6.tar.gz 241731 SHA256 cee661b56555350d26943c5e127fc75dd290b7f75689d5ebc1f04957c4af55fb SHA512 d1c71c0292e3d73d8edbff5f5230b3127c63028f5aba1d0cad968bc945202fb9c0773327affce3d28466068377f029c80735adbabe0929d29b2204dea73738f8 WHIRLPOOL 5816e3f6ee3a3caad574bbc3d8aeff55bb99383a4ce80a40332d59696a1d4fbaba6823e9a77023e7cbbc257a0693a35f7817d7ff20383b30898de5d4e50eb1f2
diff --git a/app-arch/cabextract/cabextract-1.4.ebuild b/app-arch/cabextract/cabextract-1.4.ebuild
deleted file mode 100644
index a530beccf419..000000000000
--- a/app-arch/cabextract/cabextract-1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.4.ebuild,v 1.13 2015/03/29 11:22:52 yngwin Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extracts files from Microsoft cabinet archive files"
-HOMEPAGE="http://www.cabextract.org.uk/"
-SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~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"
-IUSE="extras"
-
-RDEPEND="extras? ( dev-lang/perl )"
-
-# the code attempts to set up a fnmatch replacement, but then fails to code
-# it properly leading to undefined references to rpl_fnmatch().  This may be
-# removed in the future if building still works by setting "yes" to "no".
-export ac_cv_func_fnmatch_works=yes
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic
-	dohtml doc/wince_cab_format.html
-	if use extras; then
-		dobin src/{wince_info,wince_rename,cabinfo}
-	fi
-}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index f6e8451a8402..e0d80361b182 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1 +1,2 @@
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
+DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5
diff --git a/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch b/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch
new file mode 100644
index 000000000000..fcdd88b4c3db
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.1-memleak.patch
@@ -0,0 +1,26 @@
+From 03e4207f11e228a4c079af991f82507539793bae Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 28 Apr 2015 13:01:16 -0400
+Subject: [PATCH] fix small memory leak in pinentry-curses
+
+* pinentry/pinentry-curses.c: free internally allocated local string.
+---
+ pinentry/pinentry-curses.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
+index 4b7080e..043f8a9 100644
+--- a/pinentry/pinentry-curses.c
++++ b/pinentry/pinentry-curses.c
+@@ -199,6 +199,8 @@ utf8_to_local (char *lc_ctype, char *string)
+   memset (&ps, 0, sizeof(mbstate_t));
+   mbsrtowcs (wcs, &p, len, &ps);
+ 
++  free (local);
++  
+  leave:
+   if (old_ctype)
+     {
+-- 
+2.1.4
+
diff --git a/app-crypt/pinentry/pinentry-0.9.1.ebuild b/app-crypt/pinentry/pinentry-0.9.1.ebuild
new file mode 100644
index 000000000000..9e682d5ea169
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.1.ebuild,v 1.1 2015/05/03 15:17:14 alonbl Exp $
+
+EAPI=5
+
+inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="clipboard gtk ncurses qt4 caps static"
+
+RDEPEND="
+	app-eselect/eselect-pinentry
+	caps? ( sys-libs/libcap )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+	static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gtk? ( virtual/pkgconfig )
+	qt4? ( virtual/pkgconfig )
+	ppc-aix? ( dev-libs/gnulib )
+"
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 )
+	gtk? ( !static )
+	qt4? ( !static )
+	static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-memleak.patch"
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	if [[ ${CHOST} == *-aix* ]] ; then
+		append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include"
+		append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)"
+		append-libs -lgnu
+	fi
+
+	# Issues finding qt on multilib systems
+	export QTLIB="${QTDIR}/$(get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt4 pinentry-qt4) \
+		$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
+		$(use_with caps libcap) \
+		MOC="$(qt4_get_bindir)"/moc
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 0e66ce92f7db..d226a9717a69 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -2,5 +2,6 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4
 DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
 DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
 DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
+DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
diff --git a/app-editors/gvim/gvim-7.4.712.ebuild b/app-editors/gvim/gvim-7.4.712.ebuild
new file mode 100644
index 000000000000..9233928f1520
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.712.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.712.ebuild,v 1.1 2015/05/03 07:05:05 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			>=x11-libs/gtk+-2.6:2
+			x11-libs/libXft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				neXt? ( x11-libs/neXtaw )
+				!neXt? ( x11-libs/libXaw )
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	if use python ; then
+		py_add_interp() {
+			local v
+
+			[[ ${EPYTHON} == python3* ]] && v=3
+			myconf+=(
+				--enable-python${v}interp
+				vi_cv_path_python${v}="${PYTHON}"
+			)
+		}
+
+		python_foreach_impl py_add_interp
+	else
+		myconf+=(
+			--disable-pythoninterp
+			--disable-python3interp
+		)
+	fi
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "Vim 7 includes an integrated spell checker. You need to install"
+		elog "word list files before you can use it. There are ebuilds for"
+		elog "some of these named app-vim/vim-spell-*. If your language of"
+		elog "choice is not included, please consult vim-spell.eclass for"
+		elog "instructions on how to make a package."
+		echo
+		ewarn "Note that the English word lists are no longer installed by"
+		ewarn "default."
+		echo
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 978d31e0fb11..01e1c0720b5b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -2,6 +2,7 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4
 DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
 DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
 DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
+DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
diff --git a/app-editors/vim-core/vim-core-7.4.712.ebuild b/app-editors/vim-core/vim-core-7.4.712.ebuild
new file mode 100644
index 000000000000..fb8c575c37c9
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.712.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.712.ebuild,v 1.1 2015/05/03 06:55:01 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 0e66ce92f7db..d226a9717a69 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,5 +2,6 @@ DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a4
 DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
 DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
 DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
+DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
diff --git a/app-editors/vim/vim-7.4.712.ebuild b/app-editors/vim/vim-7.4.712.ebuild
new file mode 100644
index 000000000000..78ed6f0488a9
--- /dev/null
+++ b/app-editors/vim/vim-7.4.712.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.712.ebuild,v 1.1 2015/05/03 07:03:35 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://vim.googlecode.com/hg/"
+	EHG_PROJECT="vim"
+else
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? (
+		|| ( $(python_gen_useflags '*') )
+		?? ( $(python_gen_useflags 'python2*') )
+		?? ( $(python_gen_useflags 'python3*') )
+	)
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
+
+		if use python ; then
+			py_add_interp() {
+				local v
+
+				[[ ${EPYTHON} == python3* ]] && v=3
+				myconf+=(
+					--enable-python${v}interp
+					vi_cv_path_python${v}="${PYTHON}"
+				)
+			}
+
+			python_foreach_impl py_add_interp
+		else
+			myconf+=(
+				--disable-pythoninterp
+				--disable-python3interp
+			)
+		fi
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use X ; then
+			echo
+			elog "The 'X' USE flag enables vim <-> X communication, like"
+			elog "updating the xterm titlebar. It does not install a GUI."
+		fi
+		echo
+		elog "To install a GUI version of vim, use the app-editors/gvim"
+		elog "package."
+		echo
+		elog "Vim 7 includes an integrated spell checker. You need to install"
+		elog "word list files before you can use it. There are ebuilds for"
+		elog "some of these named app-vim/vim-spell-*. If your language of"
+		elog "choice is not included, please consult vim-spell.eclass for"
+		elog "instructions on how to make a package."
+		echo
+		ewarn "Note that the English word lists are no longer installed by"
+		ewarn "default."
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 3415e8ac0298..c9e7c51951b3 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-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/app-editors/vim/vim-9999.ebuild,v 1.27 2015/03/31 17:37:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.28 2015/05/03 07:03:35 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -125,7 +125,7 @@ src_prepare() {
 			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
 					vim \\
 						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man' \\
+						-c 'set nolist nomod ft=man ts=8' \\
 						-c 'let g:showmarks_enable=0' \\
 						-c 'runtime! macros/less.vim' -
 			END
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index e26eb5817395..3ead43041656 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,2 @@
 DIST docker-compose-1.2.0.tar.gz 57150 SHA256 46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4 WHIRLPOOL c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0
-DIST docker-compose-1.2.0_rc3.tar.gz 57366 SHA256 1d95191aebc31fd25b770217688407628390b5e5f09b1fd1a4e01ee0dc5fedeb SHA512 8a240648ecdb0bcb6e21ab5d217f8b7ad788732aa1648f8b6ce62db398562970fe4902e3ec9eeb528d9366195ab2d33d908b77c7d03f97322fe14a821b50d8f2 WHIRLPOOL 0776a5f1fd3fd157757910686e34b348991c17cfa0128118d09648dc42e79c97481a2e2be927ff3edebb76d0a6e66706eb9124aba840ba679d67705625c8a5f6
 DIST docker-compose-1.2.0_rc4.tar.gz 57629 SHA256 f164816b1c0349e602dfc251fc6ec674e7218a90979e5c8a7d38bf7eb061fc40 SHA512 1ae1ce6ab67615a5ca274507cdf3a782c98d379c7aa4de76917d2a1df00990dcb4210d14364a3bdb7744a56a8ac38127b41f4d91766d5c7de4f3eaefc7fb2558 WHIRLPOOL b5456e4d488054d4dec71cd2c1a720546f6bab58126ba598d3858cba666d86e42c0657431ec41fecca9b2c810a6e37ca1eeb6f5fbfc4ecdddd6ff55c491c1ced
diff --git a/app-emulation/docker-compose/docker-compose-1.2.0_rc3.ebuild b/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild
similarity index 83%
rename from app-emulation/docker-compose/docker-compose-1.2.0_rc3.ebuild
rename to app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild
index ed3b0fbf9f99..2b12579ea750 100644
--- a/app-emulation/docker-compose/docker-compose-1.2.0_rc3.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0_rc3.ebuild,v 1.1 2015/04/05 03:34:14 alunduil Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild,v 1.1 2015/05/02 15:59:55 alunduil Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV="${PV//_/}"
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -29,7 +27,6 @@ CDEPEND="
 	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	<dev-python/requests-2.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/six-2[${PYTHON_USEDEP}]
 	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
@@ -46,6 +43,14 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/requests-requirements.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	nosetests tests/unit || die "tests failed under ${EPYTHON}"
 }
diff --git a/app-emulation/docker-compose/files/requests-requirements.patch b/app-emulation/docker-compose/files/requests-requirements.patch
new file mode 100644
index 000000000000..a897baf34618
--- /dev/null
+++ b/app-emulation/docker-compose/files/requests-requirements.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 39ac0f6..91d8b5b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -27,7 +27,7 @@ def find_version(*file_paths):
+ install_requires = [
+     'docopt >= 0.6.1, < 0.7',
+     'PyYAML >= 3.10, < 4',
+-    'requests >= 2.2.1, < 2.6',
++    'requests >= 2.2.1',
+     'texttable >= 0.8.1, < 0.9',
+     'websocket-client >= 0.11.0, < 1.0',
+     'docker-py >= 1.0.0, < 1.2',
diff --git a/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
index d5875d8ea1b8..333699f1725d 100644
--- a/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild,v 1.1 2015/04/19 11:07:53 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.14-r2.ebuild,v 1.2 2015/05/03 09:23:08 tamiko Exp $
 
 EAPI=5
 
@@ -39,7 +39,8 @@ LICENSE="LGPL-2.1"
 # TODO: Reenable IUSE wireshark-plugins
 IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
 	+macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd"
+	selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
+	elibc_glibc systemd"
 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
@@ -56,8 +57,6 @@ REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
 # We can use both libnl:1.1 and libnl:3, but if you have both installed, the
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
-
-# wireshark-plugins? ( net-analyzer/wireshark:= )
 RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
@@ -101,6 +100,7 @@ RDEPEND="sys-libs/readline
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	systemd? ( sys-apps/systemd )
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
 	virt-network? ( net-dns/dnsmasq[script]
@@ -333,7 +333,7 @@ src_configure() {
 	myconf+=" $(use_with audit)"
 
 	# wireshark dissector
-	# myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
+	myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
 
 	## stuff we don't yet support
 	myconf+=" --without-netcf"
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index fb1f89892414..752207b7f481 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1 +1 @@
-DIST eselect-rust-0.2_pre20150206.tar.gz 63707 SHA256 c034f8f56b74477c552cd74b40f30d0149b8426ca73f12c5c63ad7d5b301266f SHA512 95dadf94b69779a800869ee30565f2b8f6d1d54263919f692c0736310da5b4fd3ad83922ef736ec177fb90c2fe5c326c9756a8448d0ff55054035c1f52295ebd WHIRLPOOL d5ad6c308ff5316811bfe182f67282e0a514677972b08174be58b5277522de49094d4f4311d91b63ba7abe4c1d462947cbbe905e65b767afb64d374d0cadd4a4
+DIST eselect-rust-0.3_pre20150428.tar.gz 64722 SHA256 2c8c8703ef252d3504befc67da37c1ff5bc7f7df876754ae962a8805ed7d0837 SHA512 214a6eb4b1f9bfcaed1a5fe92ec9633a82316716ffda8db2d2f88bfcbdae17ef7c026091de3927efad5c3624bb7003166d2ebadea6dd8828a0f1c41e0d3f16e7 WHIRLPOOL 18b5564fbb92030c28a2d18a46ea860d9f98d86ef136cbba25af7d769f6799e71bcbb6d7e1fc9983a6b40b350e4840d684716c21cb8d52fe8dd7ef2854f317a2
diff --git a/app-eselect/eselect-rust/eselect-rust-0.2_pre20150206.ebuild b/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
similarity index 83%
rename from app-eselect/eselect-rust/eselect-rust-0.2_pre20150206.ebuild
rename to app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
index 3f8fe91db6df..1ecf6b8b3666 100644
--- a/app-eselect/eselect-rust/eselect-rust-0.2_pre20150206.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
@@ -1,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-rust/eselect-rust-0.2_pre20150206.ebuild,v 1.1 2015/03/31 16:56:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild,v 1.1 2015/05/03 16:21:00 jauhien Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="app-admin/eselect"
 
 pkg_preinst() {
-	if has_version "${CATEGORY}/${PN}" ; then
+	if has_version 'app-eselect/eselect-rust' ; then
 		eselect rust unset
 	fi
 }
diff --git a/app-laptop/gkrellm-pmu/Manifest b/app-laptop/gkrellm-pmu/Manifest
deleted file mode 100644
index 9fbaa0931997..000000000000
--- a/app-laptop/gkrellm-pmu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gkrellm-pmu-2.5.tar.gz 122832 SHA256 2a60cbbb0a82cc9240bb95cd7c0e779666066f1a17dcb9ae21a94c2bb48970c1 SHA512 6892702f1a78f78367e0328da76e60b197e0dabb47f016b6e610954b00075b585b56950a4c6f700aa9bc0463d948d25c505ed299ea5c7d44a66177642e47ffd6 WHIRLPOOL 45afe2b9eed2ac95fe9a37dde3176f5549d00c2c59d21941f03f713aee0ba3463da8e89274a53d21a0f845420e9cd9541b53e0c48e7ba4aed274cd460ce2df5c
diff --git a/app-laptop/gkrellm-pmu/gkrellm-pmu-2.5.ebuild b/app-laptop/gkrellm-pmu/gkrellm-pmu-2.5.ebuild
deleted file mode 100644
index ddb07392bacb..000000000000
--- a/app-laptop/gkrellm-pmu/gkrellm-pmu-2.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gkrellm-pmu/gkrellm-pmu-2.5.ebuild,v 1.4 2011/03/27 11:41:29 nirbheek Exp $
-
-EAPI="1"
-
-DESCRIPTION="GKrellM2 plugin for battery display on Apple machines"
-HOMEPAGE="http://pbbuttons.sourceforge.net/projects/gkrellm-pmu/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND="x11-libs/gtk+:2
-	=app-admin/gkrellm-2*
-	app-laptop/pbbuttonsd"
-
-src_install() {
-	dodir /usr/lib/gkrellm2/plugins
-	emake DESTDIR="${D}" PLUGIN_INSTALL="${D}/usr/lib/gkrellm2/plugins" install|| die
-	dodoc ChangeLog INSTALL README
-}
diff --git a/app-laptop/gtkpbbuttons/Manifest b/app-laptop/gtkpbbuttons/Manifest
deleted file mode 100644
index b1754330bf22..000000000000
--- a/app-laptop/gtkpbbuttons/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtkpbbuttons-0.6.10.tar.gz 713779 SHA256 72ab1322838611281a0a95394195165902faaeadec257711c3c8b301b146873e SHA512 03542353367913babd388a755157e340742bf3e07ce990b16255b9b933ff3ed1bd2019a46c03f71fa19079e6fcd13a46fbd136e380c4b2ebf3a66eb515096c08 WHIRLPOOL febf4282dba0645d63979d1440ceb9c791463fd5b4c64f3cc555be43e05fbfc9fe9acdc3386d5e16929cfec707fb6564a4409c0e0aa9249b5ea05e9fb046b4fe
diff --git a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.10.ebuild b/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.10.ebuild
deleted file mode 100644
index d36b30d6f55c..000000000000
--- a/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/gtkpbbuttons/gtkpbbuttons-0.6.10.ebuild,v 1.4 2011/03/27 11:41:56 nirbheek Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="On screen display client for pbbuttonsd"
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~x86"
-IUSE="gnome"
-
-DEPEND="x11-libs/gtk+:2
-	>=media-libs/audiofile-0.1.9
-	dev-libs/popt
-	>=app-laptop/pbbuttonsd-0.7.9
-	gnome? ( gnome-base/libgnomeui )"
-
-src_compile() {
-	local myconf=""
-	use gnome && myconf="--with-gnome"
-	econf ${myconf}
-	make || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc README
-}
diff --git a/app-laptop/gtkpbbuttons/metadata.xml b/app-laptop/gtkpbbuttons/metadata.xml
deleted file mode 100644
index 034c09eb248a..000000000000
--- a/app-laptop/gtkpbbuttons/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ppc</herd>
-</pkgmetadata>
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 90393f86e960..cb10eef3f069 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,4 +1,2 @@
-DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
-DIST tracker-1.0.5.tar.xz 6061704 SHA256 9e77f8f731f44782a1468cc6dcf7f76bc9d7d7eb462c1b34062981a9c348ef16 SHA512 d5601a1d89bd6da52750b55a742005897fc4c4bd2280a5e56c462b3542473b8172d21c1e3a57cdb3e81c3ed5ed7810510e82e601fa43723df3c41a3100f61fd7 WHIRLPOOL 1165cd8a0e29fa13fe6a0410b8f9de3d277fc032496a13d2c6bca1cd9187d5bfc829ea05380d22a3262ac966a422a8bd85a9ab0fc4d7ffc8b76bddabdd2634e8
-DIST tracker-1.0.6.tar.xz 5975264 SHA256 e351ac3c182fc740afdc651d3884f8af0a8f897948a9ecc784d91bb1f9af62f9 SHA512 687ba883513a6854e99e3adc0fc5cfd2e2fb66b38486079ed178bd7c5730def4e5a8e07de32f081b30d9ac93dca5418d5c9ba782c3f80c539b3fa05b829b4b17 WHIRLPOOL 1c289d84ce63638e4a141b34d316dfaa69df26f58ac8f72154ee30e0a0bd60c3b14255cd5d900f671dd79f46d48cf3952f13b6f2e391e4b32320aca6e540a58f
 DIST tracker-1.2.5.tar.xz 6033708 SHA256 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa SHA512 8b2027e4350286d1d9c8274aa7addf0653f116389584b2cea35dc9d68563135340ac89873027d531beea2cce44b20d4a9718d6986fb486a2ef77f9cab8189699 WHIRLPOOL 4e1e923106a4b732029db9e12d8e4576aa71db64a803b8afc91f0d41793a6d22f8eb7654d0b3ac71af21ab5061432ddae1db0b3afc97d019c246c4eabf1f14d3
+DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
diff --git a/app-misc/tracker/tracker-1.0.2.ebuild b/app-misc/tracker/tracker-1.0.2.ebuild
deleted file mode 100644
index 5497297acb67..000000000000
--- a/app-misc/tracker/tracker-1.0.2.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.2.ebuild,v 1.5 2015/04/08 07:30:30 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.14"
-
-inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
-pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# sqlite-3.7.16 for FTS4 support
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.16:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4.8.1.1:=
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/libmediaart-0.1:1.0
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5:=
-		>=gnome-extra/evolution-data-server-3.3.5:=
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? ( >=virtual/ffmpeg-9 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=dev-libs/libgee-0.3:0.8
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16:=[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( net-libs/libgrss:0.5 )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
-
-# configure mixes enable-compile-warnings and with-compile-warnings
-# See upstream bug #705315
-QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# Skip broken tests
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
-	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
-		-i tests/libtracker-common/tracker-file-utils-test.c || die
-	# Fails inside portage, not outside
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
-	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
-		-i tests/tracker-steroids/tracker-test.c || die
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-nautilus-extension \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-icon \
-		--enable-ps \
-		--enable-text \
-		--enable-guarantee-metadata \
-		--enable-introspection \
-		--enable-libpng \
-		--enable-libmediaart \
-		--enable-tracker-fts \
-		--enable-enca \
-		--with-unicode-support=libicu \
-		$(use_enable cue libcue) \
-		$(use_enable eds miner-evolution) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-1.0.6.ebuild b/app-misc/tracker/tracker-1.0.6.ebuild
deleted file mode 100644
index b945d3876364..000000000000
--- a/app-misc/tracker/tracker-1.0.6.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.6.ebuild,v 1.4 2015/04/08 07:30:30 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/100"
-IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
-pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	?? ( gstreamer ffmpeg )
-	cue? ( gstreamer )
-	upnp-av? ( gstreamer )
-	!miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-"
-
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-# sqlite-3.7.16 for FTS4 support
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7.16:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4.8.1.1:=
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/libmediaart-0.1:1.0
-	>=x11-libs/pango-1:=
-	sys-apps/util-linux
-
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5:=
-		>=gnome-extra/evolution-data-server-3.3.5:=
-		<mail-client/evolution-3.5.3
-		<gnome-extra/evolution-data-server-3.5.3 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	ffmpeg? ( >=virtual/ffmpeg-9 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	gif? ( media-libs/giflib )
-	gsf? ( >=gnome-extra/libgsf-1.14.24 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	gtk? (
-		>=dev-libs/libgee-0.3:0.8
-		>=x11-libs/gtk+-3:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.2.9:= )
-	jpeg? ( virtual/jpeg:0 )
-	upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) )
-	mp3? ( >=media-libs/taglib-1.6 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	pdf? (
-		>=x11-libs/cairo-1:=
-		>=app-text/poppler-0.16:=[cairo,utils]
-		>=x11-libs/gtk+-2.12:2 )
-	playlist? ( >=dev-libs/totem-pl-parser-3 )
-	rss? ( net-libs/libgrss:0.5 )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )
-	xps? ( app-text/libgxps )
-	!gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	>=dev-util/gtk-doc-am-1.8
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gtk? ( >=dev-libs/libgee-0.3 )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
-
-# configure mixes enable-compile-warnings and with-compile-warnings
-# See upstream bug #705315
-QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't run 'firefox --version' or 'thunderbird --version'; it results in
-	# access violations on some setups (bug #385347, #385495).
-	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
-	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
-
-	# Skip broken tests
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
-	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
-		-i tests/libtracker-common/tracker-file-utils-test.c || die
-	# Fails inside portage, not outside
-	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
-	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
-		-i tests/tracker-steroids/tracker-test.c || die
-
-	eautoreconf # See bug #367975
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	if use gstreamer ; then
-		myconf="${myconf} --enable-generic-media-extractor=gstreamer"
-		if use upnp-av; then
-			myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
-		else
-			myconf="${myconf} --with-gstreamer-backend=discoverer"
-		fi
-	elif use ffmpeg ; then
-		myconf="${myconf} --enable-generic-media-extractor=libav"
-	else
-		myconf="${myconf} --enable-generic-media-extractor=external"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# is not being generated
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	gnome2_src_configure \
-		--disable-hal \
-		--disable-nautilus-extension \
-		--enable-abiword \
-		--enable-artwork \
-		--enable-dvi \
-		--enable-icon \
-		--enable-ps \
-		--enable-text \
-		--enable-guarantee-metadata \
-		--enable-introspection \
-		--enable-libpng \
-		--enable-libmediaart \
-		--enable-miner-apps \
-		--enable-miner-user-guides \
-		--enable-tracker-fts \
-		--enable-tracker-writeback \
-		--enable-enca \
-		--with-unicode-support=libicu \
-		$(use_enable cue libcue) \
-		$(use_enable eds miner-evolution) \
-		$(use_enable exif libexif) \
-		$(use_enable firefox-bookmarks miner-firefox) \
-		$(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
-		FIREFOX="${S}"/firefox-version.sh \
-		$(use_enable flac libflac) \
-		$(use_enable gif libgif) \
-		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-needle) \
-		$(use_enable gtk tracker-preferences) \
-		$(use_enable iptc libiptcdata) \
-		$(use_enable iso libosinfo) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable upower upower) \
-		$(use_enable miner-fs) \
-		$(use_enable mp3 taglib) \
-		$(use_enable mp3) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable pdf poppler) \
-		$(use_enable playlist) \
-		$(use_enable rss miner-rss) \
-		$(use_enable test functional-tests) \
-		$(use_enable test unit-tests) \
-		$(use_enable thunderbird miner-thunderbird) \
-		$(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
-		THUNDERBIRD="${S}"/thunderbird-version.sh \
-		$(use_enable tiff libtiff) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable xml libxml2) \
-		$(use_enable xmp exempi) \
-		$(use_enable xps libgxps) \
-		${myconf}
-}
-
-src_test() {
-	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Manually symlink extensions for {firefox,thunderbird}-bin
-	if use firefox-bookmarks; then
-		dosym /usr/share/xul-ext/trackerfox \
-			/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
-	fi
-
-	if use thunderbird; then
-		dosym /usr/share/xul-ext/trackerbird \
-			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
-	fi
-}
-
-create_version_script() {
-	# Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
-
-	local v=$(best_version ${1})
-	v=${v#${1}-}
-	local vbin=$(best_version ${1}-bin)
-	vbin=${vbin#${1}-bin-}
-
-	if [[ -z ${v} ]]; then
-		v=${vbin}
-	else
-		version_compare ${v} ${vbin}
-		[[ $? -eq 1 ]] && v=${vbin}
-	fi
-
-	echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
-	chmod +x "$3" || die
-}
diff --git a/app-misc/tracker/tracker-1.2.5.ebuild b/app-misc/tracker/tracker-1.2.5.ebuild
index e3bb7188729e..ec9237633784 100644
--- a/app-misc/tracker/tracker-1.2.5.ebuild
+++ b/app-misc/tracker/tracker-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.2.5.ebuild,v 1.4 2015/04/08 07:30:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.2.5.ebuild,v 1.5 2015/05/02 13:23:05 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -81,7 +81,7 @@ RDEPEND="
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xml? ( >=dev-libs/libxml2-2.6 )
diff --git a/app-misc/tracker/tracker-1.0.5.ebuild b/app-misc/tracker/tracker-1.2.6.ebuild
similarity index 93%
rename from app-misc/tracker/tracker-1.0.5.ebuild
rename to app-misc/tracker/tracker-1.2.6.ebuild
index 9830a4c981d5..34090dee7c50 100644
--- a/app-misc/tracker/tracker-1.0.5.ebuild
+++ b/app-misc/tracker/tracker-1.2.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/app-misc/tracker/tracker-1.0.5.ebuild,v 1.2 2015/04/08 07:30:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.2.6.ebuild,v 1.2 2015/05/02 13:23:05 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -34,14 +34,14 @@ REQUIRED_USE="
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7.16:=
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.40:2
 	>=dev-libs/gobject-introspection-0.9.5
 	>=dev-libs/icu-4.8.1.1:=
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
 	>=media-libs/libpng-1.2:0=
-	>=media-libs/libmediaart-0.1:1.0
+	>=media-libs/libmediaart-0.5:1.0
 	>=x11-libs/pango-1:=
 	sys-apps/util-linux
 
@@ -81,7 +81,7 @@ RDEPEND="
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xml? ( >=dev-libs/libxml2-2.6 )
@@ -142,6 +142,12 @@ src_prepare() {
 	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+3 d' \
 		-i tests/tracker-steroids/tracker-test.c || die
 
+	# Looks like sorting got fixed but not test reference files
+	sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
+		-o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
+	sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
+		-o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
+
 	eautoreconf # See bug #367975
 	gnome2_src_prepare
 	vala_src_prepare
@@ -173,18 +179,18 @@ src_configure() {
 		--enable-abiword \
 		--enable-artwork \
 		--enable-dvi \
-		--enable-icon \
-		--enable-ps \
-		--enable-text \
+		--enable-enca \
 		--enable-guarantee-metadata \
+		--enable-icon \
 		--enable-introspection \
-		--enable-libpng \
 		--enable-libmediaart \
+		--enable-libpng \
 		--enable-miner-apps \
 		--enable-miner-user-guides \
+		--enable-ps \
+		--enable-text \
 		--enable-tracker-fts \
 		--enable-tracker-writeback \
-		--enable-enca \
 		--with-unicode-support=libicu \
 		$(use_enable cue libcue) \
 		$(use_enable eds miner-evolution) \
diff --git a/app-portage/layman/layman-2.3.0.ebuild b/app-portage/layman/layman-2.3.0.ebuild
index 843689c9da1b..ac76f96c8157 100644
--- a/app-portage/layman/layman-2.3.0.ebuild
+++ b/app-portage/layman/layman-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/app-portage/layman/layman-2.3.0.ebuild,v 1.5 2015/02/18 13:45:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.3.0.ebuild,v 1.6 2015/05/02 09:03:46 jer Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~x86"
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 588d190e5b83..8afc8c7b675f 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,5 +1,4 @@
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
 DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
-DIST calibre-2.21.0.tar.xz 36415844 SHA256 eb15469ece3f8ac3005f6a0ec1a6ad68b58f185c5e493334ebba2edea578b1a9 SHA512 e6ebd09c8a1d981598e2d7df994682cb8adc1d0f78be1cee4afe750e72e58834ef69d4d95cd2edcd163b12771468ee44c161c66287d17130e8a6451063ca4b6d WHIRLPOOL 1e5da868d73566a0f9779a51655a045b4c1a1ab96b132a735e5e2410ebce826ed9bb72df2b04a6273a25853997836c8a3416da41cea70de8908bbd88a950020c
-DIST calibre-2.25.0.tar.xz 36706108 SHA256 208bfb6990428ac7c5b4f5105474d3787f7dec7caf1b0a8b2513ded41ab7ec40 SHA512 1cf909e6ce9b2438497ad20d334a913e188713d6040d5f89e41ad28b443e053eee5080de11ef6578c2ff4b5f902105b1c3f2b63c479a9eac1aa1db7ad15e1d1d WHIRLPOOL 4f30193b04b159fa9fce8891ae05565a04cba79f58b96d5cd9c8b48e14f8ae860ac2582228037cdf40154da5d8bdcf04d2d0f924a9f93f4375eb23c84eba2571
+DIST calibre-2.27.0.tar.xz 36776876 SHA256 6567d58a9878f4ad30756c5ce984fe555393fd94167cb23e279c2a83450e2d8e SHA512 0a87549e40f6a3da5489e29fd6969a16ca1e2d8e52ee4d1520ec146b973c3bf4aac73b182b6bb8a0d520137ebe71804543d65ca313ae1560064258c7fa9ff5fa WHIRLPOOL 11f5157c6e1121b68f50f0a923956e6130233aa04790a61ead3dd36ef601cceb15f6d58e5434e0d94cddbbcdc0f9ea84bfb0fa3839752795d8b6271d39679c90
diff --git a/app-text/calibre/calibre-2.21.0.ebuild b/app-text/calibre/calibre-2.21.0.ebuild
deleted file mode 100644
index 82c59b1985b9..000000000000
--- a/app-text/calibre/calibre-2.21.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.21.0.ebuild,v 1.1 2015/03/14 17:50:42 yngwin Exp $
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
-SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
-	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
-	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
-	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
-	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
-	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
-	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
-	dev-python/netifaces[python_targets_python2_7(-)]
-	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-	>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-imaging[python_targets_python2_7(-)]
-	virtual/ttf-fonts
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=virtual/podofo-build-0.8.2"
-
-src_prepare() {
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|PreserveMIMEDefaults():||" \
-		-e "s|xdg-icon-resource install|\\0 --mode user|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	epatch \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database}
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	while read -r -d $'\0' ; do
-		local shebang=$(head -n1 "$REPLY")
-		if [[ ${shebang} == "#!"*python* ]] ; then
-			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
-				die "sed failed"
-		fi
-	done < <(find "${ED}" -type f -print0)
-
-	einfo "Compiling python modules"
-	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-2.25.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
similarity index 98%
rename from app-text/calibre/calibre-2.25.0.ebuild
rename to app-text/calibre/calibre-2.27.0.ebuild
index 03c48eb7efeb..679e67a961b0 100644
--- a/app-text/calibre/calibre-2.25.0.ebuild
+++ b/app-text/calibre/calibre-2.27.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.25.0.ebuild,v 1.1 2015/04/18 14:25:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.27.0.ebuild,v 1.1 2015/05/02 14:39:13 yngwin Exp $
 
 EAPI=5
 inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
@@ -57,6 +57,7 @@ COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
 	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	media-libs/fontconfig
 	>=media-libs/freetype-2:=
@@ -65,7 +66,6 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libusb:1=
 	virtual/python-imaging[python_targets_python2_7(-)]
-	virtual/ttf-fonts
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
deleted file mode 100644
index 20c2acd1e41d..000000000000
--- a/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r2.ebuild,v 1.22 2013/07/29 10:14:37 pinkbyte Exp $
-
-EAPI="4"
-
-WANT_AUTOMAKE="1.12"
-
-inherit autotools eutils
-
-DESCRIPTION="Tools to convert docbook to man and info"
-SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
-HOMEPAGE="http://docbook2x.sourceforge.net/"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-
-# dev-perl/XML-LibXML - although not mentioned upstream is required
-# for make check to complete.
-DEPEND="dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-NamespaceSupport
-	dev-perl/XML-SAX
-	dev-perl/XML-LibXML
-	app-text/docbook-xsl-stylesheets
-	=app-text/docbook-xml-dtd-4.2*"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Patches from debian, for description see patches itself.
-	epatch "${FILESDIR}"/${P}-filename_whitespace_handling.patch
-	epatch "${FILESDIR}"/${P}-preprocessor_declaration_syntax.patch
-	epatch "${FILESDIR}"/${P}-error_on_missing_refentry.patch
-
-	eautoreconf #290284
-}
-
-src_configure() {
-	econf \
-		--with-xslt-processor=libxslt \
-		--program-transform-name='/^docbook2/s,$,.pl,'
-}
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
deleted file mode 100644
index 7f04f67009fc..000000000000
--- a/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook2X/docbook2X-0.8.8-r3.ebuild,v 1.1 2013/07/29 10:48:04 pinkbyte Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1 #290284
-inherit autotools-utils
-
-DESCRIPTION="Tools to convert docbook to man and info"
-SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
-HOMEPAGE="http://docbook2x.sourceforge.net/"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
-IUSE="test"
-LICENSE="MIT"
-
-# dev-perl/XML-LibXML - although not mentioned upstream is required
-# for make check to complete.
-DEPEND="dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-NamespaceSupport
-	dev-perl/XML-SAX
-	dev-perl/XML-LibXML
-	app-text/docbook-xsl-stylesheets
-	=app-text/docbook-xml-dtd-4.2*"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Patches from debian, for description see patches itself.
-	"${FILESDIR}/${P}-filename_whitespace_handling.patch"
-	"${FILESDIR}/${P}-preprocessor_declaration_syntax.patch"
-	"${FILESDIR}/${P}-error_on_missing_refentry.patch"
-	# bug #296112
-	"${FILESDIR}/${P}-drop-htmldir.patch"
-)
-src_prepare() {
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--with-xslt-processor=libxslt
-		--program-transform-name='/^docbook2/s,$,.pl,'
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index bc3129811506..42d8defbbba8 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -1,11 +1,3 @@
-DIST QuickCheck-1.1.0.0.tar.gz 8672 SHA256 e32e19c1a4f86171c9d00582e3f0394f39c88a3d8cc6d65e64da85822f22ead6 SHA512 e4161bf8cded019e02f8912e1923d1aa82bdf3984239715a85100c0e3165df28f1a3e4568b2ad7a89852e99672d727d41237bc2ee9ed205f6ffcf53380e07a6d WHIRLPOOL 702e4f5559ee2c6c55f9f51966b5de07be9dc5416e7c1551038f78726b5385da49b8faafdb915c0fc08cee9d8cabd49977ba28bc4ccc28e6df38de0d372f7197
-DIST QuickCheck-1.2.0.0.tar.gz 9012 SHA256 21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed SHA512 cb6b082d4213662734e4c579360f94a2c5bea0e444b6be52c14efd7de56329a7650a9aa5c152fbf9b7904da4f2473c83b4a462b0dfacc5652391df2d9277fe97 WHIRLPOOL eed9e6b8507ab94082cff11b78b7e7a9f125eb3cf2035abb62d0760b0907b4628063df29ac472f394556530256c56c06a1bad996b466c8fb386c331ba49898fe
 DIST QuickCheck-1.2.0.1.tar.gz 8874 SHA256 8daee0117004a5c8962092a1eadfafc31f86d1b37fb15f5619962c05d8dab7bf SHA512 759f3107878b1e32732dad8583b99303276393649fb7eba8e0f452d438133075f986a3d8457684b024f642ed72b5e1600cbef73706cb8897f76112976c61ae64 WHIRLPOOL 797226e24878ed3db3b6d2794c6413cd3537bfafa1601cce6c0c862035691d7fe357c3eeea4f5053c1d18c7c5c78ccfa777342962d113c982570186fe325334a
-DIST QuickCheck-2.1.0.3.tar.gz 18992 SHA256 91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1 SHA512 7f577659b87103de2408521084fee659a9bc0c4a0162b3a059d6b9de5f6c21da84d37841c297a005d3692dec8c231cf5df32d909164abaf58519bcdcca7372ff WHIRLPOOL ffe8cbfd31481f4f5321c3c6e004bbe7acced941bab76ceed1d81b3afc50db45d82401229888c185fb1b30074acce546667e63289ca82061ccc3e28c4e03d29e
-DIST QuickCheck-2.1.1.1.tar.gz 19486 SHA256 626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9 SHA512 52bb10d8b5e986f5711b9071b3bc5d89ad9b13883309e426f0cb54520f4f9c3354c23172977ee05655e737fef32000f558cbd1a0f28e667a807b7349fde68322 WHIRLPOOL 7b699484d92dac248883cb923258a7ddda99f0c08190c7a4459262d010385f1345bf4760ffb46a4bd4630b1f6dd2a6fc432ae047ed74e04454c8b5c46b1192fc
-DIST QuickCheck-2.4.1.1.tar.gz 25068 SHA256 92a711d613bf0ce61b5843386923abf112bf509fa37931a893222a2324b0791b SHA512 72df5a74ff4868d892d62893cdd7af9a73345538e3bda42181e2848709406f5ae0220c21202912b8b9e74d6bab55e37012122c8ec9378d54bd59aad94bc5e41f WHIRLPOOL 50c62033d97a93455a94b619784829fd5243f18ba52225533053501e0f0ebbe7c8f65e569ec7c8e7855cf8e4c90a7f481edc92156e37cb55f458eb05e8fb6125
-DIST QuickCheck-2.4.2.tar.gz 25373 SHA256 6f05c399ae7b70c09ab21337caf1211f43fd76d6ad9b3814a4009ddbf438179f SHA512 498613f15aedb7cabf91e4badfc398d0df85d0837dafccbc262da740f52de1572b5bddff14e4e7f8f004d89fc898fed653e6bcb92ad8feeb7ab13e596ef341c0 WHIRLPOOL b107b7e7378196d8ad64ddaa6a300f70478e94bba7cdd6f6c60867b7162cb9f8379d819a7adc110e22bced518381858bc4589254f393605a5c10ffc968f9f750
-DIST QuickCheck-2.5.1.1.tar.gz 26156 SHA256 98492011a2e546eccf2b747a990e82a726d68af9822f9d2d620cd1232aacc2b9 SHA512 480984a8ab2dc48c6221bc256798be4cba6ff3b6c06f632d456e1599ad54a4a8f75b3857deb4210269d56e1eeb4b0081ee349c827823e1a83530d5a41818db5c WHIRLPOOL 3e9132ce2d98e73138f976b2669ca51254db3effa405fb22c2dbdc69bddd810a78176771f18053f46cc6a9724ce280a65a8c9309bddc9525456b4e398b33d0bb
 DIST QuickCheck-2.6.tar.gz 26466 SHA256 8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d SHA512 17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166 WHIRLPOOL dee9d3b80cd3f38bf479eeef4b861bfcdbc1a8bfefb082c0613f3d9589000c587596bc710ce3b3ab0e8e5f38ef9b9b087f7f60c2b9eb499195c9888088194d83
-DIST QuickCheck-2.7.5.tar.gz 34938 SHA256 2b834ec6532e28a1447be67a22b66c3674ebc3156d1517b8e30e23d73d2853ad SHA512 728bcda171c1df98a3bb910313592d82da7386e8cfc2488a73ad277da24c4f6c9298a10002197c1e45cb89e36368f260e8bb1aa84435c7135115ac92462276dc WHIRLPOOL 1bd6daaa73a599ef919ac57515237f1cbf80d68f42e43b7a59a2634798ee17834b596f531513787b7da0659c076f4244ccef7e8d105827e2fe0b612f54ab08fb
 DIST QuickCheck-2.7.6.tar.gz 34513 SHA256 80d8970a0c1dfcb714215cf11f2bf0f79339f70c01999dae2c31516100a0c527 SHA512 21e17fbe6dfc2425a948c789ac7d519cfb21c48df68b63de68e6af192d9642d24e1e46ba0b356767e2a10461a3032a4742a6608248574ae458fd2f03649f0451 WHIRLPOOL fefe84afe8c4a41935402de6df219faf1ae8144016df763d8efb66fa8c88a65a5a66d02e6be8cd09709d12875dcedf16c3a4b8906c8ea51de2160b6859ba0760
diff --git a/dev-haskell/quickcheck/files/quickcheck-1.1.0.0-ghc-6.10-build-fix.patch b/dev-haskell/quickcheck/files/quickcheck-1.1.0.0-ghc-6.10-build-fix.patch
deleted file mode 100644
index 2b74a3b90c30..000000000000
--- a/dev-haskell/quickcheck/files/quickcheck-1.1.0.0-ghc-6.10-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/QuickCheck.cabal b/QuickCheck.cabal
-index b08e03a..f84a32f 100644
---- a/QuickCheck.cabal
-+++ b/QuickCheck.cabal
-@@ -33,7 +33,7 @@ library
-           Test.QuickCheck.Utils,
-           Test.QuickCheck
-   if flag(split-base)
--    build-depends:	base >= 3, random
-+    build-depends:	base >= 3 && < 4, random
-   else
-     build-depends:	base < 3
-   extensions:	CPP
diff --git a/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch b/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch
new file mode 100644
index 000000000000..61056fc3ef46
--- /dev/null
+++ b/dev-haskell/quickcheck/files/quickcheck-1.2.0.1-ghc-7.10.patch
@@ -0,0 +1,13 @@
+diff --git a/Test/QuickCheck.hs b/Test/QuickCheck.hs
+index 1f8b3b9..27138ab 100644
+--- a/Test/QuickCheck.hs
++++ b/Test/QuickCheck.hs
+@@ -75 +75,2 @@ import Data.List( group, sort, intersperse )
+-import Control.Monad( liftM2, liftM3, liftM4 )
++import Control.Applicative
++import Control.Monad( liftM2, liftM3, liftM4, ap )
+@@ -115,0 +117,4 @@ instance Functor Gen where
++instance Applicative Gen where
++    pure  = return
++    (<*>) = ap  -- defined in Control.Monad
++
diff --git a/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch b/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch
deleted file mode 100644
index 87abeeb51e34..000000000000
--- a/dev-haskell/quickcheck/files/quickcheck-2.1.1.1-ghc-7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Test/QuickCheck/Function.hs b/Test/QuickCheck/Function.hs
-index a1affaf..7c730bd 100644
---- a/Test/QuickCheck/Function.hs
-+++ b/Test/QuickCheck/Function.hs
-@@ -206,6 +206,7 @@ shrinkFun shr (p :+: q) =
-   [ p' .+. q  | p' <- shrinkFun shr p ] ++
-   [ p  .+. q' | q' <- shrinkFun shr q ]
-  where
-+  isNil :: (a :-> b) -> Bool
-   isNil Nil = True
-   isNil _   = False
-  
diff --git a/dev-haskell/quickcheck/quickcheck-1.1.0.0.ebuild b/dev-haskell/quickcheck/quickcheck-1.1.0.0.ebuild
deleted file mode 100644
index 8a91b9f9faf9..000000000000
--- a/dev-haskell/quickcheck/quickcheck-1.1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.1.0.0.ebuild,v 1.10 2012/09/12 15:10:42 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.2
-inherit base haskell-cabal
-
-MY_PN=QuickCheck
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An automatic, specification based testing utility for Haskell programs"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${P}-ghc-6.10-build-fix.patch")
diff --git a/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild b/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild
similarity index 70%
rename from dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild
rename to dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild
index 1c75260a7e13..e114dc0de7f5 100644
--- a/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.0.ebuild,v 1.7 2012/09/12 15:10:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.1-r1.ebuild,v 1.1 2015/05/03 08:59:38 slyfox Exp $
+
+EAPI=5
 
 CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit eutils haskell-cabal
 
 MY_PN="QuickCheck"
 MY_P="${MY_PN}-${PV}"
@@ -18,8 +20,14 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~p
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1
-		dev-haskell/random"
+	dev-haskell/random:=[profile?]
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
+	>=dev-haskell/cabal-1.2
+"
 
 S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+}
diff --git a/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild b/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild
index 23e5aed2bb6f..751d389a7770 100644
--- a/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild,v 1.2 2012/09/12 15:10:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.2.0.1.ebuild,v 1.3 2015/05/03 09:02:45 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
 inherit haskell-cabal
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1
diff --git a/dev-haskell/quickcheck/quickcheck-2.1.0.3.ebuild b/dev-haskell/quickcheck/quickcheck-2.1.0.3.ebuild
deleted file mode 100644
index 3aeca85788e7..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.1.0.3.ebuild,v 1.9 2012/09/12 15:10:42 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://www.cs.chalmers.se/~koen"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.10
-		>=dev-haskell/cabal-1.2
-		dev-haskell/mtl"
-
-# would work with ghc 6.8 (6.6 too?) too if we added this dep
-# dev-haskell/extensible-exceptions. however, we'd prefer not to add more core
-# packages, as we don't want them upgradeable (leads to trouble).
-#
-# this means that we can only support the architectures which has >=ghc-6.10
-# and unfortunately have to drop the others until we get proper ghc support :(
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild
deleted file mode 100644
index 5bfa0d1f2343..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.1.1.1.ebuild,v 1.3 2012/09/12 15:10:42 qnikst Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit base haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://www.cse.chalmers.se/~koen"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl
-		dev-haskell/random
-		>=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-2.1.1.1-ghc-7.patch")
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild
deleted file mode 100644
index d56ca9964b4b..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild,v 1.2 2012/09/12 15:10:42 qnikst Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://code.haskell.org/QuickCheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-# would work with ghc 6.8 (6.6 too?) too if we added this dep
-# dev-haskell/extensible-exceptions. however, we'd prefer not to add more co$
-# packages, as we don't want them upgradeable (leads to trouble).
-#
-# this means that we can only support the architectures which has >=ghc-6.10
-# and unfortunately have to drop the other arches until we get proper ghc su$
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild
deleted file mode 100644
index 21d907ef7570..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild,v 1.6 2012/12/10 21:53:14 slyfox Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://code.haskell.org/QuickCheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+template_haskell"
-
-RDEPEND=">=dev-lang/ghc-6.10.1
-	dev-haskell/random"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-# would work with ghc 6.8 (6.6 too?) too if we added this dep
-# dev-haskell/extensible-exceptions. however, we'd prefer not to add more co$
-# packages, as we don't want them upgradeable (leads to trouble).
-#
-# this means that we can only support the architectures which has >=ghc-6.10
-# and unfortunately have to drop the other arches until we get proper ghc su$
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# GHCi-less platforms do not support Template Haskell
-	cabal_src_configure $(cabal_flag template_haskell templateHaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild
deleted file mode 100644
index ba46134de950..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2.ebuild,v 1.3 2012/09/12 15:10:42 qnikst Exp $
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://code.haskell.org/QuickCheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1
-	dev-haskell/random"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-# would work with ghc 6.8 (6.6 too?) too if we added this dep
-# dev-haskell/extensible-exceptions. however, we'd prefer not to add more co$
-# packages, as we don't want them upgradeable (leads to trouble).
-#
-# this means that we can only support the architectures which has >=ghc-6.10
-# and unfortunately have to drop the other arches until we get proper ghc su$
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/quickcheck/quickcheck-2.5.1.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.5.1.1.ebuild
deleted file mode 100644
index 7864879cfb05..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.5.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.5.1.1.ebuild,v 1.1 2012/11/18 01:38:42 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="http://code.haskell.org/QuickCheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# GHCi-less platforms do not support Template Haskell
-	cabal_src_configure $(cabal_flag template_haskell templateHaskell)
-}
diff --git a/dev-haskell/quickcheck/quickcheck-2.7.5.ebuild b/dev-haskell/quickcheck/quickcheck-2.7.5.ebuild
deleted file mode 100644
index af7cd5ef912a..000000000000
--- a/dev-haskell/quickcheck/quickcheck-2.7.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.7.5.ebuild,v 1.1 2014/07/02 12:32:06 gienah Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-#hackport: flags: +base4,-base3,templatehaskell:template_haskell
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="QuickCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Automatic testing of Haskell programs"
-HOMEPAGE="https://github.com/nick8325/quickcheck"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+template_haskell"
-
-RDEPEND="dev-haskell/random:=[profile?]
-	>=dev-haskell/tf-random-0.4:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-base3 \
-		--flag=base4 \
-		$(cabal_flag template_haskell templatehaskell)
-}
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 35573075a40e..66dca89eac8f 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1 +1,2 @@
 DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
+DIST qp9.5.tar.gz 1537445 SHA256 7e4b9883fad00b16c919620033da48482b2eccc875b37f8170d674ce9f72aee2 SHA512 7a79090a6e3f0263e38cf5e5724a5c35c63c8cca2842fa8c07f9ff84011ef7ac9a22b195713aeb626a787c9391c612f3fea0ff38c084634a2f62258feb3eb6e2 WHIRLPOOL 3f589998f3480925fa3ad3c54f1f0ba4122cfa12c48d9bf1269e92a0fdf52d1823cd8dae8851e36d2c97ec2f869da10ff6ee7f2663b752d1d396e1b5a95ca982
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
new file mode 100644
index 000000000000..5bcce94d9b6b
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch
@@ -0,0 +1,34 @@
+diff -ur qp9.5.orig/Makefile.in qp9.5/Makefile.in
+--- qp9.5.orig/Makefile.in	2014-11-17 06:46:22.000000000 +0100
++++ qp9.5/Makefile.in	2015-05-03 11:29:52.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ export PROLOG		= prolog
+ 
+-
++export CXX=@CXX@
+ 
+ .PHONY: all
+ all:	objects
+diff -ur qp9.5.orig/src/Makefile.in qp9.5/src/Makefile.in
+--- qp9.5.orig/src/Makefile.in	2014-11-17 06:46:22.000000000 +0100
++++ qp9.5/src/Makefile.in	2015-05-03 11:29:52.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #export DEBUGGING=
+ 
+-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
++#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
+ export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
+ 
+ .PHONY: all
+@@ -79,6 +79,9 @@
+ 
+ # Targets
+ 
++.cc.o:
++	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
++
+ .PHONY: commands
+ commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
+ 	@$(MAKE) $(ALL_COMMANDS)
diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
new file mode 100644
index 000000000000..55dc08ffe474
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch
@@ -0,0 +1,32 @@
+diff -ur qp9.5.orig/bin/qc.in qp9.5/bin/qc.in
+--- qp9.5.orig/bin/qc.in	2014-11-17 06:45:59.000000000 +0100
++++ qp9.5/bin/qc.in	2015-05-03 11:31:54.000000000 +0200
+@@ -27,13 +27,13 @@
+ 
+ ##############################
+ 
+-preprocess='@QPHOME@/bin/qppp'
+-expand='@QPHOME@/bin/qg'
+-qpcompile='@QPHOME@/bin/qc1'
++preprocess='qppp'
++expand='qg'
++qpcompile='qc1'
+ compversion='qup'
+-assemble='@QPHOME@/bin/qa'
+-link='@QPHOME@/bin/ql'
+-execute='@QPHOME@/bin/qem'
++assemble='qa'
++link='ql'
++execute='qem'
+ libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
+ 
+ ##############################
+diff -ur qp9.5.orig/prolog/Makefile.in qp9.5/prolog/Makefile.in
+--- qp9.5.orig/prolog/Makefile.in	2006-04-06 06:01:45.000000000 +0200
++++ qp9.5/prolog/Makefile.in	2015-05-03 11:31:54.000000000 +0200
+@@ -1,3 +1,5 @@
++PATH:=$(PATH):@QPHOME@/bin
++
+ .DEFAULT:
+ 	@$(MAKE) -C compiler	$@
+ 	@$(MAKE) -C library	$@
diff --git a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
index 42ad8638692b..40f2949d5287 100644
--- a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-9.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-lang/qu-prolog/qu-prolog-9.1-r1.ebuild,v 1.1 2015/03/21 15:29:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild,v 1.2 2015/05/03 09:28:30 keri Exp $
 
 EAPI=5
 
@@ -67,7 +67,8 @@ src_install() {
 	use qt4 && dobin src/xqp/xqp
 
 	insinto /usr/$(get_libdir)/${PN}/bin
-	doins bin/{rl_commands,qc1.qup,qecat,qg,qp}.qx
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
 
 	insinto /usr/$(get_libdir)/${PN}/library
 	doins prolog/library/*.qo
diff --git a/dev-lang/qu-prolog/qu-prolog-9.5.ebuild b/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
new file mode 100644
index 000000000000..c46ac4eb626a
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-9.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.5.ebuild,v 1.1 2015/05/03 09:47:21 keri Exp $
+
+EAPI=5
+
+inherit eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Qu-Prolog GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt4 readline threads"
+
+RDEPEND="
+	!dev-util/mpatch
+	!dev-util/rej
+	qt4? ( dev-qt/qtgui:4 )
+	pedro? ( net-misc/pedro )
+	readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-portage.patch \
+		"${FILESDIR}"/${P}-cflags.patch
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable threads multiple-threads)
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		eqmake4 xqp.pro
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt4; then
+		cd "${S}"/src/xqp || die
+		emake
+	fi
+}
+
+src_install() {
+	sed \
+		-e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+		-i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+	dobin bin/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}
+
+	use qt4 && dobin src/xqp/xqp
+
+	insinto /usr/$(get_libdir)/${PN}/bin
+	doins bin/rl_commands
+	doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+	insinto /usr/$(get_libdir)/${PN}/library
+	doins prolog/library/*.qo
+
+	insinto /usr/$(get_libdir)/${PN}/compiler
+	doins prolog/compiler/*.qo
+
+	doman doc/man/man1/*.1
+
+	dodoc README
+
+	if use doc ; then
+		docinto reference-manual
+		dodoc doc/manual/*.html
+		docinto user-guide
+		dodoc doc/user/main.pdf
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.ql
+		docinto examples
+		newdoc examples/README README.examples
+	fi
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 4b25faad7b2e..0d06a77f67cc 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,4 +1,4 @@
-DIST rust-1.0.0-beta-i686-unknown-linux-gnu.tar.gz 171558540 SHA256 865a48a5b401e54d1ef53bf3900d772c4e0032f9b5f9974931447846a1135c1d SHA512 b6282ad58f0b767c45451df8491a265839fb82f63a9d784fe08daded29b9136ec275b791a6cf0d4d09af4e164d2e714a873935e7db0dfceab61711156889a989 WHIRLPOOL 47da2227c0dec4191d8d527bd61f8551e845fab6a57dd6d7ac7df9a5a4535907ec3c0910288ce2158b54d732acd1481fb0c774b5140e59dfe40788ad8bc7adc6
-DIST rust-1.0.0-beta-x86_64-unknown-linux-gnu.tar.gz 170911487 SHA256 1e1123e9d9fb17fb924c90df41ebb84543f1429074642d6541cd5698a79ca18e SHA512 81fcb9005e4acea842905c008babb2e4e7c724f60fdbec1f2fded55d5f7e74f9ea35479c387a4920081e7d1bc8529b36580db88fd0770165a463efefc0cbf034 WHIRLPOOL 8322fceffcbb73cd4e7813f380a088bd5f332f5d0fc5ac3e38fa506874be707086d3300e38bfd7dfdaad1072a006138739b8fb92e0abe5d830c7de49464bee5a
 DIST rust-1.0.0-beta.2-i686-unknown-linux-gnu.tar.gz 155548443 SHA256 92715dc21a8d940bf5a22aab9685a93cceb21f013476754418c8c69d1ad8853f SHA512 539c15b17769c240b15e6ed5665b5201aae7d854a327fff5377d14341a79d5c361735f1a24dbc8f7fd09768ef13fdfdae5474a5caa15c803b4c313686a3a1662 WHIRLPOOL 0bb4e13268e026af75cead58037546484505b778072af3e8402e5ba1fff0ce3b0a5ddea53c9aabb5d892406ee7ae835547473eca7df78ed668703ff0c10eb134
 DIST rust-1.0.0-beta.2-x86_64-unknown-linux-gnu.tar.gz 154370072 SHA256 5a62b0c94f00105ee929d979476e5eb229e2068e3b0bf88fbd14fbee8097ecca SHA512 27c5d2ca3166c08331a5d0191262d7968e0c91134c0adc85ab0ec6e7e993c1712c06a2065f92668efcbfd8717d2cfee23dcb8a2b2746735ee7499df565d1bb7b WHIRLPOOL 4823f84ee12ef8b088e4884f02dd8de84c31ad744ca97485b0c9c58ad5f92d6f1d6eb933c90d24026dfe441f9a66934e0552a712df3e13730e39d42cbcde5ffd
+DIST rustc-1.0.0-beta.3-i686-unknown-linux-gnu.tar.gz 137429009 SHA256 fecf8aabb8a3ef91d74f621a7dbc932b2366e66a7fd23bc3c43778cd14314fe8 SHA512 ff20b59bcc7fb64b2cc8216a82bf1db010cf464fa8f27e3880f0742d473c69c03d1f2164d7b463081cc7e551e48d6624e8b4dfb59a7d3777d047a36695ace723 WHIRLPOOL 10d8dc494bbd5e3a4ec88c3949560a94ea70a2a6b3be51e15fbd25fdc77859e77e3a3437454ad0729d814822b4315e0e371f3df0ff5cee2fa4d0abfb656371d1
+DIST rustc-1.0.0-beta.3-x86_64-unknown-linux-gnu.tar.gz 136305414 SHA256 83490a87ff6a8255d89b754f33c4675fd39a73d257e2fb599027d795b5f5d925 SHA512 5d6e07aa38145f547bc96bd179f5f43b143ad7d8574c7598477dbd1d2406edf9a9ae2e366e66815e74b18908e797b8f6c4278a8dbd90d4fd0c788726853b7f8e WHIRLPOOL 8bda6b09b72405de0fe1511d04651209260ec9f68a943415f366d0ff701da9f70d9e2010411a33f39a802f6147afdffa38cb40ff5c1170384f7a64044a454078
diff --git a/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild b/dev-lang/rust-bin/rust-bin-1.0.0_beta3.ebuild
similarity index 65%
rename from dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild
rename to dev-lang/rust-bin/rust-bin-1.0.0_beta3.ebuild
index 3464cb931ea9..595eab7cd65b 100644
--- a/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.0.0_beta3.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_beta.ebuild,v 1.1 2015/04/11 20:41:26 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust-bin/rust-bin-1.0.0_beta3.ebuild,v 1.1 2015/05/03 16:30:06 jauhien Exp $
 
 EAPI=5
 
 inherit eutils bash-completion-r1
 
+BETA_NUM="${PV##*beta}"
 MY_PV="${PV/_/-}"
+# beta => beta BUT beta2 => beta.2
+[ -n "${BETA_NUM}" ] && MY_PV="${MY_PV/beta/beta.}"
+MY_P="rustc-${MY_PV}"
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/rust-${MY_PV}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/rust-${MY_PV}-i686-unknown-linux-gnu.tar.gz )"
+SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
+	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-IUSE="cargo-bundled doc"
-
-DEPEND=">=app-eselect/eselect-rust-0.2_pre20150206
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150428
 	!dev-lang/rust:0
-	cargo-bundled? ( !dev-rust/cargo )
 "
 RDEPEND="${DEPEND}"
 
@@ -30,19 +32,18 @@ src_unpack() {
 	local postfix
 	use amd64 && postfix=x86_64-unknown-linux-gnu
 	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/rust-${MY_PV}-${postfix}" "${S}" || die
+	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
 }
 
 src_install() {
 	local components=rustc
-	use cargo-bundled && components="${components},cargo"
-	use doc && components="${components},rust-docs"
 	./install.sh \
 		--components="${components}" \
 		--disable-verify \
 		--prefix="${D}/opt/${P}" \
 		--mandir="${D}/usr/share/${P}/man" \
-		--disable-ldconfig
+		--disable-ldconfig \
+		|| die
 
 	local rustc=rustc-bin-${PV}
 	local rustdoc=rustdoc-bin-${PV}
@@ -62,24 +63,18 @@ src_install() {
 	EOF
 	doenvd "${T}"/50${P}
 
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
 	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
-	if use cargo-bundled ; then
-		dosym "/opt/${P}/bin/cargo" /usr/bin/cargo
-		dosym "/opt/${P}/share/zsh/site-functions/_cargo" /usr/share/zsh/site-functions/_cargo
-		newbashcomp "${D}/opt/${P}/etc/bash_completion.d/cargo" cargo
-		rm -rf "${D}/opt/${P}/etc"
-	fi
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
 }
 
 pkg_postinst() {
 	eselect rust update --if-unset
 
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
 
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 3d694e43adc3..1b682b813fc0 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,7 +1,4 @@
-DIST rust-stage0-2015-02-17-f1bb6c2-linux-i386-191ed5ec4f17e32d36abeade55a1c6085e51245c.tar.bz2 18026636 SHA256 434a1c0b30b574e1d80af576dfc178ea44c8aaa61c1ed73355a7003687f1af2d SHA512 04b187e5839de1c6627cb2e53ba6af008ed60bf5f94daf62b4f0e47796d0eec7e7b70bfbf2eb02a0c58bb338efd2598afabaaec66c54ff62480359ba90ad9cf7 WHIRLPOOL 57332352690a84f6686889541b055d246e000e478e68b0d08080f1437ee9cf9bcff46617882ccb92fde2a3074f7ce9173c68bf2f34518670010f4d02b9039fa1
-DIST rust-stage0-2015-02-17-f1bb6c2-linux-x86_64-acec86045632f4f3f085c072ba696f889906dffe.tar.bz2 17606460 SHA256 7e3ad738f0637d0418efc026722fc6c4ae2541e7b8c2cd874489110bd27a5381 SHA512 c2a0d98002945829e45f869148d781bb92862d121f7f720fbb33da98f9654cb8503d3bece8dc601840ba4f4aa23727a0eb129019933a441ea74b17edc8a780a2 WHIRLPOOL 51aedc131be03ae43c87a12c398de122c51b6a0013ef21b53ba2437b952899b06269feb4725f5eff074b90ba5caad3b2160f2f9aff0a755cb99fdd643d239aa0
 DIST rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 18104375 SHA256 f948477a43dc14436b218a24a81097d0460ca2e2177bebabba24fae89fc62b4b SHA512 86b28b03e8ef730620e593d00786b14736e05fdf5f312ab194175340fad1f24e169f69e381e73c1eb102f059f47a926dabd93bfaad46c50caa3717ee10412a5c WHIRLPOOL 086875d15228ebc68334eb4d663207917e1876044e12296426a00a0fec88a1325fe6a5e620e51b58eb08a58c27896df5fbb6d6ca992e0d754a98697f1bc9ed17
 DIST rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 17935368 SHA256 b62eed6bdb3cb356c90d587e9d9ee7fb5aedad917ff872c04e67e20b4c8f1c91 SHA512 0a978be4865f9e77c5ab552d423e21f1edefc767bc8a8d2936b45b0a9194648c5fb3c32cec0eaea438ad1339802faa1504b511956c2d71f73f2eb0439a4d7b99 WHIRLPOOL 89b0b8c51fd072c33afe8e98bc9aaea301ffa810a166b612d10dd89bbc491c3350f591f57bc3494066d71402910519b07cffa95d2802bdd6334aaad0c2f79334
-DIST rustc-1.0.0-alpha.2-src.tar.gz 22187865 SHA256 a931b945e98f409df68fdff23e98b688024461c28901106896e73708381956c8 SHA512 54e12917a829eaa8d84777564ba91013bb1cef021c2fbcf88688d718ded15718f1063828b453eb66e8a750290bf1b45039669e7185963defd32334b2b69d881b WHIRLPOOL 33627cb218dad44e0163b3d51a6a13d6a7bf79db7fc1ae3c4a34bfe9e3a132d650c0fc8f55fb3e35e822aef2f9347c47058fff2e74fc5679124a700eafaedf71
-DIST rustc-1.0.0-beta-src.tar.gz 22294998 SHA256 94248e30487723ac6f6c34a0db5a21085c0b1338e6a32bd12b159e1d2cd80451 SHA512 65142b53a55c136a145e72e8f6fbdf9e3c8c164d298ea28c2198a702ae9d7deab32c38c53c9f30465223f1d322f8f034048fb4f7939f32920b43f86112defd81 WHIRLPOOL 08fd84263c738c637e46468feb85c0552cc8494e155aeb92c4708ef4a5cab136c28936d886f471463408ef7a3afcdb3dcee50f2221b1acf038d89776df17f06c
 DIST rustc-1.0.0-beta.2-src.tar.gz 22115249 SHA256 969f20bfec588456af8ab81c9b00ef46df075bf9ac9955e42a87b1f39cb99771 SHA512 d692284d25ff93aa7f7a444fc0c0f09128d0836ff61396054d1ab0931206abcfa8b8adeef209d8c51f824257691babee85bec68bd716a28722ec93aa322ad64b WHIRLPOOL df88151b87fb97a78840b4f71c1e625b4b68c06ac0a7a7614583b12b914c6ffae470bd552a7d8a1a01c360ba15c4d3fc522ffbcd7d35043b88e12fb26266e93d
+DIST rustc-1.0.0-beta.3-src.tar.gz 22086520 SHA256 e751bc8a8ad236c8865697f866b2863e224af56b0194ddf9f3edd71f9ff6545f SHA512 4a7b8044fa9efb27ef987d7395c1df4e2a5f6f718c3cf8a6fa0e2c85a9d025ed31b287b40983f66c4c087f585acbdcacad4d707800b49d31b5b7e5b65b9f7a77 WHIRLPOOL 03480dea33bcaa4523ba82dbe71cb7089692e2bf42e79f850c3dded5dd2e5fbe4aeac76c81807fca65bd479aa29a159071ae1d1334e544eb2ebdc8e928b452ab
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 6bac8c850e8e..cfc7d973d61a 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -10,7 +10,7 @@
     <name>William Hubbs</name>
   </maintainer>
   <maintainer>
-    <email>Heather@Cynede.net</email>
+    <email>cynede@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="clang">Use <pkg>sys-devel/clang</pkg> for building</flag>
diff --git a/dev-lang/rust/rust-1.0.0_alpha2.ebuild b/dev-lang/rust/rust-1.0.0_alpha2.ebuild
deleted file mode 100644
index 69d554401c37..000000000000
--- a/dev-lang/rust/rust-1.0.0_alpha2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_alpha2.ebuild,v 1.4 2015/04/11 14:05:16 jauhien Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-MY_PV="rustc-1.0.0-alpha.2"
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
-	x86?   ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-i386-191ed5ec4f17e32d36abeade55a1c6085e51245c.tar.bz2 )
-	amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-x86_64-acec86045632f4f3f085c072ba696f889906dffe.tar.bz2 )"
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="clang debug doc libcxx +system-llvm"
-REQUIRED_USE="libcxx? ( clang )"
-
-CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-eselect/eselect-rust-0.2_pre20150206
-	!dev-lang/rust:0
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.0
-	clang? ( sys-devel/clang )
-	system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
-"
-RDEPEND="${CDEPEND}
-"
-
-S=${WORKDIR}/${MY_PV}
-
-src_unpack() {
-	unpack "${MY_PV}-src.tar.gz" || die
-	mkdir "${MY_PV}/dl" || die
-	cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
-}
-
-src_prepare() {
-	local postfix="gentoo-${SLOT}"
-	sed -i -e "s/CFG_FILENAME_EXTRA=.*/CFG_FILENAME_EXTRA=${postfix}/" mk/main.mk || die
-}
-
-src_configure() {
-	export CFG_DISABLE_LDCONFIG="notempty"
-
-	"${ECONF_SOURCE:-.}"/configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib/${P}" \
-		--mandir="${EPREFIX}/usr/share/${P}/man" \
-		--disable-manage-submodules \
-		--disable-verify-install \
-		$(use_enable clang) \
-		$(use_enable debug) \
-		$(use_enable debug llvm-assertions) \
-		$(use_enable !debug optimize) \
-		$(use_enable !debug optimize-cxx) \
-		$(use_enable !debug optimize-llvm) \
-		$(use_enable !debug optimize-tests) \
-		$(use_enable doc docs) \
-		$(use_enable libcxx libcpp) \
-		$(usex system-llvm "--llvm-root=${EPREFIX}/usr" " ") \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-
-	dodoc COPYRIGHT LICENSE-APACHE LICENSE-MIT
-
-	rm "${D}/usr/share/doc/rust" -rf
-
-	# le kludge that fixes https://github.com/Heather/gentoo-rust/issues/41
-	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"/* "${D}/usr/lib/rust-${PV}/rustlib/"
-	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/rustlib"
-	mv "${D}/usr/lib/rust-${PV}/rust-${PV}/"/* "${D}/usr/lib/rust-${PV}/"
-	rmdir "${D}/usr/lib/rust-${PV}/rust-${PV}/"
-
-	mv "${D}/usr/share/doc/rust"/* "${D}/usr/share/doc/rust-${PV}/"
-	rmdir "${D}/usr/share/doc/rust/"
-
-	cat <<-EOF > "${T}"/50${P}
-	LDPATH="/usr/lib/${P}"
-	MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-
-	elog "Rust installs a helper script for calling GDB now,"
-	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-mode to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/rust/rust-1.0.0_beta.ebuild b/dev-lang/rust/rust-1.0.0_beta3.ebuild
similarity index 84%
rename from dev-lang/rust/rust-1.0.0_beta.ebuild
rename to dev-lang/rust/rust-1.0.0_beta3.ebuild
index cfa1d1752529..5788bcea83ee 100644
--- a/dev-lang/rust/rust-1.0.0_beta.ebuild
+++ b/dev-lang/rust/rust-1.0.0_beta3.ebuild
@@ -1,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/rust/rust-1.0.0_beta.ebuild,v 1.1 2015/04/11 14:05:16 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rust/rust-1.0.0_beta3.ebuild,v 1.1 2015/05/03 16:25:22 jauhien Exp $
 
 EAPI=5
 
@@ -8,11 +8,18 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-any-r1
 
-MY_PV="rustc-1.0.0-beta"
+RUST_CHANNEL="beta"
+
+BETA_NUM="${PV##*beta}"
+MY_PV="${PV/_/-}"
+# beta => beta BUT beta2 => beta.2
+[ -n "${BETA_NUM}" ] && MY_PV="${MY_PV/beta/beta.}"
+MY_P="rustc-${MY_PV}"
+
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 
-SRC_URI="http://static.rust-lang.org/dist/${MY_PV}-src.tar.gz
+SRC_URI="http://static.rust-lang.org/dist/${MY_P}-src.tar.gz
 	x86?   ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 )
 	amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 )"
 
@@ -24,7 +31,7 @@ IUSE="clang debug doc libcxx +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 CDEPEND="libcxx? ( sys-libs/libcxx )
-	>=app-eselect/eselect-rust-0.2_pre20150206
+	>=app-eselect/eselect-rust-0.3_pre20150428
 	!dev-lang/rust:0
 "
 DEPEND="${CDEPEND}
@@ -36,12 +43,12 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 "
 
-S=${WORKDIR}/${MY_PV}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	unpack "${MY_PV}-src.tar.gz" || die
-	mkdir "${MY_PV}/dl" || die
-	cp "${DISTDIR}/rust-stage0"* "${MY_PV}/dl/" || die
+	unpack "${MY_P}-src.tar.gz" || die
+	mkdir "${MY_P}/dl" || die
+	cp "${DISTDIR}/rust-stage0"* "${MY_P}/dl/" || die
 }
 
 src_prepare() {
@@ -56,8 +63,8 @@ src_configure() {
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/lib/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
+		--release-channel=${RUST_CHANNEL} \
 		--disable-manage-submodules \
-		--disable-verify-install \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \
@@ -101,18 +108,18 @@ src_install() {
 	EOF
 	doenvd "${T}"/50${P}
 
+	cat <<-EOF > "${T}/provider-${P}"
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	EOF
 	dodir /etc/env.d/rust
-	touch "${D}/etc/env.d/rust/provider-${P}" || die
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
 }
 
 pkg_postinst() {
 	eselect rust update --if-unset
 
-	elog "Rust uses slots now, use 'eselect rust list'"
-	elog "and 'eselect rust set' to list and set rust version."
-	elog "For more information see 'eselect rust help'"
-	elog "and http://wiki.gentoo.org/wiki/Project:Eselect/User_guide"
-
 	elog "Rust installs a helper script for calling GDB now,"
 	elog "for your convenience it is installed under /usr/bin/rust-gdb-${PV}."
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index f705db105408..13ad828ff546 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,20 +1,6 @@
-DIST pl-6.6.4.tar.gz 14830255 SHA256 663977959979e389df0f87c2eb426ab71105c12206605ec40925893b91733cef SHA512 fea012ce97b62940618ce2e137fbeed39c7698544ece22da8c4d13f98d9cf809d990f912e406a939868471ef5517552a2ccf842be4b7e849aeaa6c1d38331b4a WHIRLPOOL 10e4243fa473c168a50268e7d2240976626cf20ae1440e94c496a6d93a1d1c5631ac7523695174baa8423396d4af57d84c6f0be59775cf7bff0aebf7be135d5d
-DIST pl-6.6.5.tar.gz 14837423 SHA256 79ee4526ce8a70d55cfeecbb1acfd737db0ddbe45585faba41a24ddb34484a53 SHA512 8bdf7678c51192185bbd20f008212de7401ca2f497fea02e7b652aa51fca0c1e961fa10efcd256325a6fb0b7ea956b26c8d8def2f11b2f45551f3a82591d6c7c WHIRLPOOL f7bc7236801a6c13402426f95e971d2de41b98dd596e2f13344f4ad56619a81ef587fe626ae1c797255739511d09fad49d21787df9fbefa034278c3a1824f949
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
-DIST pl-7.1.31.tar.gz 16211453 SHA256 a0c0129a1afb924449c47c4d985cac291b94e7199a063bd22b22bb4178772638 SHA512 e107ed6ccd7add7c4c812327d122668011d4b9d0b7bd07a3c5a3d78cb5a5e25ec03f384294375e78a5900db7cf65ccc0e257208f05074078a6bbab0b13d07dd6 WHIRLPOOL 2443e3c82f44098079c1ec02f61a5fa0a9e41c75bb04560d6c00a945882dc18bfb1f1f1cc1a7e5f541b99048e0e32a120574c48b5f310f784f0fe4f6531ef47f
-DIST pl-7.1.32.tar.gz 16132165 SHA256 7d52e5a1596b89a48f09d96e5408be5ba03a31014f7f61626b047725749dc83b SHA512 c74e78fa5b1de4251d85590c05d07c38356e2e4b51c3dff256d147b661aed940d4f368c26775f703308175c71b460796cb88d35da485a7deac3a4b902d5b5cd4 WHIRLPOOL 5527b864cfcb2790a5f4da3399ae82369a0e1b347d77ebe26560c98d724f65b38899704008ba5698af6566d4fcb19010589b18efdd994dcf68032330faddb195
-DIST pl-7.1.33.tar.gz 16151946 SHA256 f33ab58320fec95888f58ab522f257fa4730e80f121e05f5206eec6de0ddeb6a SHA512 de9598e43617005685e01cf9df486b0f105255861e719f3cce2958ac261b71ff6413c684b738759039eb747f49ee2d3ecf9725b22fd190db8665d592d73344d4 WHIRLPOOL 9cc37d32db21abcc7061c50375c00c36c244b8184a3cdc69aff8ea4f10e8f604e351992faa78b4365b01c41dc9c273e33c5b4c0682e4820c3afc371ebcf15605
-DIST pl-7.1.34.tar.gz 16180866 SHA256 7eafcc5cd01c2fc3d80c71194920c97b7b0b9e031bfd9b5a25f60a556d62fe13 SHA512 ce34f14a1597b2258092d687caa26cbcc254dac7d63e74df520e375908bf12a1bb3ec0b025698c0366ca1c4c39808cf067a4fdbdc5ca61012b109d4daabfcec4 WHIRLPOOL 18c9833e384e1fff805eb181a28f99e52d57888380a14fced67be017c9cc47f6d9b5cbffdadd6638be315d3e1064f08042446fdf9594ddc65d7a91afd0d41c12
-DIST pl-7.1.35.tar.gz 16182766 SHA256 dd5e2eee868f74fb61a492e14a11844189a25273ba0800766759e01346cf01c4 SHA512 0e3525090d64b7687d2cf8d7d64d1e50adb574ca23c93e5c6bdbace56a81c107d5919d713275fbc64d81e4dddc67a3c9f7606bc05425f0abf9e1f1fd4e82aed5 WHIRLPOOL 68540b9a330dd535e6c0f26e067a532ba78a0b0aaa9323fd1fa5365c1b2d6df54fdc5fba5f70de0184c3f52854be7f80a397221d1e09fd9922e38de648f7338f
 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.4-gentoo-patchset-0.tar.gz 1596 SHA256 727a9ed67cdd8a23bc5d0bd5b2463353071370e58667a73c4ae403ef8a94671f SHA512 98d42047ec54155f7d34928bce3050edd65259b552ea82b763f15391f0283f5229a9a513e5f31c441294c5a7f2f2c4e6f133ff031eccfeaaf7c1037665240be9 WHIRLPOOL 3b4c0b6888e450176483bb5371c5f023864390852b9cf0d6f12b356a8460189e5e6cb85399b378c4b6bda314ce690e9a7ede1f79c74d78f033d7caff3a2fc408
-DIST swi-prolog-6.6.5-gentoo-patchset-0.tar.gz 1595 SHA256 baf043ea3a145d8600ecb9c16722e8578b818b3018d50345e951084a26b018e9 SHA512 62f7a73af4d34b8a13378fb65302b01d2445b3e4f7198e293c4fd9b50948feaf632bd5de0af10aaf2cab9d5fcc214fe04d86e6e969e60b23d9bae4a277214041 WHIRLPOOL 95c6449b2248a0277af1cad70ebc16b46fd6b15d540822f1f9e5370760de94171bcdbb98df9915ce85e2ddda55eaf457eacb26b29f3ed4f61b1f69388454b0a5
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.1.31-gentoo-patchset-0.tar.gz 1646 SHA256 670b686223bd0e640860f648a212710f9991d81a7985e0ac4d87184e8ea11bff SHA512 8cce5b2e1e47aaa01aa003b53fc215a41d43c42a7c8ce1bb886a0897811baf0701495f11ba6645bf1488865062fe62a64f03b959fff367eb9cfe2943e0ab82b7 WHIRLPOOL a1f941b464d49de7eb7e6ba34f2d8eabb529242dc6ba39d25ef15f405d335a3c6289415a933d4a7fba809cc59a472f75242c7a1e6e0a5ddbfa9eb798b90963db
-DIST swi-prolog-7.1.32-gentoo-patchset-0.tar.gz 1643 SHA256 571cdc5afdec61e1dc26d5375a337417463c83db0da6e2d1ceb7a95d7129d27d SHA512 83cd56daa1bae17b92f702006b6918e560e3c3803e543bba7bcbf6cc4b0fab16899f6d4868d1aab95c44a63d8705c3582251beb602a913f51db71d4a71079fd7 WHIRLPOOL d1e77c544f9dfc685ef01ecb42fc6c70ad75d0151d8e10129d8306a4b7d207c2d4a4dfbf00748c5d7d8d15644ce1d28f4b1d28945012d2a68e835ba94671ee64
-DIST swi-prolog-7.1.33-gentoo-patchset-0.tar.gz 1648 SHA256 75adbca7e63afcaa0dbcabfd730fbf93eae03d31f8bfb00f3b65b3b7e5b2e71b SHA512 c3aa147eeff27a9fdd6d1803c4f40222884c1ebc9078a07a627c770d2807e8c60832ce666b1e24afd176609f0230b64031fc6c109687d867936d696c2f38239e WHIRLPOOL 82e1ece15a6102990b2a454fa5cb39b87fee276245bcd943039ef1c07d47d5125332b273bccfda29af88dace8be114fd0660e0c24ef63e1eaeef2ef970cf4d4d
-DIST swi-prolog-7.1.34-gentoo-patchset-0.tar.gz 1639 SHA256 9e859377ecb234e9284ae297114f31ee20d7cf4ac23a6c7bc8538634ead03f35 SHA512 da678dc06082775d86dbdae62c8a1e2b6b504b8b3f03b173da613e93c7e84390c9c41ba8a66657484d0da8337200e7e8fb20edbc2628bc0831ed86b723f39088 WHIRLPOOL eaa09a0734b72657556093f7a6872616a874384c1af991f25af15f21f0fba98ea2e139ef298e53868238f5b8a5db4ffefb9aa5d1129756aaafb534d40b03b47b
-DIST swi-prolog-7.1.35-gentoo-patchset-0.tar.gz 1647 SHA256 5c9f9655d1645205908d01816d798cf4fc2039fde77fafa3f0cbf223626f01ca SHA512 36295c24cbbbd4c0b04a238666f23c93f1a99a045aaeafd4f317f020ee397c34f5b026d025a07a9e82f28c043b3ee096e14e08f80fe7cda26ee4373158e5bc6c WHIRLPOOL bc0c672ca3255e84fc09ea9a918712c4a11689102f2042ffaa821f18761b0d535fd52798c65c480387acb9a81a69f2017ad4a49512535d35ca5aeb2c8c142cb9
 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
diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild
deleted file mode 100644
index 303b5bec4972..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.6.4.ebuild,v 1.4 2014/07/13 10:02:48 ago Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-6.6.5.ebuild b/dev-lang/swi-prolog/swi-prolog-6.6.5.ebuild
deleted file mode 100644
index f201d9a431e5..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-6.6.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.6.5.ebuild,v 1.1 2014/05/07 16:52:27 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.31.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.31.ebuild
deleted file mode 100644
index 9c06e66426ed..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.31.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.31.ebuild,v 1.1 2015/03/21 14:42:55 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.32.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.32.ebuild
deleted file mode 100644
index 51ad30eaebfb..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.32.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.32.ebuild,v 1.1 2015/03/21 14:42:55 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.33.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.33.ebuild
deleted file mode 100644
index 4493f76d8e32..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.33.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.33.ebuild,v 1.1 2015/03/21 14:42:55 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.34.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.34.ebuild
deleted file mode 100644
index 352d1b7f4a45..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.34.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.34.ebuild,v 1.1 2015/04/30 13:08:29 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.1.35.ebuild b/dev-lang/swi-prolog/swi-prolog-7.1.35.ebuild
deleted file mode 100644
index b9ab44e0a4b3..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.1.35.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.1.35.ebuild,v 1.1 2015/04/30 13:08:29 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.20.ebuild b/dev-libs/xmlsec/xmlsec-1.2.20.ebuild
index 97d7be314b24..eb95be78e86f 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.20.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.20.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-libs/xmlsec/xmlsec-1.2.20.ebuild,v 1.3 2014/12/28 10:16:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.20.ebuild,v 1.4 2015/05/02 09:53:58 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild
index dd21bf22df7f..a8d3a0dafcfc 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild,v 1.1 2015/04/17 22:41:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.140.0.ebuild,v 1.2 2015/05/03 08:14:45 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.230.0.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.300.0.ebuild
similarity index 55%
rename from dev-perl/CPAN-Changes/CPAN-Changes-0.230.0.ebuild
rename to dev-perl/CPAN-Changes/CPAN-Changes-0.300.0.ebuild
index 4479ccef46e9..c3d9a3263d8c 100644
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.230.0.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.300.0.ebuild
@@ -1,22 +1,25 @@
-# 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-perl/CPAN-Changes/CPAN-Changes-0.230.0.ebuild,v 1.1 2013/08/25 07:01:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CPAN-Changes/CPAN-Changes-0.300.0.ebuild,v 1.1 2015/05/02 16:36:04 dilfridge Exp $
 
 EAPI=5
 
 MODULE_AUTHOR=BRICAS
-MODULE_VERSION=0.23
+MODULE_VERSION=0.30
 inherit perl-module
 
 DESCRIPTION='Read and write Changes files'
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
-RDEPEND="virtual/perl-Text-Tabs+Wrap
-	>=virtual/perl-version-0.790.0"
-
+RDEPEND="
+	virtual/perl-Text-Tabs+Wrap
+	>=virtual/perl-version-0.790.0
+"
 DEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	virtual/perl-Test-Simple"
+	test? ( virtual/perl-Test-Simple )
+"
 
-SRC_TEST="do"
+SRC_TEST=do
diff --git a/dev-perl/CPAN-Changes/Manifest b/dev-perl/CPAN-Changes/Manifest
index e7e591e19719..93dc409d5c57 100644
--- a/dev-perl/CPAN-Changes/Manifest
+++ b/dev-perl/CPAN-Changes/Manifest
@@ -1,2 +1,2 @@
-DIST CPAN-Changes-0.23.tar.gz 35011 SHA256 445a5c751d047c2a2e20680aa86d8bdab25e52891bac24681e9b4f24e98a347c SHA512 a855d99c4076deb9f0e40a33d4afb1c0f4a2fe0b53c1ee8a1796cb9f2372911906a2a9466fa81225303f2e19b12c124b7a195c7e55cdac565269f49cafeeca26 WHIRLPOOL c47251b2faa77005851ab41d555c6f194cf21b39ddf6fb66508cce776fb4f8b7551d8fb59ebf60f8179f9cce016d77ea594151e7c85e2e65d45e0667831de1f6
 DIST CPAN-Changes-0.27.tar.gz 35558 SHA256 386ca683109fa0a88064c2105dab5ea361d8e6de96cb065e8501ddffb6ffb191 SHA512 0034d51f27111bc376220afb35c72b958c6debd7c9f5cf5778705a45fa85a9f8609d0bdd62928a30a6d203301140591d96a8964308ca4a6617847e35099d72ac WHIRLPOOL a127fe1f00062373a4b54d55cf33be3cd5a2d24210f7f381ac7006f05b3c18e8988ab1a1b1bf853083bbdb700aae770b7d1323cd3607174e670f2056fb284d87
+DIST CPAN-Changes-0.30.tar.gz 37095 SHA256 e4ac13555163f22a7f99a9494f9db28c68b02447e08bce230515fc36a5cfa1ab SHA512 d262881ac574328714aa4b10b5e2e3d0c2f282dcd9f98b93df2ddb854b9601a9b2c324e22fbb1a8a491e67ddd334879a88bd6f407421366fa3b2eb3e6af40f4d WHIRLPOOL 1befce0638bf63ebc7ac29104f925a87398a6bce4fd7c57330eaa9f5fe20eb9af57037ef800129fa675a786be06884199f37a02a2e6073ea22623891432de116
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-1.980.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild
similarity index 73%
rename from dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-1.980.0.ebuild
rename to dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild
index 30a3e9b7c5a0..ecab9266d83a 100644
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-1.980.0.ebuild
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.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-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-1.980.0.ebuild,v 1.1 2014/12/07 23:30:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.140.0.ebuild,v 1.1 2015/05/02 16:39:35 dilfridge Exp $
 
 EAPI=5
 MODULE_AUTHOR=BINGOS
-MODULE_VERSION=1.98
+MODULE_VERSION=2.14
 inherit perl-module
 
 DESCRIPTION='Mapping Perl releases on CPAN to the location of the tarballs'
@@ -14,7 +14,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-File-Spec
 		virtual/perl-IO
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 08a03111e419..05c64d9c9485 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,2 +1,2 @@
-DIST CPAN-Perl-Releases-1.98.tar.gz 22811 SHA256 84f881e39800934fdf82449a1c293cd38704939369b2fe35e5c540665a82e5bc SHA512 89731b79be0827f6227d568a1bbccb661a39a346fed2f0e6cc9a1353d7f6deac881ec9cb79be5567337c5a3220494fe8fa1a21776910eb13c5b70c55001c80cb WHIRLPOOL 1671904a6929da9ff2ca85fae13083b943e923de8211c59eecb1bcdc923c269443ead59af40eee8ef7355f6c69ad8f3cb121f39846598371ca546eb49b31acef
 DIST CPAN-Perl-Releases-2.10.tar.gz 23180 SHA256 674be6e2808ec595bb73cef82126a83bbdb98c9844f600769aed9c54bc1c48f3 SHA512 f5f07becb3215d6d18332edd1e9260eaf6d9539ea7d00753bbc7088ca0d2ebd75196dc2fa8df42c2f1ab4aeec6891c67238555aab7a8756531d52cde31c8e1c1 WHIRLPOOL a9339267f66145f19d3d639f7dadf7b28a9962d1d5c783537d7429be490a2b4c8c7e26780254c2d6f84ef8e3d5c3ae0573ed2527aeeb5d8b800fa050c616ee81
+DIST CPAN-Perl-Releases-2.14.tar.gz 23361 SHA256 f25b724425ce874fc9c8dfc9a68635ee4f1607933a5c7d8d6f91fd5e958ab94b SHA512 413445ae36df4b9c93e7094242d2d7b54a943f2bbc0b2763ea0aebf0bdced7d7ae1a9996d39677053510715cd2862684504097b28864ebdbdaa7cf838a55bd53 WHIRLPOOL 248816017577b555a4e6829366f018da2d3b41d4ddb1ad29d461dcb6d2f4fb266ca0afb914646bdc3df595d1d5df712153685316fc586bebabf7cecf2ccb4423
diff --git a/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild b/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild
new file mode 100644
index 000000000000..10c944978696
--- /dev/null
+++ b/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CQL-Parser/CQL-Parser-1.130.0.ebuild,v 1.1 2015/05/02 16:44:08 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=BRICAS
+MODULE_VERSION=1.13
+inherit perl-module
+
+DESCRIPTION="compiles CQL strings into parse trees of Node subtypes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Class-Accessor-0.100.0
+	>=dev-perl/Clone-0.150.0
+	>=dev-perl/String-Tokenizer-0.50.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/CQL-Parser/Manifest b/dev-perl/CQL-Parser/Manifest
index e8b6c2007060..bbe3800e18f6 100644
--- a/dev-perl/CQL-Parser/Manifest
+++ b/dev-perl/CQL-Parser/Manifest
@@ -1 +1,2 @@
 DIST CQL-Parser-1.12.tar.gz 39432 SHA256 8dabac238451dda289295bff40c69b91ad8d1ad48b7ca46162d785ae5e3e4d71 SHA512 f894aa659926329d32bf13827b2414b590750716b74105f0c9d5c7e0a751bfdfe73eb1cda24090fc840a9c1b7f8ceaacb22c061afc43ddea3df1039b8298d9da WHIRLPOOL 115f9e4fefbaeddfb78170b453f8d5cc1b91dc2b186d7a0724bcfa06487efdd2255712b9745be350b772e47f20e593db38361305b14062dd738be8f3e7bcb8f7
+DIST CQL-Parser-1.13.tar.gz 39118 SHA256 7159fe75123307689efda1ef6bfb85edd5a8c8ba2389dfc0339be56e1b540c64 SHA512 ba9c1d3e1a072642d5166036ca3f17d3bd7ab4d41433ec657d750046ea0dc2844fe25fe331688e34eeefe8910ddc6d4842aeb75681a226edf4d33a4567af6b6f WHIRLPOOL d5df5b99476473ae8683a6f9ce0fbcebaebc0198ddc6602df471113ef05257d9d21e3d869cb29e3bedc0a55b9e4e28c099b4c7cc438c59aab22b9704c1ad80fe
diff --git a/dev-perl/Class-Load/Class-Load-0.220.0.ebuild b/dev-perl/Class-Load/Class-Load-0.220.0.ebuild
index 301f19d9a755..84344214f7bf 100644
--- a/dev-perl/Class-Load/Class-Load-0.220.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.220.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Load/Class-Load-0.220.0.ebuild,v 1.1 2015/05/01 17:13:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Load/Class-Load-0.220.0.ebuild,v 1.3 2015/05/03 08:27:45 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A working (require q{Class::Name}) and more"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/class-returnvalue/class-returnvalue-0.550.0-r1.ebuild b/dev-perl/Class-ReturnValue/Class-ReturnValue-0.550.0-r1.ebuild
similarity index 68%
rename from dev-perl/class-returnvalue/class-returnvalue-0.550.0-r1.ebuild
rename to dev-perl/Class-ReturnValue/Class-ReturnValue-0.550.0-r1.ebuild
index 1e7e0a858aec..deed695cc0c5 100644
--- a/dev-perl/class-returnvalue/class-returnvalue-0.550.0-r1.ebuild
+++ b/dev-perl/Class-ReturnValue/Class-ReturnValue-0.550.0-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-perl/class-returnvalue/class-returnvalue-0.550.0-r1.ebuild,v 1.1 2014/08/23 01:33:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-ReturnValue/Class-ReturnValue-0.550.0-r1.ebuild,v 1.1 2015/05/03 10:46:11 dilfridge Exp $
 
 EAPI=5
 
diff --git a/dev-perl/class-returnvalue/Manifest b/dev-perl/Class-ReturnValue/Manifest
similarity index 100%
rename from dev-perl/class-returnvalue/Manifest
rename to dev-perl/Class-ReturnValue/Manifest
diff --git a/dev-perl/class-returnvalue/metadata.xml b/dev-perl/Class-ReturnValue/metadata.xml
similarity index 100%
rename from dev-perl/class-returnvalue/metadata.xml
rename to dev-perl/Class-ReturnValue/metadata.xml
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.120.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.120.0.ebuild
new file mode 100644
index 000000000000..de3da3f4d0c6
--- /dev/null
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.120.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.120.0.ebuild,v 1.2 2015/05/03 13:21:15 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=BDFOY
+MODULE_VERSION=1.12
+inherit perl-module
+
+DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest
index 644324e95c11..5dc27de90725 100644
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@@ -1 +1,2 @@
 DIST Crypt-Rijndael-1.11.tar.gz 23536 SHA256 8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4 SHA512 57a20811351e4376b10aed11fe6cb932575d2b5d0155d01780f69598b06b28e9eb3036ae322fbc844dd2dda37db2d02a61462caf5d5af5d6dd4ac585c348262a WHIRLPOOL c0c25050e21efd4154beb93402d776087557da5c77adff23a2438b38113713ea0005bcea1aec8a2cd2ef36ad6bdd19abbec2637245aba44397025637c6dccdd7
+DIST Crypt-Rijndael-1.12.tar.gz 24512 SHA256 a096d2194e2967a899693ecbc2bb3595be1b89829cab8384288c09846ea7ffe5 SHA512 bd61e6d9e63abb6d3c335b17d8acdf246cb4c583287fca5568e6ecd1a8334e31dba9c45726a5ad3540bccf293fcbdb20ffd1b240a76b07770e26bcad83ee4164 WHIRLPOOL adf1b6dc22a57193c9135af3dc094864e088361364f03f14c1109ca7d1d0633e523ba61fd10aac1d14d1724c7451dc53b7f829ca6b3094e05fbf7083254c7cec
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
index 58f6e48a0e4e..043cd9cc7cf8 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild,v 1.12 2014/02/01 23:36:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild,v 1.13 2015/05/02 18:04:29 dilfridge Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE="test"
 SRC_TEST="do"
 
 RDEPEND="
-	>=dev-libs/openssl-0.9.7c
+	>=dev-libs/openssl-0.9.7c:0
 	virtual/perl-MIME-Base64
 "
 DEPEND="${RDEPEND}
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0.ebuild
new file mode 100644
index 000000000000..b4dc2202bf1d
--- /dev/null
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.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/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0.ebuild,v 1.2 2015/05/03 17:39:20 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=NANIS
+MODULE_VERSION=0.72
+inherit perl-module
+
+DESCRIPTION="OpenSSL support for LWP"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.7c:0
+	virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=virtual/perl-ExtUtils-CBuilder-0.280.205
+	virtual/perl-Getopt-Long
+	>=dev-perl/Path-Class-0.260.0
+	>=dev-perl/Try-Tiny-0.190.0
+	test? (
+		>=virtual/perl-Test-Simple-0.190.0
+	)
+"
+# PDEPEND: circular dependencies bug #144761
+PDEPEND="
+	dev-perl/libwww-perl
+	>=dev-perl/LWP-Protocol-https-6.20.0
+"
+
+export OPTIMIZE="${CFLAGS}"
+#myconf="--lib=${EPREFIX}/usr"
+
+SRC_TEST=do
diff --git a/dev-perl/Crypt-SSLeay/Manifest b/dev-perl/Crypt-SSLeay/Manifest
index b18a92f27be9..de8271fc6a00 100644
--- a/dev-perl/Crypt-SSLeay/Manifest
+++ b/dev-perl/Crypt-SSLeay/Manifest
@@ -1 +1,2 @@
 DIST Crypt-SSLeay-0.64.tar.gz 121431 SHA256 eae61cf7aa64d79385b764010d8d77d09477e034c52fc3dfe68d0a13be78217c SHA512 2530a62f13154e2ce8a55e845dbc3dc2822420d56631ff64de2fd71c6cad5ddaa5e779070e7929f797a3fb09d004e31a9097bba0616d396abcb79aca710fa9eb WHIRLPOOL 4ddccd0cde43bb5c2a3c1f3bd59e221c758c0b31ba9f24b1fbc0fec40dbc2a98cc1a7da1a072af588379f6504b3e7c52a3b101a650005c2784ef34005adb4a19
+DIST Crypt-SSLeay-0.72.tar.gz 129575 SHA256 f5d34f813677829857cf8a0458623db45b4d9c2311daaebe446f9e01afa9ffe8 SHA512 af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4 WHIRLPOOL 9a6adb48d3c54b9242473a3c0585f7cf29ec5ef518e5826477778e3b0a2ce96785afc490af3bcb1b7499fc00f4fc6c032c73c3baa72aff37ce0cf18c51c1250a
diff --git a/dev-perl/Data-ICal/Data-ICal-0.210.0-r1.ebuild b/dev-perl/Data-ICal/Data-ICal-0.210.0-r1.ebuild
index 2be10209d36d..21878d7946b9 100644
--- a/dev-perl/Data-ICal/Data-ICal-0.210.0-r1.ebuild
+++ b/dev-perl/Data-ICal/Data-ICal-0.210.0-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-perl/Data-ICal/Data-ICal-0.210.0-r1.ebuild,v 1.1 2014/08/26 18:01:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ICal/Data-ICal-0.210.0-r1.ebuild,v 1.2 2015/05/03 10:48:14 dilfridge Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Class-Accessor
-	dev-perl/class-returnvalue
+	dev-perl/Class-ReturnValue
 	dev-perl/Text-vFile-asData"
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-perl/Data-ICal/Data-ICal-0.220.0.ebuild b/dev-perl/Data-ICal/Data-ICal-0.220.0.ebuild
new file mode 100644
index 000000000000..ce4e9255d603
--- /dev/null
+++ b/dev-perl/Data-ICal/Data-ICal-0.220.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ICal/Data-ICal-0.220.0.ebuild,v 1.2 2015/05/03 10:48:14 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=ALEXMV
+MODULE_VERSION=0.22
+inherit perl-module
+
+DESCRIPTION="Generates iCalendar (RFC 2445) calendar files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/Class-Accessor
+	dev-perl/Class-ReturnValue
+	dev-perl/Text-vFile-asData
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		dev-perl/Test-Warn
+		dev-perl/Test-NoWarnings
+		dev-perl/Test-LongString
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do"
+
+src_prepare() {
+	sed -i "/^auto_install();/d" "${S}"/Makefile.PL || die
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Data-ICal/Manifest b/dev-perl/Data-ICal/Manifest
index ea923ab63b86..08913bcce471 100644
--- a/dev-perl/Data-ICal/Manifest
+++ b/dev-perl/Data-ICal/Manifest
@@ -1 +1,2 @@
 DIST Data-ICal-0.21.tar.gz 117530 SHA256 93c2b0b0800b52e753073094675338aa476183ea9b759872b11e44dd43c9b45d SHA512 d3c8295c043f3c39b6ff50f74031bf4949702dba3bb1013b06f98f7637f1334511ce6286c620f40133b9196bfd08dd940a31df622d05593c2a4a19cd778521b2 WHIRLPOOL ab7449a894223caa445a0d1bb91a4afdcb1b4ca3b543666cee2e7047ebed607dd0c3477b1f42d92669e41f78942ec0c13bcfd501964187711cf935985fade340
+DIST Data-ICal-0.22.tar.gz 119116 SHA256 8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720 SHA512 a02364dfb0a1e24efcf2efdb7240bb6c47ad5ed3a99ada51ddb9817b4e433038d57113699c6875f7d592cd3af46f5b074a1ac50cf951b7af449bde1765ed5d55 WHIRLPOOL 326a08a554a86c7e0b9a182170d467bac4ec738014ae5e4bcffb43e8d848bbe3f884d9e006cf87d45d21f1ec24a2ebcf0d5f9b9f1e28f7ce3e340a284c07e177
diff --git a/dev-perl/Data-UUID/Data-UUID-1.220.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.220.0.ebuild
new file mode 100644
index 000000000000..1dce0f3c6315
--- /dev/null
+++ b/dev-perl/Data-UUID/Data-UUID-1.220.0.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-perl/Data-UUID/Data-UUID-1.220.0.ebuild,v 1.1 2015/05/03 12:47:44 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=RJBS
+MODULE_VERSION=1.220
+inherit perl-module
+
+DESCRIPTION="Perl extension for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST=do
diff --git a/dev-perl/Data-UUID/Manifest b/dev-perl/Data-UUID/Manifest
index 26f05e9cdef1..781f6b3922e3 100644
--- a/dev-perl/Data-UUID/Manifest
+++ b/dev-perl/Data-UUID/Manifest
@@ -1,2 +1,3 @@
 DIST Data-UUID-1.217.tar.gz 15907 SHA256 18c0c41998b211b4249102367400d2d3aa7df479c3a3368a32c0d6c0299bfe6d SHA512 b6920f6a4519d1249823d0aa17e622b9e098c8669aaf8361440d8d8531582530ef0c6cd365f0919b272880a69e2b833b8337f480c30276cf4a75088a3d758030 WHIRLPOOL 1a54497a55bcacc4d60639b3e2b4df0aad03c498c44e32f61c7e9bf685a88638138bf3e794073beac87ebc62e78f4d1385fcd1ed54b1dfeaefbd8e5b5c6cc63f
 DIST Data-UUID-1.219.tar.gz 16760 SHA256 c736d39a6fabf163423b85d94c62cbba6f57ca2f3115e21a0d0c91c23836da28 SHA512 b4a09c0615876b5d0c8304459eb54300fc7e4f808969e3ccc2a929e2d47159cf0aa55e501e8f2a2a795ec31d7e7701978fd4c834eda2c19abc7e131fcb39b35e WHIRLPOOL a367cd686408f758069779c290f99a746ca01f5dc8ab074bf13fc175f9a03555abfe3c01e3d0996a7f3cd24bcecd6081654d10d37cb86ed30cae3b2f213d690d
+DIST Data-UUID-1.220.tar.gz 16905 SHA256 99533b06e4348d704e3d2252d7d41aa652680a1bd5af04e1dc8ce7e84e74f960 SHA512 6d4508cd37f06c549276c1021781a5cf81cb823eaad0152447e9515b9ecf4fb8c6d1c5bfe44eda3296adde6a50d5f6c435269eb5db6207f669d1e12b68fdf657 WHIRLPOOL 1584ab2dd400bc88fb68ccfc3783eff1bf0d2876629fa09779dfa73ff5f7a0dfe03e62560b88df5f0c2e30db1fe124fd0000592e5b04a632c7b0107c9f658005
diff --git a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
new file mode 100644
index 000000000000..c718a5ffc3da
--- /dev/null
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild,v 1.1 2015/05/03 12:55:32 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=STBEY
+MODULE_VERSION=6.4
+inherit perl-module
+
+DESCRIPTION="Gregorian calendar date calculations"
+
+LICENSE="${LICENSE} LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Bit-Vector-7.400.0
+	>=dev-perl/Carp-Clan-6.40.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do"
+export OPTIMIZE="$CFLAGS"
+mydoc="ToDo"
diff --git a/dev-perl/Date-Calc/Manifest b/dev-perl/Date-Calc/Manifest
index d9cb011c6b43..b270852fc0a5 100644
--- a/dev-perl/Date-Calc/Manifest
+++ b/dev-perl/Date-Calc/Manifest
@@ -1 +1,2 @@
 DIST Date-Calc-6.3.tar.gz 168967 SHA256 3eb66188af89abc65b71e9852808d5d6b4bea7a606c55f2ae52c229bfc5bdb93 SHA512 74d755e07c2c1601b3f9ae630a60142367a8b6aa11223da57334b05b363fe636f2d77eeb5cce273122e1f090bc917c8b833370451a7a402637f29305523c2385 WHIRLPOOL 86db06898a947f4ea4e30835b465ed079c5f54e7637c948205e0e1ed4a2fd957bab7b88b7086d597ad64892f7096136fb8d5ef6ea8702a085cc1e88e42dba57e
+DIST Date-Calc-6.4.tar.gz 173828 SHA256 7ce137b2e797b7c0901f3adf1a05a19343356cd1f04676aa1c56a9f624f859ad SHA512 e2d0cb2b041afedb10033700e27075f01987abc763a59034a10a9fc0bb059706cc959f6d76fe1fc21ced4b547475f62a8c37ad38e8e49f7453d78b17082c0671 WHIRLPOOL adb18aa6e6f00b58f860830bd840add58516e28e326f165ff7f05e0ae1498e4d5f933654d7b3feb06f1babc27ff6130f7429019932af2c14df7a2577522f1dd6
diff --git a/dev-perl/DateManip/DateManip-6.490.0.ebuild b/dev-perl/DateManip/DateManip-6.490.0.ebuild
new file mode 100644
index 000000000000..ff010fb2d87a
--- /dev/null
+++ b/dev-perl/DateManip/DateManip-6.490.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateManip/DateManip-6.490.0.ebuild,v 1.1 2015/05/03 13:20:43 dilfridge Exp $
+
+EAPI=5
+
+MY_PN=Date-Manip
+MODULE_AUTHOR=SBECK
+MODULE_VERSION=6.49
+inherit perl-module
+
+DESCRIPTION="Perl date manipulation routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-IO
+	virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.210.0
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		dev-perl/Test-Inter
+	)
+"
+
+SRC_TEST=do
+
+mydoc="HISTORY"
diff --git a/dev-perl/DateManip/Manifest b/dev-perl/DateManip/Manifest
index b435fbf75099..c987f3915cc1 100644
--- a/dev-perl/DateManip/Manifest
+++ b/dev-perl/DateManip/Manifest
@@ -1,2 +1,3 @@
 DIST Date-Manip-6.41.tar.gz 1975272 SHA256 f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09 SHA512 c958fd58c8905e63945835cbe83205efafd4466d8cc3c1a61ec52ae948679c27c525143d5509b4a384c0c05d045702fdb0c86d91968ef24f73d983b2e7042860 WHIRLPOOL 507e63e2665144f0f94cbcd40ea4c0109eda1dd89f3f95ae7249e4204cb213546ca07af5478da534e930cfe77fe27e1fff806c85d4872a4f99109070a9cb8ffc
 DIST Date-Manip-6.43.tar.gz 1764121 SHA256 3fbb6f0a3acfbc1693aa80a4bd3482bd81d6b1f33f54cd907582bf30e4418f4b SHA512 00b60957f11c076ecb6f971911d33c438d68e9b9c22ca7425cdd700c397ce6f0d4e876a9d666295a009c2efd9bf617af633662b7ea29d4ee07e2b48927bc5020 WHIRLPOOL 445f7073ba8cfbfefb828990c5f624eff253d45a5cb9d368fc2b5b0295cf5abebd4a9599677caaa317212b8b84bdeac642a251c2e9bc5809c110578be81c7e6e
+DIST Date-Manip-6.49.tar.gz 15472097 SHA256 3e5aa3b351f92186630c27b1de2cba0d322142d0ff4ac12319681e20ce8b89b9 SHA512 013b008b7591068da63820c751ff1988cc203df3f865c85487f058fc3d75e28c2506f50618b4a8f300c635ddef9005071d231ba6aeae1f39374f4a4e7f89e479 WHIRLPOOL aa58fce70f5dab1ca6d78ac3ca80c169ddb6a387f3a7f2607d143c1e29471e9bdd2a9701cd913ebeaabe7b4714f53628af7b09c80f1ceae36578aab3c4f8bafb
diff --git a/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.120.0.ebuild b/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.120.0.ebuild
new file mode 100644
index 000000000000..689cef04dccf
--- /dev/null
+++ b/dev-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.120.0.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-perl/DateTime-Event-ICal/DateTime-Event-ICal-0.120.0.ebuild,v 1.1 2015/05/03 13:39:25 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=FGLOCK
+MODULE_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="Perl DateTime extension for computing rfc2445 recurrences"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/DateTime
+	>=dev-perl/DateTime-Event-Recurrence-0.110.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Event-ICal/Manifest b/dev-perl/DateTime-Event-ICal/Manifest
index a86b85c89480..c1f88db724fd 100644
--- a/dev-perl/DateTime-Event-ICal/Manifest
+++ b/dev-perl/DateTime-Event-ICal/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Event-ICal-0.11.tar.gz 24465 SHA256 6c3ca03c1810c996fa66943138f1f891bbc4baeb41ae2108a5f821040d78dd4c SHA512 7e20121b54f8e57ed19e8a7e866401312300d1001735fc7c0f43cfee2b382f786943fcebac5f6c7bae51828681c010668e59745038d1bec35a612a7cd23ed507 WHIRLPOOL 9d89a202b418e9c4097aaf1ec19ed9d1b69bbccb511577d71217ecb7fa60f4653f234f23ef9b828f41df3f9baa500e3e010306c01e01174cb281975544a7cd1f
+DIST DateTime-Event-ICal-0.12.tar.gz 25921 SHA256 53de5c2d08bf1c5f73ef395adaa7155272b8136a2ea3afd4715a55f71994d9e5 SHA512 df4b69a70353e4b62a5b69dfee8297efea0d6fa36de9d32b150a93d312b4b39b2f2e5adbbc3da34bdcab3cfe14f25028d412dfda1fd82e236e1f417b467f930b WHIRLPOOL 4ea58ce4124b78c189dd1e1ddcb382382359fbc94e873e584dad87e714d21222cd95c5df516d273a5cce84d691764243a266f749c8e8c7fea5ddb24eee8ef03e
diff --git a/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.240.0.ebuild b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.260.0.ebuild
similarity index 52%
rename from dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.240.0.ebuild
rename to dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.260.0.ebuild
index 9f4f1a056d2b..6f1c5371ade8 100644
--- a/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.240.0.ebuild
+++ b/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.260.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.240.0.ebuild,v 1.2 2014/09/05 15:17:16 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Flexible/DateTime-Format-Flexible-0.260.0.ebuild,v 1.1 2015/05/03 17:43:16 dilfridge Exp $
 
 EAPI=5
 
 MODULE_AUTHOR=THINC
-MODULE_VERSION=0.24
+MODULE_VERSION=0.26
 inherit perl-module
 
 DESCRIPTION="Flexibly parse strings and turn them into DateTime objects"
@@ -14,13 +14,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-perl/DateTime
-	>=dev-perl/DateTime-Format-Builder-0.74
+RDEPEND="
+	dev-perl/DateTime
+	>=dev-perl/DateTime-Format-Builder-0.740.0
 	dev-perl/DateTime-TimeZone
-	virtual/perl-Module-Pluggable"
+	dev-perl/List-MoreUtils
+	virtual/perl-Module-Pluggable
+"
 DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/Test-MockTime
-	)"
+		>=virtual/perl-Test-Simple-0.440.0
+	)
+"
 
 SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-Flexible/Manifest b/dev-perl/DateTime-Format-Flexible/Manifest
index a94fbd6013e4..e560b0f142a7 100644
--- a/dev-perl/DateTime-Format-Flexible/Manifest
+++ b/dev-perl/DateTime-Format-Flexible/Manifest
@@ -1,2 +1,2 @@
-DIST DateTime-Format-Flexible-0.24.tar.gz 71489 SHA256 624df3c067cb822ed50f93fa365b7b2c9cff2d828c15d336cbdbb50c127e6287 SHA512 5baa11a8de246c018c25d345ccb5e583e66247747f335d54a4d3aa2426f08306f2c5af18d4b942041bb7093675d40962f3c623827429d4f31b997ffe2a148699 WHIRLPOOL 4062cc2c843cdbca178c3a002c7cdeb45275f901a119d6af70e42cfb36714f7484146d739ed4f27c61eab23085bd85ada31abfb069d68e0f1016486fd990bcb1
 DIST DateTime-Format-Flexible-0.25.tar.gz 71657 SHA256 cd3267e68736ece386d677289b334d4ef1f33ff2524b17b9c9deb53d20420090 SHA512 c2cdd0dc682a7ef87f006c27c3822f92db658d187748852c2079b58a08fa527f83ed810e4b737dcc3d3de26eae7b89fb173ab2ffbc25935b868d01510fab8ca6 WHIRLPOOL f58636ceea745c268d96f396bd3a6920c2a0fedde53d8e3611bdd3cb5c6680d58c5cc8ce92782f09b9846000b8c7c32d434e97007cde501d6119badde594d17a
+DIST DateTime-Format-Flexible-0.26.tar.gz 71862 SHA256 436efbc5e87cc385112e1c44336427fea32df670caf2b7d6dbb7a113ac6e693d SHA512 70f5d50fd97bede5790853b526ee8150ab86592fa3f34ee16b0f26268c190052701f16510de6465ade46c647b5d1750f5c9cccf4b48ae7eac1455d6cadc015a3 WHIRLPOOL 7a8fcd095ad0a214a7f4e8c969b28538226a480548eee751a1043e2915bab21c6eab94710fe866edeae7c83d181a82d9c036eb4b7e642494b32ffa5e399f28d1
diff --git a/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild
new file mode 100644
index 000000000000..140771da9fde
--- /dev/null
+++ b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild,v 1.1 2015/05/03 17:52:15 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=CKRAS
+MODULE_VERSION=0.42
+inherit perl-module
+
+DESCRIPTION="Date conversion routines"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/DateTime-0.170.0
+	>=dev-perl/HTTP-Date-1.440.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.380.0
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-HTTP/Manifest b/dev-perl/DateTime-Format-HTTP/Manifest
index 2eb4e68b3117..cdd4a70fb348 100644
--- a/dev-perl/DateTime-Format-HTTP/Manifest
+++ b/dev-perl/DateTime-Format-HTTP/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Format-HTTP-0.40.tar.gz 17571 SHA256 214e9e2e364090ebc5bc682b29709828944ae67f0bb4a989dd1e6d010845213f SHA512 1884f692e0c8d40ce5dc1786131094d2064270fb1d1e32df3bf8bedaa4ac863f53688ec53e95260a48cd20e878a77af5952eb0d6f03ccd09b4a14d024f7167a0 WHIRLPOOL 54281e3cc0b6115ea9bdea999174ebe74453bc8b09067901e183c3e707170ce2a652e75f8997e509d0b6e3a80a3304bbddd267bd8b3bf3d568516c2600a965ad
+DIST DateTime-Format-HTTP-0.42.tar.gz 18170 SHA256 d04e769df45968dfd2d1bdc647a325c6877614069762786e6f137f1f5ec3d840 SHA512 d8ff064d4bd0c9f41ec14a6e06d12a401e9c5162ef1f41381ba4314fc4776d1898cf07971243cf1b4a90096a8ed5f59361616d3fc2d6c62a7bdbdcc331fe81b8 WHIRLPOOL f9d3a3d52834a767db6d139373acc9f71a50ce372cc940e9fea304b04c679ab3da193c6d3936578760949e6e7176afc6471bd5f3804bbfcb5fb7a4ccf9664d8c
diff --git a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.401.0.ebuild b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.401.0.ebuild
new file mode 100644
index 000000000000..6f3c9b1818e4
--- /dev/null
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.401.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.401.0.ebuild,v 1.1 2015/05/03 17:58:35 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=BOOK
+MODULE_VERSION=0.401
+inherit perl-module
+
+DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-0.180.0
+	dev-perl/Params-Validate
+"
+DEPEND="${RDEPEND}
+	virtual/perl-File-Spec
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-Mail/Manifest b/dev-perl/DateTime-Format-Mail/Manifest
index 953a95200664..5451387eb01b 100644
--- a/dev-perl/DateTime-Format-Mail/Manifest
+++ b/dev-perl/DateTime-Format-Mail/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Format-Mail-0.3001.tar.gz 176473 SHA256 b3f36b15442ae3e47bf91f45bcdc23e3311dcd2a3c6bc5c691004ad95986af72 SHA512 7ad356f86bbc8c854d25806e1205834fe4c0f4f9a1ab065b81e72ef75a502f31ab82c166451e6d108faa3ceceae3103a15f4f9ad908c483bba4f068d0aad46ef WHIRLPOOL 5340172c11378c63d0ac0120e41e95eebc59cdf9335b2154e0d4f7f4fbd6b92c52a689c508e82475ccf6ada32866f4360fedaa1ea1cb0f1bd24d7d6b4dfeceb2
+DIST DateTime-Format-Mail-0.401.tar.gz 172403 SHA256 b0668cc6547f0af8f02bb8e1cd09f69ec9f396a153a5fee97e38f651aec953b2 SHA512 d1e882c04c8b695391040da8e01c12423ee1e3aa7fa25ac77c1b84d510bc8093b6a477fdf076d1c704d61b5d329e14f1524a80a2ea342463f5a6136ed7743244 WHIRLPOOL b9fae28a6ce745ec3cf412549574c7189f7774dbc4643374d0df6c4c1730fb519d1ed2c0549ff446c7ebabde678cc2e83df5fc382b514119495981df35f6d343
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild
new file mode 100644
index 000000000000..419ead7c332b
--- /dev/null
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild,v 1.1 2015/05/03 18:04:24 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.56
+inherit perl-module
+
+DESCRIPTION="Parse and Format DateTimes using Strptime"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-1
+	>=dev-perl/DateTime-Locale-0.450.0
+	>=dev-perl/DateTime-TimeZone-0.790.0
+	virtual/perl-Exporter
+	>=dev-perl/Params-Validate-0.640.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index ce43ead11d23..a4b653ad549a 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Format-Strptime-1.54.tar.gz 26578 SHA256 00bb61b12472fb1a637ec55bbd8878db05b3aac89a67b7991b281e32896db9de SHA512 1fae82873388d1f618e037691b6466479d34be6a6d63ac52e4d34b9d73f8d62107a46de7c3622081920144bcffe850d41329cfbd4d3ca974dc3802d6a647b864 WHIRLPOOL 9b7ecaaf1708cb741391abe634c225cf96f28004c23d28252021a7aa1cb0d6d79b97a7e7c56d7d9e8ed615ed752758a3b1a42550ab833ec4baa6129ba375c900
+DIST DateTime-Format-Strptime-1.56.tar.gz 36863 SHA256 2ff69d0f5a0359aab04e7276db5bee3be10040da24fbf09de1d904e7ead78b28 SHA512 cdc14515c3a5f46c93572a6a7e3b5824d668609de778c908c271950600be1c9f8a48e15265478d3fed85062b8fbca9215f0f405880225a957a45aed9a7c92e08 WHIRLPOOL 0aa4286c172a638b04da6b1b2771332bedf94c367d6c569b94411b39fd68516a70dad23bd4f426a4ff7a32201376f13c0c52d8be959f0a42193555f9e2008753
diff --git a/dev-perl/DateTime-Set/DateTime-Set-0.310.0.ebuild b/dev-perl/DateTime-Set/DateTime-Set-0.310.0.ebuild
deleted file mode 100644
index d7b0270ef564..000000000000
--- a/dev-perl/DateTime-Set/DateTime-Set-0.310.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Set/DateTime-Set-0.310.0.ebuild,v 1.2 2014/09/03 18:33:37 zlogene Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=FGLOCK
-MODULE_VERSION=0.31
-inherit perl-module
-
-DESCRIPTION="Datetime sets and set math"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/DateTime-0.12
-	>=dev-perl/Set-Infinite-0.59
-	dev-perl/Params-Validate"
-DEPEND="${RDEPEND}
-	virtual/perl-Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild b/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild
new file mode 100644
index 000000000000..d9780f1a22a7
--- /dev/null
+++ b/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Set/DateTime-Set-0.340.0.ebuild,v 1.1 2015/05/03 18:12:12 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=FGLOCK
+MODULE_VERSION=0.3400
+inherit perl-module
+
+DESCRIPTION="Datetime sets and set math"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/DateTime-0.120.0
+	>=dev-perl/Set-Infinite-0.590.0
+	dev-perl/Params-Validate
+"
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? ( virtual/perl-Test-Simple )
+"
+# meta.yml is incorrect, it needs P-V and M-B
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime-Set/Manifest b/dev-perl/DateTime-Set/Manifest
index 598b338554c6..57f4a6c31fb4 100644
--- a/dev-perl/DateTime-Set/Manifest
+++ b/dev-perl/DateTime-Set/Manifest
@@ -1,2 +1,2 @@
-DIST DateTime-Set-0.31.tar.gz 44582 SHA256 499b59e42a1129bf10fd269eb7542d337a29fbbcbf08ef8313fd465d3ae5df02 SHA512 7a4f5b81a9189721090a13250d55e021caa419bbe1ff03d29b7c8b7bb12ed91196d94fed827aa626b721f07ff342cbbe9e781374b5671167070e4aa2f8b8e135 WHIRLPOOL 79cbb5728e444c6a6e6c9f73ccb2cb19764bbc815bd9d4924d0e7066e9e96e4034cd2ed57d585f00fcaf0ea3afc2e11ca875a7795c982fa5e7762c19679825c0
 DIST DateTime-Set-0.32.tar.gz 45003 SHA256 7496541d69f7667f6e2789f3c95aa265c6fb658102525f01bfea8f3d0cea0500 SHA512 ae152f06b012762c471688821e2fd40f8245417329fc7061180134bdaa33b1e043c04497f2d1a837dccb324c28b4fc39daad792cee500727dc2df1333fa97656 WHIRLPOOL 98f7b207b70ebe648f90e0c15b8a38b2ee84350f0134ea95dd78c6f2ffc6ec6c575bf006e451e7cc58fcacab90d6404c88f9d57826427ff67b2f9913588a77fe
+DIST DateTime-Set-0.3400.tar.gz 44951 SHA256 abff0431185a11824a2edda8b8934bc3d52d8a8612b24469e1c8c8f9533247ac SHA512 6bb8f1bdcfeb572c348563cdba96150c9d9b8fb837270a5a75860d7cc81fa548e0d88d14a294360064521b466739ebb3f98c7b6fdf99fd816aa2aa32bcea234a WHIRLPOOL 8f751414c464c41ef8a84b157fb23dc47340ff942dbc609b67587e964316b86152979da778202ff72162856ffabeac4b9e307d29d1d16c37137a1261adfc02a3
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild
deleted file mode 100644
index d8739c22e30d..000000000000
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.600.0.ebuild,v 1.12 2014/06/09 23:46:25 vapier Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.60
-inherit perl-module
-
-DESCRIPTION="Time zone object base class and factory"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Params-Validate-0.720.0
-	>=dev-perl/Class-Singleton-1.30.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
-	test? (
-		>=virtual/perl-Test-Simple-0.920.0
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.640.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.880.0.ebuild
similarity index 54%
rename from dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.640.0.ebuild
rename to dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.880.0.ebuild
index 8abbf969027a..a9b3478fc3db 100644
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.640.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.880.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.640.0.ebuild,v 1.1 2014/02/21 18:46:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.880.0.ebuild,v 1.1 2015/05/03 18:17:43 dilfridge Exp $
 
 EAPI=5
 
 MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.64
+MODULE_VERSION=1.88
 inherit perl-module
 
 DESCRIPTION="Time zone object base class and factory"
@@ -15,15 +15,25 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="test"
 
 RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Params-Validate-0.720.0
 	>=dev-perl/Class-Singleton-1.30.0
+	virtual/perl-File-Spec
+	dev-perl/List-AllUtils
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Module-Runtime
+	>=dev-perl/Params-Validate-0.720.0
+	dev-perl/Try-Tiny
+	virtual/perl-parent
 "
 DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
+	virtual/perl-ExtUtils-MakeMaker
 	test? (
-		>=virtual/perl-Test-Simple-0.920.0
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Storable
+		dev-perl/Test-Fatal
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.960.0
 	)
 "
 
-SRC_TEST="do"
+SRC_TEST=do
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index cb47d76cd526..3e891dea083e 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -1,3 +1,2 @@
-DIST DateTime-TimeZone-1.60.tar.gz 865213 SHA256 888e3e038159216f78b3f19fff6c37aea1943470fa42f18a21fa924e0df083d6 SHA512 aee3498f07c24a4ebf7728dbecc77a0fb8cbb422596e0d73faec60acb32a0400dc239e2f00782e20c74c7e8ff92541b00f0fe26758a2e74721cf177af753f309 WHIRLPOOL 14df06999928f20f2348255f8b342e2de62bfa00188e4b103d8dd8ec44857a47bc5dfc1497e8082e44e58c652d0fef6e056f2f34501c71280388b3a6a892ccf9
-DIST DateTime-TimeZone-1.64.tar.gz 845741 SHA256 f63c6a1523c2334497ca00bdc007a58e666e81c7edceb77f18c7088036cf1415 SHA512 cfa90257e0684339788c97783cbb7b4061154e46018b7ea78418beb09ecd364f8fc8f13f3cd57ac5f6c00ee49f61d96abff56db55c49214a8f36257001a2fa9d WHIRLPOOL a2e0badd0a8247ee9f81b252e47b9fa773df31dbc01289a1aaa157daeb47e6938227e108bd409d1c23269affb7c4ca0fdb33ea641775900e638868462a935062
 DIST DateTime-TimeZone-1.81.tar.gz 884344 SHA256 62f74919227aa996600ab508b999c658e3aa5789098ade189cf82dd2d9e6833d SHA512 1b110fea68cf872d3ec125685936e63f8dc68f36a5170579961e543d82a15d7f12537d2f4f7c5ee2ae6a4cb6584ea32923a7f165cbfc650138f6d2737d996b2d WHIRLPOOL 26fd835248b5aba7fd0e8436f16007333057bcec575513df19bf5c91e32f3ffafb8e2d2c5ab9d95b9d88590075860079991a53009e3f6e93a669676988a891db
+DIST DateTime-TimeZone-1.88.tar.gz 889504 SHA256 42c40ffdaf379533d34a4d083f8b0027f44c46e63324cbb1d4e291856cf1f9ff SHA512 f35370c842f5e6f6d13dfc2bd864a89fd847108854a2a4aadee1cd9d5743ab121a108a9352f56db08a987b040d84089cd4adf4b3b200d6c4aa9fe2279984c6fe WHIRLPOOL d17e763461e96a457b0ef1ac8135db51d906e201b3eb4cf3eb87fad9492a6f8f8bfa22df86599ad8c69ced557c8ff595dccbe54b30b0fe32be494ebd7d26befc
diff --git a/dev-perl/DateTime/DateTime-1.180.0.ebuild b/dev-perl/DateTime/DateTime-1.180.0.ebuild
new file mode 100644
index 000000000000..eef3d796577c
--- /dev/null
+++ b/dev-perl/DateTime/DateTime-1.180.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime/DateTime-1.180.0.ebuild,v 1.1 2015/05/03 13:32:40 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.18
+inherit perl-module
+
+DESCRIPTION="A date and time object"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-Locale-0.410.0
+	>=dev-perl/DateTime-TimeZone-1.740.0
+	>=dev-perl/Params-Validate-0.760.0
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Try-Tiny
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.280.0
+	test? (
+		virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-File-Spec
+		virtual/perl-Storable
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+		>=dev-perl/Test-Warnings-0.5.0
+	)
+"
+
+SRC_TEST=do
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index c326089f297c..b77e75926668 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -1,2 +1,3 @@
 DIST DateTime-1.03.tar.gz 174369 SHA256 384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d SHA512 6764b8bd8ccb22429d17dfc48412a0223481ae43249920347ae91514dbbe0d2f820601372b9cdae312d0ba9460c9abeae9e189afb1666b90e27b09f3daaf335f WHIRLPOOL 93903c881305ab2ca99aecb16c3100f74e0d32576565703feb6897d112056bc5b20d69f7ded92910574b514179a13adb3cd584a7910c55043eb492e9e34b7a3d
 DIST DateTime-1.12.tar.gz 206862 SHA256 e65a333806d000825724cfa23d7d33539b853b6e819d4922d2a68579416374ce SHA512 a3fde7b6d76753026b2ff3ac91761b69da3e207a51d24d693c2cf681ff9028cf6f46186e5ebf1993124d1255d080d27d7449f28eaa156b5e032e6e946dddd0a9 WHIRLPOOL 1d262bd1c788227d84b0843f182039a1007c8ac6ae7bd2cc84c9245f2fc7094aec636d4a187a25527f2e7613819d0b0bf44a3117c4aa7d190e242e966853d95a
+DIST DateTime-1.18.tar.gz 212053 SHA256 bada2c9fe3e79429f7c84592d9a9defd3a8c71f7b584389d450aa324340d913a SHA512 664cc7dacd94fb34d0b185ebfb855ce671f0c9fdbe7097617306cd3e9083fabc07acb3ca024944fe3736d52c0ed3c840c916f9af3d5c4cad0dddfcc61a25ec12 WHIRLPOOL efd79a1cd62a9e0159b3b194c0458faa1a469f0b205de618068b3536f715a7131b1aabda217a63f3b80a455aec6187468f27fd6a1ce3e04bc2f8064751d9ca1f
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
index 50c87079b925..f7db571848ae 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild,v 1.2 2014/11/09 10:37:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild,v 1.4 2015/05/03 08:23:28 jer Exp $
 EAPI=5
 MODULE_AUTHOR=LEONT
 MODULE_VERSION=0.007
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION='A wrapper for perl'\''s configuration'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
index 6cc4b23225ff..e49e9639d7d3 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild,v 1.2 2014/11/09 10:37:52 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild,v 1.4 2015/05/03 08:24:18 jer Exp $
 EAPI=5
 MODULE_AUTHOR=LEONT
 MODULE_VERSION=0.022
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION='Various portability utilities for module builders'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
index b219fae5972d..38917db229ea 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild,v 1.3 2014/11/09 10:37:51 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild,v 1.5 2015/05/03 08:25:26 jer Exp $
 EAPI=5
 MODULE_AUTHOR=LEONT
 MODULE_VERSION=0.010
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION='Build.PL install path logic made easy'
 LICENSE=" || ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index d576d742c313..de654430ef93 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild,v 1.1 2015/02/21 23:40:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild,v 1.3 2015/05/03 08:26:55 jer Exp $
 
 EAPI=5
 MODULE_AUTHOR=LEONT
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION='A tiny replacement for Module::Build'
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild
index 64d7df385068..14cac1d154e4 100644
--- a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild
+++ b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild,v 1.4 2013/05/16 20:09:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.630.0.ebuild,v 1.5 2015/05/03 10:50:33 dilfridge Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
 	dev-perl/Clone
 	dev-perl/Class-Accessor
-	>=dev-perl/class-returnvalue-0.400.0
+	>=dev-perl/Class-ReturnValue-0.400.0
 	>=dev-perl/capitalization-0.30.0
 "
 DEPEND="
diff --git a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild
index 6ac7d0278fe4..be14c0652a09 100644
--- a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild
+++ b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild,v 1.3 2014/02/17 20:39:50 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.650.0.ebuild,v 1.4 2015/05/03 10:50:33 dilfridge Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
 	dev-perl/Clone
 	dev-perl/Class-Accessor
-	>=dev-perl/class-returnvalue-0.400.0
+	>=dev-perl/Class-ReturnValue-0.400.0
 	>=dev-perl/capitalization-0.30.0
 "
 DEPEND="
diff --git a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild
index 0968f71a360e..e72c1dc89ad6 100644
--- a/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild
+++ b/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild,v 1.3 2015/01/18 17:36:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/dbix-searchbuilder/dbix-searchbuilder-1.660.0.ebuild,v 1.4 2015/05/03 10:50:33 dilfridge Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-perl/Cache-Simple-TimedExpiry-0.210.0
 	>=dev-perl/capitalization-0.30.0
-	>=dev-perl/class-returnvalue-0.400.0
+	>=dev-perl/Class-ReturnValue-0.400.0
 	dev-perl/Class-Accessor
 	dev-perl/Clone
 	dev-perl/DBI
diff --git a/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild b/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild
index 35e7c40d6675..5a85f9f2b547 100644
--- a/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild
+++ b/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild,v 1.2 2015/03/29 09:30:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/namespace-clean/namespace-clean-0.240.0-r1.ebuild,v 1.3 2015/05/03 08:15:42 jer Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Keep imports and functions out of your namespace"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index c54fff2414b4..2010077ac627 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,3 +1,3 @@
 DIST docker-py-0.7.1.tar.gz 38529 SHA256 391ff117718b3885ef56270c635e21e00df2efb1cfc5746b436ef4a50482e892 SHA512 57cd0aa438640345ac37773f5b4fda772e73920f37ef979bb8e4908f1dcc6aa3f36ac3e208f6d77b318454d64ef80805e180ecfc730227938ad8b67c62629719 WHIRLPOOL c1804fe83533fd205e65d2d1734b15490fa2a2e904ae0de099bcf2218095d4c931bb5254af919bf37e2d946046e2f26485d4d69033f15376844e4cf6ee90eebf
 DIST docker-py-1.1.0-r1.tar.gz 60926 SHA256 c3373d120a83a80468c5340e2e36b20e6350a255309e50c56a57de4b5cad9d97 SHA512 14a9eacbee5e31c0dc9677c9250f27aa098f59634d6c07851e7d5d14e8ce9329e9a1519c70b2b4cd3f8532a06a022cd6d2ce4c0f7767ce6303aa38c972e25783 WHIRLPOOL 12c74f2c171f272c633f68be42c1a5061ace8ddf0522a0e7f9640673f332e78348d21c3bfe67c695a062d28c7b1049bdbfd2ecf4897ac00e28ce972630fcbd42
-DIST docker-py-1.1.0.tar.gz 42192 SHA256 6a07eb56b234719e89d3038c24f9c870b6f1ee0b58080120e865e2752673cd94 SHA512 b1eb90238b607f0add260d3d751424edd918d67f1d2ba73975bf87840f505ae87dd6f2f488ac5c6ff261b6de237e5a3fa0ace473e510ca10264d0e6f33566bb3 WHIRLPOOL 14bdd4d1b042f5778a359a74b8a3439e34f4a1f1525d3937a8263c40936f2926ca581f2fdd35c985bb4ed6a54c9c6d3c1f5bb187c98658d9b1b69764bcf5e74e
+DIST docker-py-1.2.1.tar.gz 69662 SHA256 068734e30f6c80857417df8f60f0eab49285729cf6131083264b1bfa754d9935 SHA512 31c49a2039bd840ff5aa8c905b95c752ff69e8b95c4258f13e9a2ffe8ff1281a93306b526c358092ae05c749e9551c7b225ec92c2a7ae6fe614156bf64c405f3 WHIRLPOOL aa11c672f35b02e9c446d7d6fbb24ca8a4bf799d47b472991947de51ffc497e1e3d0efd1c235a4f6e882b5680c1b6758bda215da9c694a4ab62f2777f83a7ccc
diff --git a/dev-python/docker-py/docker-py-1.1.0.ebuild b/dev-python/docker-py/docker-py-1.2.1.ebuild
similarity index 67%
rename from dev-python/docker-py/docker-py-1.1.0.ebuild
rename to dev-python/docker-py/docker-py-1.2.1.ebuild
index 65e72738b420..1fb5d51499f1 100644
--- a/dev-python/docker-py/docker-py-1.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-1.2.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docker-py/docker-py-1.1.0.ebuild,v 1.1 2015/03/13 22:31:49 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docker-py/docker-py-1.2.1.ebuild,v 1.1 2015/05/02 15:42:27 alunduil Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{3,4}})
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Python client for Docker."
 HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,20 +19,18 @@ IUSE="doc test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/mkdocs-0.9[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/coverage-3.7.1
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-	)
+	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )
 "
 RDEPEND="
-	=dev-python/requests-2.5*[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '>=dev-python/websocket-client-0.11.0[${PYTHON_USEDEP}]' python2_7)
 "
 
 python_compile_all() {
-	use doc && mkdocs build
+	if use doc; then
+		mkdocs build || die "docs failed to build"
+	fi
 }
 
 python_test() {
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
new file mode 100644
index 000000000000..02557298c848
--- /dev/null
+++ b/dev-python/livereload/Manifest
@@ -0,0 +1 @@
+DIST livereload-2.3.2.tar.gz 24119 SHA256 fa2959005a134d767409c129cbf94528a0eb5022c915da9c685e14f1adb81b63 SHA512 59dc5be184d80a8b3aa6f98a6bc12f98f2efe00a0497deadfe5275222be2e0865e182cf0d83fc7a6e5f7297a7bf26a30c3ad9af5eeb2517af8b7ab3946e4bb1d WHIRLPOOL acf0c4ffa017a65d67423bb28b36cfd4e8acec59c47cc845f98669a3368920fa1e4e33b4c86e00082aeb416225066091305adcf1e8919071825a192ab5127180
diff --git a/dev-python/livereload/files/fix-tests.patch b/dev-python/livereload/files/fix-tests.patch
new file mode 100644
index 000000000000..2c9208ad17aa
--- /dev/null
+++ b/dev-python/livereload/files/fix-tests.patch
@@ -0,0 +1,77 @@
+diff --git a/tests/test_watcher.py b/tests/test_watcher.py
+index fa0ae41..5310bdc 100644
+--- a/tests/test_watcher.py
++++ b/tests/test_watcher.py
+@@ -3,18 +3,22 @@
+ import os
+ import time
+ import shutil
++import unittest
+ from livereload.watcher import Watcher
+ 
+ tmpdir = os.path.join(os.path.dirname(__file__), 'tmp')
+ 
+ 
+-class TestWatcher(object):
++class TestWatcher(unittest.TestCase):
+ 
+     def setUp(self):
+         if os.path.isdir(tmpdir):
+             shutil.rmtree(tmpdir)
+         os.mkdir(tmpdir)
+ 
++    def tearDown(self):
++        shutil.rmtree(tmpdir)
++
+     def test_watch_dir(self):
+         os.mkdir(os.path.join(tmpdir, '.git'))
+         os.mkdir(os.path.join(tmpdir, '.hg'))
+@@ -25,6 +29,9 @@ class TestWatcher(object):
+         watcher.watch(tmpdir)
+         assert watcher.is_changed(tmpdir) is False
+ 
++        # sleep 1 second so that mtime will be different
++        time.sleep(1)
++
+         with open(os.path.join(tmpdir, 'foo'), 'w') as f:
+             f.write('')
+ 
+@@ -35,6 +42,9 @@ class TestWatcher(object):
+         watcher = Watcher()
+         watcher.count = 0
+ 
++        # sleep 1 second so that mtime will be different
++        time.sleep(1)
++
+         filepath = os.path.join(tmpdir, 'foo')
+         with open(filepath, 'w') as f:
+             f.write('')
+@@ -51,22 +61,24 @@ class TestWatcher(object):
+         with open(filepath, 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() == os.path.abspath(filepath)
++        rv = watcher.examine()
++        assert rv[0] == os.path.abspath(filepath)
+         assert watcher.count == 1
+ 
+     def test_watch_glob(self):
+         watcher = Watcher()
+         watcher.watch(tmpdir + '/*')
+-        assert watcher.examine() is None
++        assert watcher.examine() == (None, None)
+ 
+         with open(os.path.join(tmpdir, 'foo.pyc'), 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() is None
++        assert watcher.examine() == (None, None)
+ 
+         filepath = os.path.join(tmpdir, 'foo')
+ 
+         with open(filepath, 'w') as f:
+             f.write('')
+ 
+-        assert watcher.examine() == os.path.abspath(filepath)
++        rv = watcher.examine()
++        assert rv[0] == os.path.abspath(filepath)
diff --git a/dev-python/livereload/livereload-2.3.2.ebuild b/dev-python/livereload/livereload-2.3.2.ebuild
new file mode 100644
index 000000000000..c49a6bd81e11
--- /dev/null
+++ b/dev-python/livereload/livereload-2.3.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/livereload/livereload-2.3.2.ebuild,v 1.1 2015/05/02 15:18:04 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="www-servers/tornado[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/fix-tests.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( example/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
new file mode 100644
index 000000000000..02be8c5eb78f
--- /dev/null
+++ b/dev-python/livereload/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 35a36ff55b80..d4f8a25cb04e 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-0.11.1.tar.gz 3688578 SHA256 dced877e483bf38bc0842ff656ad88196142252597c5e5bfd40973042d179bfe SHA512 dff3040be2b032447c500a9037876c446d7f208773f33a078ed93fc63f9c564f7ba382916d7879ae4d3f61300fdec1185d9f6a2d53cfb918fd5cfdf8e47c67b9 WHIRLPOOL c040e7725cac975b363e2ad110394d3b68e381fae6ff830bba7bb07d8d8262361ad0853db99e8133a8fed17a5a45761129fb48c59111a5dd6b0ea4b76006588b
+DIST mkdocs-0.12.2.tar.gz 6042907 SHA256 3d96844b742c00e7466d63a713a3b6b01575aa71f6ae7214dd12797d48df38b8 SHA512 149d8e27df8474ade24e4cbff1b8eef1d7a7549997499c7df774afdb89bc9fe0d8de7d869d8b29aba883d1672032c76e8dbdb7e8982da6f94e2145d0b554e677 WHIRLPOOL c476ff900c94cf880c7f5c5f8edb615f11e4f169bae0b696a217de0c7384c7fb4818b5f9afdfb8a6f7c5c77877ada518f938a1b0b756703b5866f82b6a240262
diff --git a/dev-python/mkdocs/files/skip-invalid-test.patch b/dev-python/mkdocs/files/skip-invalid-test.patch
new file mode 100644
index 000000000000..cb8a23eb8131
--- /dev/null
+++ b/dev-python/mkdocs/files/skip-invalid-test.patch
@@ -0,0 +1,12 @@
+diff --git a/mkdocs/tests/config_tests.py b/mkdocs/tests/config_tests.py
+index 647c695..b26d59d 100644
+--- a/mkdocs/tests/config_tests.py
++++ b/mkdocs/tests/config_tests.py
+@@ -130,7 +130,6 @@ class ConfigTests(unittest.TestCase):
+             {'docs_dir': 'docs', 'site_dir': ''},
+             {'docs_dir': '', 'site_dir': 'site'},
+             {'docs_dir': '', 'site_dir': ''},
+-            {'docs_dir': j('..', 'mkdocs', 'docs'), 'site_dir': 'docs'},
+         )
+ 
+         conf = {
diff --git a/dev-python/mkdocs/mkdocs-0.12.2.ebuild b/dev-python/mkdocs/mkdocs-0.12.2.ebuild
new file mode 100644
index 000000000000..b6d5df4a8660
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-0.12.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mkdocs/mkdocs-0.12.2.ebuild,v 1.1 2015/05/03 17:30:52 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Project documentation with Markdown."
+HOMEPAGE="http://www.mkdocs.org"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/livereload-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/skip-invalid-test.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		"${PYTHON}" -m mkdocs.main build || die "failed to build documentation"
+	fi
+}
+
+python_test() {
+	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( site/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyGPG/pyGPG-0.1.ebuild b/dev-python/pyGPG/pyGPG-0.1.ebuild
index ae4dee75bedb..33b60dbd7ef5 100644
--- a/dev-python/pyGPG/pyGPG-0.1.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyGPG/pyGPG-0.1.ebuild,v 1.5 2015/02/18 15:17:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyGPG/pyGPG-0.1.ebuild,v 1.6 2015/05/02 09:02:59 jer Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index e2b3f84b6605..658616902ffc 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1 +1,2 @@
 DIST python-saharaclient-0.7.0.tar.gz 72542 SHA256 7c83fb7709a870101539bd25d76225dc7a65e3848e2d698403e0a410c67fe388 SHA512 788d6a0586b00dc6d367f34ede74109d787c4cf4abd8dd2d7ef11bebe7440add42da54c3c9aaa8bdf201444d1c5fd38e5da41b327cc166b396978e85608120e9 WHIRLPOOL f5e4ab52eda75b626c8d8a722869eb9914f6a8e29ea9c6815e510e42c93f912dda8e7887fe0342faac4fdf0baf4ce727fb7fbc133281b98d2586b258a65e3799
+DIST python-saharaclient-0.9.0.tar.gz 92694 SHA256 3a268992bc7383fecbfe067b497f28c16d6577cc87646a4e88d32a954c744885 SHA512 626e99077e3d7e676be82fd0ad3e9a67d1a471dd947951a22e4402e38d5b9f4db9a35a4b7cd7f4a3bb48a2f1d0927a025115fc3f2325e64d3bc06f0839fb5c3d WHIRLPOOL 308af2a580eb27b9452413a343de3e832250a28c86fbabcf0fd320aebb2cc3aa8f750de805ea8d4757a20713c4076b7aac5996680546ea51535080120ff1173a
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
new file mode 100644
index 000000000000..5ace7c08b496
--- /dev/null
+++ b/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild,v 1.1 2015/05/03 05:37:17 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
+HOMEPAGE="https://github.com/openstack/python-saharaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+			<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
+			>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+			>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/requests-mock-0.6.0[${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/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		)"
+RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/argparse/d' requirements.txt
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 16d07ca69b87..57c81d4172d7 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,3 +1,2 @@
-DIST acts_as_list-0.4.0.gem 16384 SHA256 504aa7ebbcf9dcec2929ac4f94bfb11aae52b6210ad573c07ec1897d8e865276 SHA512 14ac5b48b78a50f69f2c97d2c42e588ec9402499a8169c217b27e0b914a17a2bc58c91610ecb14de02482d0b72a96add9bb86d498d91198788b0738825b054d2 WHIRLPOOL 78d894f12a90bd0d687e27241eab1c3711a05462d2d98bbc4d22341bcc8b9b6b586273daed81eeb95167d3127b6dcec7427e4111c5e0fb2ca449063c8806453d
-DIST acts_as_list-0.5.0.gem 16896 SHA256 567f13b673144a2836495b379c1d462dff74491d45f7000b68a82fe4f856035e SHA512 b4fd105ead5d2276e9510747fe9fbdd9e5741982e104d0084442ee5492b81ee94cde8f29b0eb6d3ae5a55ad71ca544edd0a4d341541eec4e28226389b6b67d6c WHIRLPOOL fb6200b32d9d8314d77aa70eec0afd39bbb8ce37385c1cc33bec3758d132f7b3a2810d771b14d308effaca10b52362b8d8222e697638c4504b335739f810055d
 DIST acts_as_list-0.6.0.gem 16896 SHA256 5bf8f131c5872be26a3b8a8b1302b1484bf880cd4daa6340c12af3c87bd09ba5 SHA512 88e8781dbb47e947b4658987fa0a17535a71c7e7967c38cf929498702cfee550e55b983b5f5d4f85a6f1128fe6916fbbdf5ff7901bb23d17544d3497cc684111 WHIRLPOOL 28f954cfc9ae1494cc95d8259cd4d9c57e09ffb55aaa460717eb524b16c0e8a0420ec9252265eeecad94066a9a57af36d148b7586dc4b3e67bfc29aa2279e0fc
+DIST acts_as_list-0.7.0.gem 17920 SHA256 4c2be07814d0c83fee226f87fff53a6f0797103e1d804d75ad4b3bbe5d0ba869 SHA512 c12ffb1d707987505be5f1a89e55b5cb8eda823842383088dd7579ef3baf07be1bf90a6f5f9cc50307d189529edb9ecf77865fcf7fa140454b92560d3ccc158d WHIRLPOOL 058c3b8b9151dadf1930cd7e1fae4533222e8bf3faf677d9abc002e859ac750a637c86947aa38185daa568e452decce6c7cec1dcced5a8365b83d79e5007e08b
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.4.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.4.0.ebuild
deleted file mode 100644
index 667f36a2c34c..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.4.0.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/dev-ruby/acts_as_list/acts_as_list-0.4.0.ebuild,v 1.3 2014/08/05 16:00:59 mrueg Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="http://rake.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord:3.2[sqlite3]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '1,9 s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Tests currently only pass on rails 3.
-	sed -e '1igem "activerecord", "~>3.2.0"' -i test/helper.rb || die
-}
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.7.0.ebuild
similarity index 86%
rename from dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild
rename to dev-ruby/acts_as_list/acts_as_list-0.7.0.ebuild
index 97591538dbd3..5475a967cb87 100644
--- a/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild
+++ b/dev-ruby/acts_as_list/acts_as_list-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild,v 1.1 2014/11/11 06:16:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/acts_as_list/acts_as_list-0.7.0.ebuild,v 1.1 2015/05/03 19:12:08 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -22,7 +22,7 @@ SLOT="3"
 KEYWORDS="~amd64 ~x86 ~x86-macos"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/activerecord-3"
+ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/arel/arel-4.0.2.ebuild b/dev-ruby/arel/arel-4.0.2.ebuild
index 62cae6655a6b..576a80b693e5 100644
--- a/dev-ruby/arel/arel-4.0.2.ebuild
+++ b/dev-ruby/arel/arel-4.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-ruby/arel/arel-4.0.2.ebuild,v 1.4 2015/01/26 18:23:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/arel/arel-4.0.2.ebuild,v 1.5 2015/05/03 06:55:45 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
@@ -22,7 +22,9 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-m
 IUSE=""
 
 ruby_add_bdepend "
+	doc? ( >=dev-ruby/hoe-3.3.1 )
 	test? (
+		>=dev-ruby/hoe-3.3.1
 		>=dev-ruby/minitest-5.2:5
 	)"
 
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
index f772cc890684..8d896cad75af 100644
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild,v 1.1 2014/12/02 12:34:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild,v 1.2 2015/05/03 06:59:09 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -24,6 +24,7 @@ IUSE=""
 
 ruby_add_bdepend "test? (
 	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
 	dev-ruby/coderay
 	dev-ruby/erubis
 	dev-ruby/haml
diff --git a/dev-ruby/bcat/bcat-0.6.2-r1.ebuild b/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
index d8296331c9c1..52a02f59d482 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2-r1.ebuild,v 1.10 2015/04/26 17:12:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bcat/bcat-0.6.2-r1.ebuild,v 1.11 2015/05/03 11:53:08 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -15,7 +15,7 @@ HOMEPAGE="http://github.com/rtomayko/bcat"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 # Collides on /usr/bin/bcat, bug 418301
diff --git a/dev-ruby/builder/builder-3.2.2.ebuild b/dev-ruby/builder/builder-3.2.2.ebuild
index 25253432ccf9..33cac3188072 100644
--- a/dev-ruby/builder/builder-3.2.2.ebuild
+++ b/dev-ruby/builder/builder-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.2.2.ebuild,v 1.13 2015/04/26 17:12:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.2.2.ebuild,v 1.14 2015/05/03 11:56:02 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rubyforge.org/projects/builder/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/bundler-1.7.3.ebuild b/dev-ruby/bundler/bundler-1.7.3.ebuild
index f5356e8dbb37..762ac597c61f 100644
--- a/dev-ruby/bundler/bundler-1.7.3.ebuild
+++ b/dev-ruby/bundler/bundler-1.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.3.ebuild,v 1.8 2015/04/26 17:12:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bundler/bundler-1.7.3.ebuild,v 1.9 2015/05/03 11:54:54 jer Exp $
 
 EAPI=5
 
@@ -22,7 +22,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=""
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/childprocess/childprocess-0.5.3.ebuild b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
index e15c118926fe..7d3ecbcba11c 100644
--- a/dev-ruby/childprocess/childprocess-0.5.3.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.3.ebuild,v 1.11 2015/04/26 17:13:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/childprocess/childprocess-0.5.3.ebuild,v 1.12 2015/05/03 11:59:44 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:2 )"
diff --git a/dev-ruby/configliere/configliere-0.4.22.ebuild b/dev-ruby/configliere/configliere-0.4.22.ebuild
index 0629ed94c5d6..fcfa0a705ef5 100644
--- a/dev-ruby/configliere/configliere-0.4.22.ebuild
+++ b/dev-ruby/configliere/configliere-0.4.22.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-ruby/configliere/configliere-0.4.22.ebuild,v 1.3 2014/11/03 15:09:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/configliere/configliere-0.4.22.ebuild,v 1.4 2015/05/03 07:06:08 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,7 +22,7 @@ IUSE=""
 
 ruby_add_rdepend "
 	>=dev-ruby/highline-1.5.2
-	>=dev-ruby/multi_json-1.1"
+	>=dev-ruby/multi_json-1.10.1"
 
 all_ruby_prepare() {
 	rm Gemfile* || die
diff --git a/dev-ruby/coolio/coolio-1.3.0.ebuild b/dev-ruby/coolio/coolio-1.3.0.ebuild
index 61ce9fec7cf7..537fab747395 100644
--- a/dev-ruby/coolio/coolio-1.3.0.ebuild
+++ b/dev-ruby/coolio/coolio-1.3.0.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/dev-ruby/coolio/coolio-1.3.0.ebuild,v 1.1 2015/04/03 10:52:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coolio/coolio-1.3.0.ebuild,v 1.2 2015/05/03 07:30:31 graaff Exp $
 
 EAPI=5
 
 # iobuffer: -rbx
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec2"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 RUBY_FAKEGEM_NAME="cool.io"
 
@@ -37,6 +37,10 @@ all_ruby_prepare() {
 	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
+	# Avoid dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
 	# Remove specs that require network connectivity
 	rm spec/dns_spec.rb || die
 }
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 4301e731be81..2f65da86f451 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,2 +1,3 @@
 DIST cri-2.4.1.gem 20480 SHA256 1c736c7e4fb080e916af10fccbfd8dab39224126db31377ddc9048ea8f2a8070 SHA512 57ca21cdad59fcff78cdb042be3614f977ed0b5ad2f42e2b2f42df3eac6656fac2b6a33fe0af1ac511cce9db0f1345403f0846899353d156a7c28efdc43e8d4a WHIRLPOOL bffe0f9b371feee542556e177be0e645b4804dcb58bc2ee0aa7d5ee1dad23d3e6b6c1c9fe2ed0edb0ae20b33361eb518cf661d1bdab871c4038fd4a1ceed5369
 DIST cri-2.6.1.gem 23552 SHA256 349dedff69722138ea49b69f32e2195094b4e2300caf230b33bdd29c3fdffc7f SHA512 61ccbbc34e58ca7473817beccc7e2af29ab48981d58ddb4d753e32c98ae933acc33e696d922d3f3fc4adfa3f2ee230a7d2eb27bd671f2b46dfda72ad9ab15e55 WHIRLPOOL a45affae09c29318d0ef59604923f37369cc9af1c51d56ca58b9d8391797c22ebeef703e87d50d7d9cf1a4eb742241591503bc4491d312b9ecc050235c66599a
+DIST cri-2.7.0.gem 25088 SHA256 861e637cfeb0f8a618ea982f675c574520590aecbd098a2cf3d8be339ff3ed62 SHA512 4bef9bbe623b45f21b0cc66aba40ac3fd945227fb50a6b169c79b8ac9b84144119defaaed3a76044b15a916d077fa91f36c35fa22b69b7405f6c9b4fb8bf1118 WHIRLPOOL bf77d0570902a374198cd59d2f19e4da274fd1f76f1a2783ed22572ef52540812d1d9c53c783524fcbd074af0bc9f368ef387f40ab10149b9b97feb32db0d88b
diff --git a/dev-ruby/cri/cri-2.7.0.ebuild b/dev-ruby/cri/cri-2.7.0.ebuild
new file mode 100644
index 000000000000..8bdd1fe85cc9
--- /dev/null
+++ b/dev-ruby/cri/cri-2.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cri/cri-2.7.0.ebuild,v 1.1 2015/05/03 06:09:08 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.adoc"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="http://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/ethon/ethon-0.7.3.ebuild b/dev-ruby/ethon/ethon-0.7.3.ebuild
index 554022c7af54..67066daaa9aa 100644
--- a/dev-ruby/ethon/ethon-0.7.3.ebuild
+++ b/dev-ruby/ethon/ethon-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ethon/ethon-0.7.3.ebuild,v 1.1 2015/03/02 06:11:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ethon/ethon-0.7.3.ebuild,v 1.2 2015/05/03 07:36:10 graaff Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ RDEPEND+="net-misc/curl"
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.3.0"
 
-ruby_add_bdepend "test? ( dev-ruby/sinatra )"
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
 
 all_ruby_prepare() {
 	rm Gemfile || die
diff --git a/dev-ruby/faraday/faraday-0.9.1.ebuild b/dev-ruby/faraday/faraday-0.9.1.ebuild
index 2f68bd5102a1..e138d7601c72 100644
--- a/dev-ruby/faraday/faraday-0.9.1.ebuild
+++ b/dev-ruby/faraday/faraday-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.1.ebuild,v 1.3 2015/04/18 12:50:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday/faraday-0.9.1.ebuild,v 1.4 2015/05/03 07:49:49 graaff Exp $
 
 EAPI=5
 
@@ -30,6 +30,7 @@ ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		dev-ruby/httpclient
+		dev-ruby/rack-test
 		dev-ruby/sinatra
 		dev-ruby/net-http-persistent
 		dev-ruby/patron
diff --git a/dev-ruby/ferret/ferret-0.11.8.6.ebuild b/dev-ruby/ferret/ferret-0.11.8.6.ebuild
index b6dd485d1468..bef0302934b7 100644
--- a/dev-ruby/ferret/ferret-0.11.8.6.ebuild
+++ b/dev-ruby/ferret/ferret-0.11.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-ruby/ferret/ferret-0.11.8.6.ebuild,v 1.1 2015/02/21 04:52:48 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ferret-0.11.8.6.ebuild,v 1.2 2015/05/03 08:02:25 graaff Exp $
 
 EAPI=5
 
@@ -32,6 +32,11 @@ all_ruby_prepare() {
 	# Remove bundled bzlib code and use system version instead.
 	rm ext/BZLIB* ext/bzlib* || die
 	sed -i -e '14i  $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
+
+	# Avoid test known to fail upstream:
+	# https://github.com/jkraemer/ferret/issues/2
+	sed -i -e '/test_adding_long_url/,/^  end/ s:^:#:' \
+		test/unit/index/tc_index_writer.rb || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
index 0a33a2559429..9130ffb72e8d 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild,v 1.12 2015/04/26 17:13:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r2.ebuild,v 1.13 2015/05/03 12:07:02 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-ruby/hashery/hashery-2.1.1.ebuild b/dev-ruby/hashery/hashery-2.1.1.ebuild
index bcf774d73682..78102a6261cf 100644
--- a/dev-ruby/hashery/hashery-2.1.1.ebuild
+++ b/dev-ruby/hashery/hashery-2.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashery/hashery-2.1.1.ebuild,v 1.5 2014/08/19 11:48:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashery/hashery-2.1.1.ebuild,v 1.6 2015/05/02 07:14:20 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild b/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
index 59af2e19a352..edac4c9c1ff1 100644
--- a/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild,v 1.1 2015/04/04 06:38:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild,v 1.2 2015/05/03 06:50:52 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/multi_json/multi_json-1.9.3.ebuild b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
index 579452f86dc0..3eab62bfa1c5 100644
--- a/dev-ruby/multi_json/multi_json-1.9.3.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.9.3.ebuild,v 1.10 2015/04/26 17:13:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.9.3.ebuild,v 1.11 2015/05/03 12:06:23 jer Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="http://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_test/multi_test-0.1.1.ebuild b/dev-ruby/multi_test/multi_test-0.1.1.ebuild
index 2bce5fcf6c93..a069d1654a4c 100644
--- a/dev-ruby/multi_test/multi_test-0.1.1.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_test/multi_test-0.1.1.ebuild,v 1.11 2015/04/26 17:13:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_test/multi_test-0.1.1.ebuild,v 1.12 2015/05/03 12:08:42 jer Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="http://cukes.info/"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rubyzip/rubyzip-0.9.9-r1.ebuild b/dev-ruby/rubyzip/rubyzip-0.9.9-r1.ebuild
index baa7f8edf94a..0e21ceeca02a 100644
--- a/dev-ruby/rubyzip/rubyzip-0.9.9-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-0.9.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/dev-ruby/rubyzip/rubyzip-0.9.9-r1.ebuild,v 1.11 2015/04/26 17:13:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/rubyzip-0.9.9-r1.ebuild,v 1.12 2015/05/03 11:57:13 jer Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ RUBY_S="aussiegeek-rubyzip-*"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ruby/spork/spork-0.9.2-r1.ebuild b/dev-ruby/spork/spork-0.9.2-r1.ebuild
index ec0caa8b95fa..4c266d7ded1d 100644
--- a/dev-ruby/spork/spork-0.9.2-r1.ebuild
+++ b/dev-ruby/spork/spork-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2-r1.ebuild,v 1.8 2015/04/14 12:19:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/spork/spork-0.9.2-r1.ebuild,v 1.9 2015/05/03 12:10:49 jer Exp $
 
 EAPI=5
 
@@ -17,6 +17,6 @@ DESCRIPTION="Spork is Tim Harper's implementation of test server"
 HOMEPAGE="https://github.com/sporkrb/spork"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild
index 98ad09ed4110..2d8fcceae919 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.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/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild,v 1.11 2015/04/26 17:13:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild,v 1.12 2015/05/03 12:05:44 jer Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/brianmario/yajl-ruby"
 
 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=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
index 6618c74b0342..b654e527de2c 100644
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ b/dev-util/aruba/aruba-0.5.4-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/aruba/aruba-0.5.4-r1.ebuild,v 1.12 2015/04/26 17:14:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aruba/aruba-0.5.4-r1.ebuild,v 1.13 2015/05/03 12:00:22 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/cucumber/cucumber-1.3.17.ebuild b/dev-util/cucumber/cucumber-1.3.17.ebuild
index cf98adf1e5b5..e1c8c538a8bf 100644
--- a/dev-util/cucumber/cucumber-1.3.17.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.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-util/cucumber/cucumber-1.3.17.ebuild,v 1.10 2015/04/26 17:14:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.17.ebuild,v 1.11 2015/05/03 12:09:29 jer Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -18,7 +18,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="http://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index a4c85b0ca018..6772ee8c2955 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1 +1,2 @@
 DIST debhelper_9.20150101.tar.gz 545089 SHA256 fd8d81d71d1bb0ba4b58c517465551231dd60811b98c867e4344bc55ec6a45f2 SHA512 62c85f751627cf0bdac392c6e8c5298995030962b7753047414e740b3767d722c209329c9f0c3c07c94e82bbb7250c163ce49b681e268a0decdbd19b72ea132a WHIRLPOOL 31315544c3ee695a53ef2310ad69e59c68fb0b73399305b9fe57ceb7b01faab72995e01aed270300dd0fbaed2686a5b565a8a08cfc31c720c5baa2a6c475ac4e
+DIST debhelper_9.20150502.tar.xz 313460 SHA256 b4d55e83b7d3aa7f15ad5ddeab34fc043e803abcb051bd38ef81e80fc5423f13 SHA512 302d592dd70e95c6f14fe5d7aecb221399354dcea4d7a1d49007cc8c2c52014ce88b10f273739e2ff6673fff2139a343ec35f894145409c4235e66694ed39e47 WHIRLPOOL 58bb221ff062b5b471390abe3fbd463c83fbae359a11fc9e0dbf3662d463f3a454613f1ba42d8cdef9e774a1b89420e7a34b563fcacec51f85f31e32b3748e6b
diff --git a/dev-util/debhelper/debhelper-9.20150502.ebuild b/dev-util/debhelper/debhelper-9.20150502.ebuild
new file mode 100644
index 000000000000..9a12872e788f
--- /dev/null
+++ b/dev-util/debhelper/debhelper-9.20150502.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20150502.ebuild,v 1.1 2015/05/03 06:08:01 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LINGUAS=( de es fr )
+IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	test? ( dev-perl/Test-Pod )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lingua
+	for manfile in *.1 *.7 ; do
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index c875eb009e0b..35dc06d9ac2c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,2 +1,2 @@
 DIST jenkins-bin-1.596.2.war 68553541 SHA256 769fee082d420819f0113d5271be98004d3f3227d98c4e445f6e5f60dde6de37 SHA512 ad853a0e1961a08b21b49e3e1e7a19479774056a2cab37f461f0974021272ab017bff07dc09962443202def4e2a78f3017f6d2389dce90bca6bc8cc0b1d4543c WHIRLPOOL eee48085e32e0a0ae5f4f866a56ad36bf625ab6d3019f4e46b0213064d95d0a989c14d385f1681ccb3300563a22a2e73656ff5a460c07703985e6d0d8a15dc0f
-DIST jenkins-bin-1.610.war 69287626 SHA256 bb5a7b29e359a3743ddf385975bca65221cee89b0a13c5309169601d23952e0e SHA512 72b5e1b802a0a9ee52f195ab89d952d99c4fd33d4e28bc17be6d214016c6ee9d741681d6a0cbf74fc3860fc5ca2cae92edc62e31daa42dfec56fb498722d2fd1 WHIRLPOOL d853df2d5f3b87f2bbe614527ff0f758efa784b412ea3cf002d7a2c3e6fd4c9efa675ab82c42844d80220946993986241c1f63ee70d12e0bcad52d69b9226b47
+DIST jenkins-bin-1.611.war 68914127 SHA256 12157975cd8c5bf54bbafdc16d826fd384d7eea5e3816c2c28f82002ad866e42 SHA512 c7b2ec8be305c44347729079c12867fca72950d4651b1784d27b8aa4f6223867dd9d2277f1cd7bd83734d82bcfe46818999673a65b24f0d7946799ffe49c2539 WHIRLPOOL c8a472b62bf20a1e1a642c75d82b83477926897f1fff22b32f3fb306b916e9092d412b1a0ed96467f83d0c42b68a48457155b87af609ab99f84d1d32bbd2bf3f
diff --git a/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
new file mode 100644
index 000000000000..33b16600452e
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin-r1.logrotate
@@ -0,0 +1,17 @@
+/var/log/jenkins/jenkins.log /var/log/jenkins/access_log {
+    compress
+    dateext
+    maxage 365
+    rotate 99
+    size=+4096k
+    notifempty
+    missingok
+    create 644
+    postrotate
+        [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins
+        if [ -s /var/run/jenkins.pid ]; then
+            JPID=$(cat /var/run/jenkins.pid)
+            test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || :
+        fi
+    endscript
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.610.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild
similarity index 90%
rename from dev-util/jenkins-bin/jenkins-bin-1.610.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-1.611.ebuild
index 4a042a522cb2..e9effde77e91 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.610.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild
@@ -1,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/jenkins-bin/jenkins-bin-1.610.ebuild,v 1.1 2015/04/20 13:35:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jenkins-bin/jenkins-bin-1.611.ebuild,v 1.1 2015/05/03 16:17:34 mrueg Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ src_install() {
 	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN/-bin/}
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
 
 	newinitd "${FILESDIR}"/${PN}.init2 jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins
diff --git a/dev-util/qbs/qbs-1.4.0.ebuild b/dev-util/qbs/qbs-1.4.0.ebuild
index a394a8fd0d37..39cbfdf6ff26 100644
--- a/dev-util/qbs/qbs-1.4.0.ebuild
+++ b/dev-util/qbs/qbs-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.1 2015/04/28 16:08:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.3 2015/05/03 11:40:23 pesa Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${P}.src.tar.gz"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
+IUSE="doc examples test"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# fix plugins libdir
+	# v1.4.1 will contain a fix: https://codereview.qt-project.org/111532
 	sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \
 		src/plugins/plugins.pri || die
 
@@ -42,6 +43,10 @@ src_prepare() {
 	sed -i -e 's/!haveNodeJs()/true/' \
 		tests/auto/blackbox/tst_blackbox.cpp || die
 
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
 	if use test; then
 		sed -i -e '/SUBDIRS =/ s:=.*:= auto:' tests/tests.pro || die
 	else
diff --git a/dev-vcs/git/git-2.3.6.ebuild b/dev-vcs/git/git-2.3.6.ebuild
index 23e0db154b39..749b13a983f4 100644
--- a/dev-vcs/git/git-2.3.6.ebuild
+++ b/dev-vcs/git/git-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.6.ebuild,v 1.2 2015/05/01 17:59:32 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.6.ebuild,v 1.4 2015/05/02 10:08:00 jer Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 9ab98bf4ce47..d8754beb56d0 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.159 2015/04/28 20:35:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.160 2015/05/02 20:23:56 chewi Exp $
 
 # @ECLASS: java-utils-2.eclass
 # @MAINTAINER:
@@ -412,7 +412,7 @@ java-pkg_doso() {
 			# install if it isn't a symlink
 			if [[ ! -L "${lib}" ]] ; then
 				INSDESTTREE="${JAVA_PKG_LIBDEST}" \
-					INSOPTIONS="${LIBOPTIONS}" \
+					INSOPTIONS="-m0755" \
 					doins "${lib}" || die "failed to install ${lib}"
 				java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
 				debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 274759fd6627..91c1ffeba7ae 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-3.5.zip 28805192 SHA256 56a55060aa912562e6fac2b114b8ad8019deb419b784a1db555a158a01021037 SHA512 0f3f30084ca4cd72623a33d33fe212c113bb5034c2bfcdc85b7744da48deae63341a42b0eaf0ae7aca7a5ebcdc99ec5bf0c2e32b3badd567602d4fed7d3c8ff6 WHIRLPOOL b2b99ea310b2362c66480e934a8b10ce33b72be347474099f1fe932e26a6d3bc7634b3e8e527f0d1892e5a78af984f2762a92294fe0ea6e2e3cc59bbf953980b
 DIST dolphin-4.0.2.zip 28261421 SHA256 90e49ccd92eddc019bcac3b914bf16ce8d49c59fc2bd165ee02a22ea1a0456da SHA512 cb0c788307e6a0048213a2d947ac44d96b5bab064e5be41ad83c308ab98d0126bb173dd0b8705664f898d02eb571f8cb6d5bd6bfd3bd5e00e70126d04dd1cb99 WHIRLPOOL 5ae2bb04513f91300954cd598555a65527356b5e09d85283cbd8dee1a57a5a068dae8938e25d9a0ac77d6956cd08b33ed12afc774b05208dd432d693e4e2c842
 DIST dolphin-4.0.zip 23439392 SHA256 a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20 WHIRLPOOL 0cb7b28b911111f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
diff --git a/games-emulation/dolphin/dolphin-3.5-r1.ebuild b/games-emulation/dolphin/dolphin-3.5-r1.ebuild
deleted file mode 100644
index 5e827d765f40..000000000000
--- a/games-emulation/dolphin/dolphin-3.5-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-3.5-r1.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $
-
-EAPI=5
-
-WX_GTK_VER="2.9"
-
-inherit cmake-utils eutils flag-o-matic pax-utils toolchain-funcs versionator wxwidgets games
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio pulseaudio"
-
-RESTRICT="mirror"
-
-RDEPEND=">=media-libs/glew-1.6
-	>=media-libs/libsdl-1.2[joystick]
-	<media-libs/libsfml-2.0
-	sys-libs/readline:=
-	x11-libs/libXext
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	bluetooth? ( net-wireless/bluez )
-	ffmpeg? ( virtual/ffmpeg )
-	lzo? ( dev-libs/lzo )
-	openal? ( media-libs/openal )
-	opengl? ( virtual/opengl )
-	portaudio?  ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	media-gfx/nvidia-cg-toolkit
-	media-libs/freetype
-	>=sys-devel/gcc-4.6.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/wxGTK:2.9
-	"
-
-pkg_pretend() {
-
-	local ver=4.6.0
-	local msg="${PN} needs at least GCC ${ver} set to compile."
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! version_is_at_least ${ver} $(gcc-fullversion); then
-			eerror ${msg}
-			die ${msg}
-		fi
-	fi
-}
-
-src_prepare() {
-
-	if [[ $(gcc-version) = "4.8" ]]; then
-		epatch "${FILESDIR}"/${PN}-emu-${PV}-gcc-4.8.patch
-	fi
-
-	if use !alsa; then
-		sed -i -e '/^include(FindALSA/d' CMakeLists.txt || die
-	fi
-	if use !ao; then
-		sed -i -e '/^check_lib(AO/d' CMakeLists.txt || die
-	fi
-	if use !bluetooth; then
-		sed -i -e '/^check_lib(BLUEZ/d' CMakeLists.txt || die
-	fi
-	if use !openal; then
-		sed -i -e '/^include(FindOpenAL/d' CMakeLists.txt || die
-	fi
-	if use !portaudio; then
-		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
-	fi
-	if use !pulseaudio; then
-		sed -i -e '/^check_lib(PULSEAUDIO/d' CMakeLists.txt || die
-	fi
-
-	# Remove ALL the bundled libraries, aside from:
-	# - SOIL: The sources are not public.
-	# - Bochs_disasm: Don't know what it is.
-	# - CLRun: Part of OpenCL
-	mv Externals/SOIL . || die
-	mv Externals/Bochs_disasm . || die
-	mv Externals/CLRun . || die
-	rm -r Externals/* || die "Failed to remove bundled libs"
-	mv CLRun Externals || die
-	mv Bochs_disasm Externals || die
-	mv SOIL Externals || die
-}
-
-src_configure() {
-
-	if $($(tc-getPKG_CONFIG) --exists nvidia-cg-toolkit); then
-		append-flags "$($(tc-getPKG_CONFIG) --cflags nvidia-cg-toolkit)"
-	else
-		append-flags "-I/opt/nvidia-cg-toolkit/include"
-	fi
-
-	if $($(tc-getPKG_CONFIG) --exists nvidia-cg-toolkit); then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-L nvidia-cg-toolkit)"
-	else
-		if has_version ">=media-gfx/nvidia-cg-toolkit-3.1.0013"; then
-			append-ldflags "-L/opt/nvidia-cg-toolkit/lib64"
-		elif has_version "<=media-gfx/nvidia-cg-toolkit-2.1.0017-r1"; then
-			append-ldflags "-L/opt/nvidia-cg-toolkit/lib"
-		fi
-	fi
-
-	local mycmakeargs=(
-		"-DDOLPHIN_WC_REVISION=${PV}"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-Dprefix=${GAMES_PREFIX}"
-		"-Ddatadir=${GAMES_DATADIR}/${PN}"
-		"-Dplugindir=$(games_get_libdir)/${PN}"
-		$(cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS)
-		$(cmake-utils_use openmp OPENMP )
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-
-	cmake-utils_src_install
-
-	dodoc Readme.txt
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon Source/Core/DolphinWX/resources/Dolphin.xpm
-	make_desktop_entry "dolphin-emu" "Dolphin" "Dolphin" "Game;"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-
-	if ! use portaudio; then
-		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
-		ewarn "USE=\"portaudio\""
-	fi
-}
diff --git a/games-emulation/dolphin/dolphin-4.0-r1.ebuild b/games-emulation/dolphin/dolphin-4.0-r2.ebuild
similarity index 87%
rename from games-emulation/dolphin/dolphin-4.0-r1.ebuild
rename to games-emulation/dolphin/dolphin-4.0-r2.ebuild
index 92df7c72d37c..9b1f9bf35a4f 100644
--- a/games-emulation/dolphin/dolphin-4.0-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r1.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0-r2.ebuild,v 1.1 2015/05/02 16:50:01 twitch153 Exp $
 
 EAPI=5
 
@@ -96,6 +96,16 @@ src_prepare() {
 	mv CLRun Externals || die
 	mv Bochs_disasm Externals || die
 	mv SOIL Externals || die
+
+	# Add call for FindX11 as FindOpenGL does not include it implicitly
+	# anymore for >=cmake-3.2. For more info, see: 
+	# https://public.kitware.com/Bug/print_bug_page.php?bug_id=15268
+	if has_version ">=dev-util/cmake-3.2"; then
+		sed -i -e '/if(NOT ANDROID)/a include(FindX11)' CMakeLists.txt || die
+
+		# Fix syntax warnings in FindMiniupnpc.cmake
+		sed -i -e 's/\"\"/\\\"\\\"/g' CMakeTests/FindMiniupnpc.cmake || die
+	fi
 }
 
 src_configure() {
diff --git a/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild b/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild
similarity index 87%
rename from games-emulation/dolphin/dolphin-4.0.2-r6.ebuild
rename to games-emulation/dolphin/dolphin-4.0.2-r7.ebuild
index 9ee333b36522..0def1068dfec 100644
--- a/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild
+++ b/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r6.ebuild,v 1.1 2015/04/30 22:42:32 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r7.ebuild,v 1.1 2015/05/02 16:50:01 twitch153 Exp $
 
 EAPI=5
 
@@ -97,6 +97,16 @@ src_prepare() {
 	mv CLRun Externals || die
 	mv Bochs_disasm Externals || die
 	mv SOIL Externals || die
+
+	# Add call for FindX11 as FindOpenGL does not include it implicitly
+	# anymore for >=cmake-3.2. For more info, see: 
+	# https://public.kitware.com/Bug/print_bug_page.php?bug_id=15268
+	if has_version ">=dev-util/cmake-3.2"; then
+		sed -i -e '/if(NOT ANDROID)/a include(FindX11)' CMakeLists.txt || die
+
+		# Fix syntax warnings in FindMiniupnpc.cmake
+		sed -i -e 's/\"\"/\\\"\\\"/g' CMakeTests/FindMiniupnpc.cmake || die
+	fi
 }
 
 src_configure() {
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
index 90393f86e960..cb10eef3f069 100644
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -1,4 +1,2 @@
-DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
-DIST tracker-1.0.5.tar.xz 6061704 SHA256 9e77f8f731f44782a1468cc6dcf7f76bc9d7d7eb462c1b34062981a9c348ef16 SHA512 d5601a1d89bd6da52750b55a742005897fc4c4bd2280a5e56c462b3542473b8172d21c1e3a57cdb3e81c3ed5ed7810510e82e601fa43723df3c41a3100f61fd7 WHIRLPOOL 1165cd8a0e29fa13fe6a0410b8f9de3d277fc032496a13d2c6bca1cd9187d5bfc829ea05380d22a3262ac966a422a8bd85a9ab0fc4d7ffc8b76bddabdd2634e8
-DIST tracker-1.0.6.tar.xz 5975264 SHA256 e351ac3c182fc740afdc651d3884f8af0a8f897948a9ecc784d91bb1f9af62f9 SHA512 687ba883513a6854e99e3adc0fc5cfd2e2fb66b38486079ed178bd7c5730def4e5a8e07de32f081b30d9ac93dca5418d5c9ba782c3f80c539b3fa05b829b4b17 WHIRLPOOL 1c289d84ce63638e4a141b34d316dfaa69df26f58ac8f72154ee30e0a0bd60c3b14255cd5d900f671dd79f46d48cf3952f13b6f2e391e4b32320aca6e540a58f
 DIST tracker-1.2.5.tar.xz 6033708 SHA256 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa SHA512 8b2027e4350286d1d9c8274aa7addf0653f116389584b2cea35dc9d68563135340ac89873027d531beea2cce44b20d4a9718d6986fb486a2ef77f9cab8189699 WHIRLPOOL 4e1e923106a4b732029db9e12d8e4576aa71db64a803b8afc91f0d41793a6d22f8eb7654d0b3ac71af21ab5061432ddae1db0b3afc97d019c246c4eabf1f14d3
+DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.2.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.2.ebuild
deleted file mode 100644
index aa68f82b7551..000000000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.2.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/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.2.ebuild,v 1.3 2014/07/23 15:18:29 ago Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	~app-misc/tracker-${PV}
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/nautilus-2.90
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
-	tc-export CC
-	export TRACKER_API=${GNOME_ORG_PVP}
-}
-
-src_prepare() {
-	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
-	# config.h is not used, but is included in every source file...
-	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild
deleted file mode 100644
index 1a713da3ccbf..000000000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.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/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild,v 1.3 2014/12/19 13:39:02 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	~app-misc/tracker-${PV}
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/nautilus-2.90
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
-	tc-export CC
-	export TRACKER_API=${GNOME_ORG_PVP}
-}
-
-src_prepare() {
-	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
-	# config.h is not used, but is included in every source file...
-	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.5.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
similarity index 86%
rename from gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.5.ebuild
rename to gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
index d567b14b7b99..6bccc615f538 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.5.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.5.ebuild,v 1.1 2014/10/30 13:21:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild,v 1.1 2015/05/02 13:29:49 eva Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="tracker"
@@ -31,7 +31,7 @@ S="${S}/src/plugins/nautilus"
 
 pkg_setup() {
 	tc-export CC
-	export TRACKER_API=${GNOME_ORG_PVP}
+	export TRACKER_API=1.0
 }
 
 src_prepare() {
diff --git a/kde-misc/semantik/Manifest b/kde-misc/semantik/Manifest
index 5d30b448827d..bd5bd732a065 100644
--- a/kde-misc/semantik/Manifest
+++ b/kde-misc/semantik/Manifest
@@ -1,2 +1,2 @@
-DIST semantik-0.9.1.tar.bz2 420118 SHA256 173c215f885dbec1a40774ff9c1d9f92b817526f0fb30dbfbd58d49fd3093731 SHA512 fef111456063ec61e89cac01e7784d76f1c019ed35ce6b25bdae76fd09e16506a57eac99afc9894976697a3392d508abe5af235da7a9f01a0cc75bb8b0f7a0b7 WHIRLPOOL 36fb67c67fb0a25dbb498950cb480dc810dc0287f1c6d37f091d652688c40e2fe0c27face66e03158b486c598fa0312723068bb221962b310945a6ea57c1051c
 DIST semantik-0.9.3.tar.bz2 435810 SHA256 b5f5c2949e5b48f5cfbeac79a22dd0fcaeb9fc29e4c79de0cf9969e088ea1b3e SHA512 6176d3fa49480c1eccccfd2ccbe33cc04a66cb2d8c98afc9b756b09a2ab739afb1b9cc16d5073fc5d03c59b401c32e68ea7a0cb6df5e27330eea438acf91a5da WHIRLPOOL d2d6d42f9faa03a66c25190627bc9a33353f62c072146c47d82bd8decdd0bb9ea0a99e12dce95122b6c2d355dc985b0e26cb2acc7726fde57641517b3a7da802
+DIST semantik-0.9.4.tar.bz2 439789 SHA256 940a3b37700f1e88b6c29ff13e0d33a73832f0db856a8738b3e939d8f0c73aa2 SHA512 cec674adac99917f2e83fedc880ec25faa91c0fd7fe96031cc770b72a3a5b058205ab6892535581f5beec069b8ca6a9c887c0480d988675a1bf3c99c6f438b50 WHIRLPOOL 48f17579c66f90536bc393e7eb539f76401e6320a60fcf8210755296a643f518fcfffb0ad487640a2520ca9fcc1a797acd6314966ecf80ebffedf035c8e8de58
diff --git a/kde-misc/semantik/semantik-0.9.1.ebuild b/kde-misc/semantik/semantik-0.9.4.ebuild
similarity index 83%
rename from kde-misc/semantik/semantik-0.9.1.ebuild
rename to kde-misc/semantik/semantik-0.9.4.ebuild
index 139f203d306b..d94d0aa4dff5 100644
--- a/kde-misc/semantik/semantik-0.9.1.ebuild
+++ b/kde-misc/semantik/semantik-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.9.1.ebuild,v 1.3 2015/04/08 18:12:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.9.4.ebuild,v 1.1 2015/05/03 16:05:06 mrueg Exp $
 
 EAPI=5
 
@@ -11,8 +11,8 @@ PYTHON_REQ_USE="xml"
 inherit python-single-r1 flag-o-matic kde4-base multilib toolchain-funcs waf-utils
 
 DESCRIPTION="Mindmapping-like tool for document generation"
-HOMEPAGE="http://freehackers.org/~tnagy/semantik.html"
-SRC_URI="https://semantik.googlecode.com/files/${P}.tar.bz2"
+HOMEPAGE="http://freehackers.org/~tnagy/semantik.html https://code.google.com/p/semantik/"
+SRC_URI="http://ftp.waf.io/pub/release/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="4"
diff --git a/mail-mta/courier/courier-0.74.1-r1.ebuild b/mail-mta/courier/courier-0.74.1-r1.ebuild
index 0b70df2c9c2f..9a4ce8caf93e 100644
--- a/mail-mta/courier/courier-0.74.1-r1.ebuild
+++ b/mail-mta/courier/courier-0.74.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.74.1-r1.ebuild,v 1.2 2015/03/24 20:08:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.74.1-r1.ebuild,v 1.3 2015/05/03 11:50:59 jer Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies:
 # ~arm ~s390 ~ppc64 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm hppa ~x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
diff --git a/media-gfx/enblend/enblend-4.1.3.ebuild b/media-gfx/enblend/enblend-4.1.3.ebuild
index bbdfd8f10d79..7a013d55748b 100644
--- a/media-gfx/enblend/enblend-4.1.3.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.4 2014/12/20 16:28:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.5 2015/05/03 15:06:52 bircoph Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="
 	>=media-libs/libpng-1.2.43:0=
 	>=media-libs/openexr-1.0:=
 	media-libs/plotutils[X]
-	media-libs/tiff
+	media-libs/tiff:=
 	>=media-libs/vigra-1.8.0
 	sci-libs/gsl
 	virtual/jpeg:0=
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" )
+
 src_prepare() {
 	sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
 	sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
new file mode 100644
index 000000000000..982293e47713
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
@@ -0,0 +1,11 @@
+--- ConfigureChecks.cmake.orig	2013-10-07 10:50:00.000000000 +0400
++++ ConfigureChecks.cmake	2015-03-31 13:42:40.179527224 +0300
+@@ -53,7 +53,7 @@
+ if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK)
+   unset(VIGRA_SETIMAGEINDEX CACHE)
+   set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR})
+-  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES})
++  set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread)
+   check_cxx_source_compiles(
+   "
+   #include <vigra/imageinfo.hxx>
diff --git a/media-libs/glpng/glpng-1.46.ebuild b/media-libs/glpng/glpng-1.46-r1.ebuild
similarity index 66%
rename from media-libs/glpng/glpng-1.46.ebuild
rename to media-libs/glpng/glpng-1.46-r1.ebuild
index 03049fd73c94..fd316a2aacd6 100644
--- a/media-libs/glpng/glpng-1.46.ebuild
+++ b/media-libs/glpng/glpng-1.46-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.46.ebuild,v 1.2 2015/03/25 00:08:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.46-r1.ebuild,v 1.1 2015/05/02 16:12:49 chewi Exp $
 
 EAPI=5
 inherit cmake-multilib
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="static-libs"
 
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libpng:0=
-	sys-libs/zlib"
+RDEPEND="virtual/opengl[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${PN}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index c70c207ae265..a6bfbca1e916 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1 +1,2 @@
 DIST gst-rtsp-0.10.8.tar.bz2 567670 SHA256 9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617 SHA512 c5020cffa9334b7d9c6b9dbe6f32bd4580eeee1c67689269d232e954ef9d96d8b988e3fb19da89701eae26419df0bf6de5796f7780cfbedda4c07154b1c1ebd7 WHIRLPOOL 6bd260edaef5ab003ef7176d84c46d5a94d365af51226108af9ab845d6e5910d90c721d5fd87e7fe93b141a82e5114b4c674a1d2500ef57302bf845c87f5463c
+DIST gst-rtsp-server-1.4.5.tar.xz 530724 SHA256 3089254bd31b7c1f1cf2c034a3b3551f92878f9e3cab65cef3a901a04c0f1d37 SHA512 0f7bbad94416de73abffd76f88fa051b6db4e5250486669b29b101d06a3629ccef886f2048d51d1e3b78c22393eaa86a1f44c696b25ffabc19a1c37c3e442a35 WHIRLPOOL 0a82942e3172a5d6f7699e73c41ab6cfd5c85c52153058fc38673dd347df5f67fa26229273cf29a6ef841c85ddf3ae3f37c0d5db073978c7f9d5546db9b7ce39
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.4.5.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.4.5.ebuild
new file mode 100644
index 000000000000..5e1b634b6e28
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.4.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-rtsp-server/gst-rtsp-server-1.4.5.ebuild,v 1.1 2015/05/02 10:52:24 eva Exp $
+
+EAPI=5
+
+inherit eutils gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="http://people.freedesktop.org/~wtay/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# FIXME: check should depend on USE=test but check is losy
+# configure says good and bad are required by macros forces them to be optional
+# they are only used in unittests anyway.
+RDEPEND="
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.4:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/check-0.9.2
+	>=dev-util/gtk-doc-am-1.12
+	virtual/pkgconfig
+	test? (
+		>=media-libs/gst-plugins-bad-1.4:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+		>=media-libs/gst-plugins-good-1.4:${SLOT}[${MULTILIB_USEDEP}]
+	)
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+src_prepare() {
+	# don't waste time building examples
+	sed -e '/SUBDIRS.*=/,/^$/ { s/examples// };' \
+		 -i Makefile.am Makefile.in \
+		|| die
+}
+
+multilib_src_configure() {
+	# debug: only adds -g to CFLAGS
+	# docbook: nothing behind that switch
+	# libcgroup is automagic and only used in examples
+	gstreamer_multilib_src_configure \
+		--disable-docbook \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		LIBCGROUP_LIBS= \
+		LIBCGROUP_FLAGS=
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi ; then
+		ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	# Handle broken upstream modifications to defaults of gtk-doc
+	emake install -C docs/libs DESTDIR="${D}"
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.c
+	fi
+}
diff --git a/media-libs/leptonica/leptonica-1.72.ebuild b/media-libs/leptonica/leptonica-1.72-r1.ebuild
similarity index 88%
rename from media-libs/leptonica/leptonica-1.72.ebuild
rename to media-libs/leptonica/leptonica-1.72-r1.ebuild
index 49cb1aa02ca4..aee24222fe19 100644
--- a/media-libs/leptonica/leptonica-1.72.ebuild
+++ b/media-libs/leptonica/leptonica-1.72-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.72.ebuild,v 1.1 2015/05/01 23:24:02 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.72-r1.ebuild,v 1.1 2015/05/02 15:59:06 chewi Exp $
 
 EAPI=5
 
@@ -19,11 +19,11 @@ IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 REQUIRED_USE="test? ( jpeg png tiff )"
 
 DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}]
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
 		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
 	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
diff --git a/media-libs/rubberband/rubberband-1.8.1.ebuild b/media-libs/rubberband/rubberband-1.8.1.ebuild
index d85d8980496e..633db1b3d1ba 100644
--- a/media-libs/rubberband/rubberband-1.8.1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.8.1.ebuild,v 1.2 2013/07/21 13:08:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.8.1.ebuild,v 1.3 2015/05/03 08:28:54 jer Exp $
 
 EAPI=5
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/vamp-plugin-sdk
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 6016d088b17b..9a57190e89ca 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -3,3 +3,4 @@ DIST flrig-1.3.16.tar.gz 604998 SHA256 c39f951ab20e195819e6962b9038c3097b7c1a466
 DIST flrig-1.3.18.tar.gz 616711 SHA256 50f0a3eb1110a50a838fdd8f1393d2eafe1b6ea605deaf437e0e61a5a7d34370 SHA512 94f3a783d171003323130bccbb762f676de9b3d629f898715ab713ccc03f5198bc25ca39c913bedc6d28a2d0272dc6e584566a9e09389222dcffa22b1bab3f8e WHIRLPOOL 46ef6f66a7c59bbbc1f3f45010b8da576bbe1cb9148274059a54bceab28a9f775f5c8cb41f030b435cd2e850814b12caab0d780e18829d5819169102f28ab2bf
 DIST flrig-1.3.19.tar.gz 617353 SHA256 4b697d6737b94b3e3cf1237283f23587ffaf6de848e8ea6f42985bca586692f0 SHA512 f4cc5df9d5dd0a6d5ad5574c0df08dc18ea409253216ba32306b226cf5cb76c956db715e711b612232b6a10d514e71f72f6a923c660da02e5a662a00a5434fda WHIRLPOOL a0596709f92ad39ca23a6809185a01a8e77e19f9c22e829b59d8ee3abf214a4dba5703c06db118b1304b95d079c119e4c5a6c57d5389d0f99efecf7b4234e9ac
 DIST flrig-1.3.21.tar.gz 621380 SHA256 d5d83832ab8e072962e01d90a66b609d93992a2a9266e9647adfbb35ef28dd91 SHA512 5f1d96ab2464089448c0dcdcb35134f7e26e2c17d9c63c19cd256650a34a16bff5e1b41913842bba7f8c7f320bdc9f15e9d48f1e721c3a2fd8b316ab6a91ca6d WHIRLPOOL b5079105b9b5796c07b57a160bb54125709feba02959232da8f82ca44a966be795d6cf48c872aedbc8720740e1b486e73a3bb4d4fe5bf82b42f66a7f9113dd11
+DIST flrig-1.3.22.tar.gz 613526 SHA256 be30ceaf06a64cc7db9f12f0a7d1da597a5569f248323f2dc2cd037fd1730908 SHA512 51525de330ead7dd5f79d447dc53c6710a99faa4550c06fe3a80e6e504f67bd0a40fbd4befb907ee8770d7a69831ab993f1553e9ecb44e96d8140cc8471b3235 WHIRLPOOL a3370812bd01ef93555b5084c1f177ed1e965642e10e027ef4b98305f9436c8483391a3f79f36b7a0fe2c8102fbb87215f86ba782d4dcab2e12313f7e5310b1b
diff --git a/media-radio/flrig/flrig-1.3.22.ebuild b/media-radio/flrig/flrig-1.3.22.ebuild
new file mode 100644
index 000000000000..3ca3b360d99b
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.22.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-radio/flrig/flrig-1.3.22.ebuild,v 1.1 2015/05/02 06:35:11 tomjbe Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="http://www.w1hkj.com/downloads/flrig/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	nonfatal dodoc AUTHORS ChangeLog README
+}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index a4605fa642cd..3854aeb78343 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,2 +1,3 @@
 DIST xlog-2.0.11.tar.gz 11395343 SHA256 a2381b6bbbf446d9bb95644d8394c5fe5fa43bbafe0c87ef65a0f6fbdafcb744 SHA512 15e91cc51af162d4def7e9ce29a3bde7af076ba875e939d3e908ac0fb39b8e0c30a1fdad6ec58d19a70947629684209038ddf83cf8316331f059fa3a3db5cc34 WHIRLPOOL e7dcaf548acf36e39400b3d039348a86cb30189cbc551158902728698b23a5db988c9fcf54ad847a2291e3062ec9cd963bd4281032653bf7f59f6494a2441579
 DIST xlog-2.0.12.tar.gz 11396005 SHA256 c5666c53e67b92b49bedb5ee1a629cf62d384033af6a912dff7726995775abd4 SHA512 34f590915b11e0aa24a23210f90f0bc7fb62874b46ab226e254e766b14965add58752a131c1a4b792e2447670059f92ef5d160fba8382fe757e31e8478902550 WHIRLPOOL e9b2561d23e9902de2753c4fd07eca98fa42bfe0d62ce1f7113f9056b5df801247be0b95665d1d85d8c3f7d05e606fc949df69bc72bfb8cfba43066d4de96c46
+DIST xlog-2.0.13.tar.gz 11427287 SHA256 d53d8538b9fc61e761d1bd84ad0c866cc9a50540b663521ebad49df479d798ab SHA512 304efc65c35890f2d988680de2a5f21d2e728882175f9a3abf72a749d9172833ac7b18cbd65d9e9c2c143ee27bea0476b12ff5eb760d8dcbb64800944ac89003 WHIRLPOOL 7e77e2db8cd8f373fe5f93f81d80b29fdfc4870eab24557a8aa1c940d67df80fc4751d409a2751a795c42a14edb0da30a39dc88af7771cc223f0bb408c15ef23
diff --git a/media-radio/xlog/xlog-2.0.13.ebuild b/media-radio/xlog/xlog-2.0.13.ebuild
new file mode 100644
index 000000000000..862b92fb4782
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.13.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/media-radio/xlog/xlog-2.0.13.ebuild,v 1.1 2015/05/02 06:54:36 tomjbe Exp $
+
+EAPI=4
+
+inherit autotools eutils fdo-mime toolchain-funcs
+MY_P=${P/_}
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="http://www.nongnu.org/xlog"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+
+	# Let portage handle updating mime/desktop databases,
+	epatch "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
+	# Drop -Werror
+	sed -i -e "s:-Werror::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update --disable-desktop-update \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
+	dodoc AUTHORS data/doc/THANKS NEWS README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/ardour/ardour-4.0-r1.ebuild b/media-sound/ardour/ardour-4.0-r1.ebuild
deleted file mode 100644
index 576df32416e3..000000000000
--- a/media-sound/ardour/ardour-4.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r1.ebuild,v 1.2 2015/04/24 07:16:52 nativemad Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=media-sound/jack-audio-connection-kit-0.120
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	append-flags "-lboost_system"
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--optimize \
-		--no-jack-metadata \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}
diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
index 224fe12e8523..a15c6650a6f7 100644
--- a/media-sound/ardour/ardour-4.0-r2.ebuild
+++ b/media-sound/ardour/ardour-4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r2.ebuild,v 1.1 2015/04/24 07:16:52 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r2.ebuild,v 1.2 2015/05/03 12:32:14 nativemad Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
-	nls? ( sys-devel/gettext )
+	sys-devel/gettext
 	doc? ( app-doc/doxygen[dot] )"
 	if ! [ ${PV} = 9999 ]; then
 		DEPEND="${DEPEND}"
@@ -119,9 +119,9 @@ src_configure() {
 		--configdir=/etc \
 		--optimize \
 		--no-jack-metadata \
+		--nls \
 		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
diff --git a/media-sound/ardour/ardour-4.0.ebuild b/media-sound/ardour/ardour-4.0.ebuild
deleted file mode 100644
index d19192a3c4f3..000000000000
--- a/media-sound/ardour/ardour-4.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0.ebuild,v 1.1 2015/04/22 13:42:22 nativemad Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=media-sound/jack-audio-connection-kit-0.120
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	append-flags "-lboost_system"
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
-	tc-export CC CXX
-	mkdir -p "${D}"
-	echo waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--optimize \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--optimize \
-		$(use jack || echo "--no-jack --libjack=weak --no-jack-metadata") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 23cea2a7920a..36b2bbf78599 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.17 2015/04/24 07:16:52 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.18 2015/05/03 12:32:14 nativemad Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack nls lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
 
 RDEPEND="media-libs/aubio
 	media-libs/liblo
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
-	nls? ( sys-devel/gettext )
+	sys-devel/gettext
 	doc? ( app-doc/doxygen[dot] )"
 	if ! [ ${PV} = 9999 ]; then
 		DEPEND="${DEPEND}"
@@ -118,10 +118,9 @@ src_configure() {
 		--prefix=/usr \
 		--configdir=/etc \
 		--optimize \
-		--no-jack-metadata \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
+		--nls \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
new file mode 100644
index 000000000000..8960b693051a
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.95-r3.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/media-tv/xawtv/xawtv-3.95-r3.ebuild,v 1.2 2015/05/02 15:51:10 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils font autotools flag-o-matic
+
+PATCHLEVEL="4"
+
+IUSE="aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext"
+
+MY_FONT=tv-fonts-1.1
+DESCRIPTION="Small suite of video4linux related software"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
+	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/jpeg:0
+	X? (
+		x11-libs/libFS
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXrender
+		xext? (
+			x11-libs/libXinerama
+			x11-libs/libXxf86dga
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm
+		)
+		x11-apps/xset
+		xv? ( x11-libs/libXv )
+	)
+	motif? ( >=x11-libs/motif-2.3:0
+		app-text/recode )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	dv? ( media-libs/libdv )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl )
+	quicktime? ( media-libs/libquicktime )
+	zvbi? ( media-libs/zvbi
+		media-libs/libpng:0 )"
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-apps/xset
+		x11-apps/bdftopcf
+		x11-proto/videoproto
+		xext? ( x11-proto/xineramaproto )
+	)"
+
+pkg_setup() {
+	if use X; then
+		font_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
+	fi
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
+	epatch "${FILESDIR}/${P}-pagemask-fix.patch"
+	epatch "${FILESDIR}/${P}-jpeg-7.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# It tries to include FSlib.h directly, but this seems to have moved.
+	use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts
+
+	econf \
+		$(use_with X x) \
+		$(use_enable xext xfree-ext) \
+		$(use_enable xv xvideo) \
+		$(use_enable dv)  \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable motif) \
+		$(use_enable quicktime) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable opengl gl) \
+		$(use_enable zvbi) \
+		$(use_enable aalib aa)
+}
+
+src_compile() {
+	emake verbose=yes
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		emake -j1 DISPLAY=
+	fi
+}
+
+src_install() {
+	make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die
+
+	# v4lctl is only installed automatically if the X USE flag is enabled
+	use X || \
+		dobin x11/v4lctl
+
+	dodoc Changes README* TODO "${FILESDIR}"/webcamrc
+	docinto cgi-bin
+	dodoc scripts/webcam.cgi
+
+	use X || \
+		rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \
+			"${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
+			"${D}"/usr/share/{man,man/es}/man1/rootv.1
+
+	use motif || \
+		rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1
+
+	use zvbi || \
+		rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \
+			"${D}"/usr/share/{man,man/es}/man1/scantv.1
+
+	use nls || \
+		rm -f "${D}"/usr/share/man/fr \
+			"${D}"/usr/share/man/es
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN}
+	mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN}
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		insinto /usr/share/fonts/xawtv
+		doins *.gz fonts.alias
+
+		font_xfont_config
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+		cd /usr/share/fonts/xawtv
+		mkfontdir
+		eend
+	fi
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index e6efa7458cbe..b2c312be3af3 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,7 +1,5 @@
 DIST mpv-0.3.10.tar.gz 2520710 SHA256 ec1d9751f9c43f66e13a988c94748ee2e1d8188498001f905213c9ccdf573fce SHA512 fdf84439747e24b4278f09427fc22d6497d2105cf94cd3c45dfb134af917f81c4748d618e962fb13a9db2b7a260a88a409590d10aae71ac987831bc3d293196e WHIRLPOOL d9a4eb6f01ee965b915e9064d75f710dd922a0db1e8a6b9655c844548bbde37c1cca1efd495c5d0f160b4b3823947c13e08e4634c6907fbd44abe758d0a6c552
-DIST mpv-0.3.11.tar.gz 2521150 SHA256 c686adb4820be32ff59bbcd64adaeebd2ac71cad762c50b6105f6e7424d72af2 SHA512 da4a55af98f178624ec66e48e314f045b61aef75fc9b654f39011879b0eb5b59a86870b9ed05bc11b831fbb5ec2084c5e842743d3040a155713a802908816374 WHIRLPOOL 18a6cd9436b3c2b5f18b95c974cbe79ff4c073b1d7403d35b77d091c18dcac9e17b03386a020e1c21db4727bfa3fa8e301f7f7dc3863cdf14fa4f9c653ab6952
-DIST mpv-0.7.3.tar.gz 2672554 SHA256 88dcdc44264a8e9b9b73a95d03137d51071aea8c269cc19146109bf8f917e8b1 SHA512 220bcfc6d506ada33a725395461d955d6851c4acf117a2b7ab093dd7ecde96bacc507a756388f29eeb7ba231c849b5580e9f4add9c6c080b075f732dc31ffcb3 WHIRLPOOL de9054d25b19e65710830895064fb4f14238d66f3c51a908026ce825acc35860451ece8696099d9194a562622f38bd69233b47338dc90bceb4f4e379f87633c1
 DIST mpv-0.8.3.tar.gz 2664730 SHA256 091038c802866848e3647f2a50215fa64ead0dc36f9114457db8b353528689cf SHA512 6b0e1f86032f4f594cee7af7ee7bd577821e948ace442987747a089d32374495abb5cf6bb88c4a1a63db8a36bb4182b30a728f976224263b6a9b4d51e62b1a40 WHIRLPOOL e6de6ff24a0e07cc1dc08f0de585aeb8ef44d1d01d729e088f7d9402b82b5e5318b958083781168ae3e7cc67fce13125d41d79fac997bff5d5888268a52480ba
+DIST mpv-0.9.1.tar.gz 2698031 SHA256 5d23688575d2cc4484f7feef628c690f68016e385622201894d02cb238ea179e SHA512 8abba7e3b2e9f2bf71edc0d772a1910b29f6acdd9c2d33de34ef4ee3fe4b57f3a145aff9dadfe9d9806059cc022fd19237a25e5a3976b8a7c01f8915f020c86b WHIRLPOOL ce35c41a3e2956ba43e8a906992c515722eb7708d7403741ab0099ce9110895b7b62e8b0952a0fbb6e2cc5cf3102ec93c8e2974f2fec6af06bf6bbd80f66dafc
 DIST waf-1.7.15 90909 SHA256 e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6 SHA512 5d6f75a7a81d369512c6bf70ae14c5275cfdc2b273a5801d7ee928a829ca472aac5ee9f9f2542af6369f34c1648dd12e42112efc29d602527b9ba58a311b4c17 WHIRLPOOL 84048737d1ba746454212e13696ba34d9fc722c74823f719503e29123e33869a49742fba02e24212e3f67e045c5499cf1893bbd191bf8df1dd5cae05a517a17c
-DIST waf-1.8.1 95817 SHA256 ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d SHA512 d204460b61a8d1af5634ccac486a6693ded0213c7db5ba96d133431f1655e4a1c289b3d0201c7ff785dc36bda4f50dcc56c35e3f06f3c53240683412bd96fcd9 WHIRLPOOL 00f989c82504f3fbb94802dc3bdb23a0b1f45826e0098f2726db066ed69cf12172e30fb1eb0cb21dc04cc1ba0785a5c7b2b992e105ce3b4120621568dbbaa101
 DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/mpv-0.3.11-r1.ebuild b/media-video/mpv/mpv-0.3.11-r1.ebuild
deleted file mode 100644
index d27022d2bb00..000000000000
--- a/media-video/mpv/mpv-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.3.11-r1.ebuild,v 1.2 2015/02/22 06:16:18 yngwin Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
-
-WAF_V="1.7.15"
-
-DESCRIPTION="Video player based on MPlayer/mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="https://waf.googlecode.com/files/waf-${WAF_V}"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick
-jpeg ladspa lcms +libass libav libcaca libguess lirc lua luajit +mpg123 -openal +opengl
-oss portaudio +postproc pulseaudio pvr +quvi -radio samba sdl selinux +shm v4l vaapi vcd vdpau
-vf-dlopen wayland +X xinerama +xscreensaver +xv"
-
-REQUIRED_USE="
-	dvdnav? ( dvd )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	radio? ( v4l || ( alsa oss ) )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND+="
-	libav? ( >=media-video/libav-9.10:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? ( >=media-video/ffmpeg-1.2.4:0=[encode?,threads,vaapi?,vdpau?] )
-	sys-libs/ncurses
-	sys-libs/zlib
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		opengl? ( virtual/opengl )
-		lcms? ( media-libs/lcms:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		dev-libs/libcdio
-		dev-libs/libcdio-paranoia
-	)
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		dvdnav? ( >=media-libs/libdvdnav-4.2.0 )
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
-	lua? (
-		!luajit? ( >=dev-lang/lua-5.1:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
-	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		libav? ( media-libs/libpostproc:0= )
-		!libav? ( >=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	quvi? (
-		>=media-libs/libquvi-0.4.1:=
-		libav? ( >=media-video/libav-9.10:0=[network] )
-		!libav? ( >=media-video/ffmpeg-1.2.4:0=[network] )
-	)
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl2[threads] )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? (
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/xcolor
-	)
-	X? (
-		x11-proto/videoproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
-
-pkg_setup() {
-	if use !libass; then
-		ewarn
-		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/libav or media-video/ffmpeg"
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
-	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-libav-9.patch"
-	epatch_user
-}
-
-src_configure() {
-	# keep build reproducible
-	# do not add -g to CFLAGS
-	# SDL output is fallback for platforms where nothing better is available
-	# media-sound/rsound is in pro-audio overlay only
-	waf-utils_src_configure \
-		--disable-build-date \
-		--disable-debug-build \
-		--disable-sdl \
-		$(use_enable sdl sdl2) \
-		--disable-rsound \
-		$(use_enable encode encoding) \
-		$(use_enable joystick) \
-		$(use_enable bluray libbluray) \
-		$(use_enable vcd) \
-		$(use_enable quvi libquvi) \
-		$(use_enable samba libsmbclient) \
-		$(use_enable lirc) \
-		$(use_enable lua) \
-		$(usex luajit '--lua=luajit' '') \
-		$(use_enable doc-pdf pdf-build) \
-		$(use_enable vf-dlopen vf-dlopen-filters) \
-		$(use_enable cdio cdda) \
-		$(use_enable dvd dvdread) \
-		$(use_enable dvdnav) \
-		$(use_enable enca) \
-		$(use_enable iconv) \
-		$(use_enable libass) \
-		$(use_enable libguess) \
-		$(use_enable dvb) \
-		$(use_enable pvr) \
-		$(use_enable v4l libv4l2) \
-		$(use_enable v4l tv) \
-		$(use_enable v4l tv-v4l2) \
-		$(use_enable radio) \
-		$(use_enable radio radio-capture) \
-		$(use_enable radio radio-v4l2) \
-		$(use_enable mpg123) \
-		$(use_enable jpeg) \
-		$(use_enable libcaca caca) \
-		$(use_enable postproc libpostproc) \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable ladspa) \
-		$(use_enable portaudio) \
-		$(use_enable bs2b libbs2b) \
-		$(use_enable openal) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable shm) \
-		$(use_enable X x11) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable wayland) \
-		$(use_enable xinerama) \
-		$(use_enable xv) \
-		$(use_enable opengl gl) \
-		$(use_enable lcms lcms2) \
-		$(use_enable xscreensaver xss) \
-		--confdir="${EPREFIX}"/etc/${PN} \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/mpv/mpv-0.8.3.ebuild b/media-video/mpv/mpv-0.8.3.ebuild
index 79de74c7b419..9a0bc9492d37 100644
--- a/media-video/mpv/mpv-0.8.3.ebuild
+++ b/media-video/mpv/mpv-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.3 2015/03/28 01:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.8.3.ebuild,v 1.4 2015/05/03 06:52:22 yngwin Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS+=( RELEASE_NOTES )
 fi
 
diff --git a/media-video/mpv/mpv-0.7.3.ebuild b/media-video/mpv/mpv-0.9.1.ebuild
similarity index 75%
rename from media-video/mpv/mpv-0.7.3.ebuild
rename to media-video/mpv/mpv-0.9.1.ebuild
index 73b9d27f2916..975803f3b7a0 100644
--- a/media-video/mpv/mpv-0.7.3.ebuild
+++ b/media-video/mpv/mpv-0.9.1.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.7.3.ebuild,v 1.5 2015/03/28 01:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0.9.1.ebuild,v 1.2 2015/05/03 08:29:53 jer Exp $
 
 EAPI=5
-EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE='threads(+)'
-
 inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-[[ ${PV} == *9999* ]] && inherit git-r3
 
-WAF_V="1.8.1"
+WAF_V="1.8.4"
 
-DESCRIPTION="Free, open source, and cross-platform media player (fork of MPlayer/mplayer2)"
+DESCRIPTION="Media player based on MPlayer and mplayer2"
 HOMEPAGE="http://mpv.io/"
 SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-[[ ${PV} == *9999* ]] || \
-SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DOCS=( README.md etc/example.conf etc/input.conf )
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	KEYWORDS="~hppa"
+else
+	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	DOCS+=( RELEASE_NOTES )
+fi
 
-LICENSE="GPL-2"
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
 IUSE="+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode
-+iconv jack joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv
-lirc lua luajit mpg123 openal +opengl oss portaudio postproc pulseaudio pvr
-samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
-+xv"
++iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit
+openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux
+v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
@@ -47,8 +51,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? ( >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
 	sys-libs/zlib
 	X? (
 		x11-libs/libX11
@@ -83,24 +87,18 @@ RDEPEND="
 	jpeg? ( virtual/jpeg:0 )
 	ladspa? ( media-libs/ladspa-sdk )
 	libass? (
-		>=media-libs/libass-0.9.10:=[enca?,fontconfig]
+		>=media-libs/libass-0.12.1:=[enca?,fontconfig]
 		virtual/ttf-fonts
 	)
 	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
 	libguess? ( >=app-i18n/libguess-1.0 )
-	lirc? ( app-misc/lirc )
 	lua? (
-		!luajit? ( >=dev-lang/lua-5.1:= )
+		!luajit? ( =dev-lang/lua-5.1*:= )
 		luajit? ( dev-lang/luajit:2 )
 	)
-	mpg123? ( >=media-sound/mpg123-1.14.0 )
 	openal? ( >=media-libs/openal-1.13 )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? (
-		libav? ( >=media-libs/libpostproc-10.20140517:0= )
-		!libav? ( >=media-video/ffmpeg-2.1.4:0= )
-	)
 	pulseaudio? ( media-sound/pulseaudio )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[threads] )
 	v4l? ( media-libs/libv4l )
@@ -125,14 +123,28 @@ DEPEND="${RDEPEND}
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mplayer )
 "
-DOCS=( Copyright README.md etc/example.conf etc/input.conf )
 
 pkg_setup() {
-	if use !libass; then
-		ewarn
+	if ! use libass; then
 		ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
 	fi
 
+	if use libav; then
+		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
+		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
+		einfo "provided by media-video/libav."
+	fi
+
+	if use openal; then
+		ewarn "You have enabled the openal audio output which is a fallback"
+		ewarn "and disabled by upstream."
+	fi
+
+	if use sdl; then
+		ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
+		ewarn "and are disabled by upstream."
+	fi
+
 	einfo "For additional format support you need to enable the support on your"
 	einfo "libavcodec/libavformat provider:"
 	einfo "    media-video/ffmpeg or media-video/libav"
@@ -140,18 +152,9 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-
+src_prepare() {
 	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
 	chmod 0755 "${S}"/waf || die
-}
-
-src_prepare() {
 	epatch_user
 }
 
@@ -165,6 +168,7 @@ src_configure() {
 		--disable-build-date	# keep build reproducible
 		--disable-optimize	# do not add '-O2' to CFLAGS
 		--disable-debug-build	# do not add '-g' to CFLAGS
+		--disable-test		# avoid dev-util/cmocka automagic
 		$(use_enable doc-pdf pdf-build)
 		$(use_enable vf-dlopen vf-dlopen-filters)
 		$(use_enable cli zsh-comp)
@@ -177,22 +181,19 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libass libass-osd)
 		$(use_enable encode encoding)
-		$(use_enable joystick)
-		$(use_enable lirc)
 		$(use_enable bluray libbluray)
 		$(use_enable dvd dvdread)
 		$(use_enable dvdnav)
 		$(use_enable cdio cdda)
 		$(use_enable enca)
-		$(use_enable mpg123)
 		$(use_enable ladspa)
+		$(use_enable rubberband)
 		$(use_enable bs2b libbs2b)
 		$(use_enable lcms lcms2)
 		--disable-vapoursynth	# vapoursynth is not packaged
 		--disable-vapoursynth-lazy
 		--enable-libavfilter
 		--enable-libavdevice
-		$(use_enable postproc libpostproc)
 		$(usex luajit '--lua=luajit' '')
 
 		# audio outputs
@@ -201,7 +202,6 @@ src_configure() {
 		$(use_enable oss oss-audio)
 		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
 		$(use_enable pulseaudio pulse)
-		$(use_enable portaudio)
 		$(use_enable jack)
 		$(use_enable openal)
 		$(use_enable alsa)
@@ -225,6 +225,8 @@ src_configure() {
 		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
 		$(use_enable libcaca caca)
 		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(use_enable raspberry-pi rpi-gles)
 
 		# hwaccels
 		$(use_enable vaapi vaapi-hwaccel)
@@ -235,7 +237,6 @@ src_configure() {
 		$(use_enable v4l tv-v4l2)
 		$(use_enable v4l libv4l2)
 		$(use_enable pvr)
-		$(use_enable dvb)
 		$(use_enable dvb dvbin)
 	)
 	waf-utils_src_configure "${mywafargs[@]}"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ff09f6d221e8..af786d148964 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 02 May 2015 06:36:57 +0000
+Sun, 03 May 2015 19:36:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ee58bc175654..506d738fe80c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 02 May 2015 06:36:58 +0000
+Sun, 03 May 2015 19:36:50 +0000
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.0-r3 b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
index 319cb1c87569..e8c007fe909f 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.0-r3
+++ b/metadata/md5-cache/app-accessibility/brltty-5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://mielke.cc/brltty/archive/brltty-5.0.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5fa532280c190fb351b84555d3e3d753
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2 b/metadata/md5-cache/app-accessibility/brltty-5.2
index 7a3bb23354aa..274d30894f07 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ece3953e8a210b823c05f895f38d8b34
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 b81c0f3b3dd4..750b369e0958 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 39a2d497bc08..3e3635f34dc6 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 173f4e350e8f..4e22e789d42e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5f2a9611bf20..fb99fcb0bf2a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 90b09a51505a..5ce138f0f11f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5048d44119bf049f103085c86621184
diff --git a/metadata/md5-cache/app-admin/cancd-0.1.0-r2 b/metadata/md5-cache/app-admin/cancd-0.1.0-r3
similarity index 84%
rename from metadata/md5-cache/app-admin/cancd-0.1.0-r2
rename to metadata/md5-cache/app-admin/cancd-0.1.0-r3
index 41d2b55dbada..dd723ff051ad 100644
--- a/metadata/md5-cache/app-admin/cancd-0.1.0-r2
+++ b/metadata/md5-cache/app-admin/cancd-0.1.0-r3
@@ -1,9 +1,10 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=install prepare
 DESCRIPTION=the CA NetConsole Daemon, a daemon to receive output from the Linux netconsole driver
+EAPI=5
 HOMEPAGE=http://oss.oracle.com/projects/cancd/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=03d8d0d5ed792d3b5852d271f0114dbf
+_md5_=67650565a1fa78496fa3807ffb17a782
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 939cf83137cc..bfe49cec038d 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12735c8c26829372c24c92b58250ed95
diff --git a/metadata/md5-cache/app-admin/fleet-0.9.1 b/metadata/md5-cache/app-admin/fleet-0.10.1
similarity index 79%
rename from metadata/md5-cache/app-admin/fleet-0.9.1
rename to metadata/md5-cache/app-admin/fleet-0.10.1
index 84a4e57cf03b..19cd11c729f7 100644
--- a/metadata/md5-cache/app-admin/fleet-0.9.1
+++ b/metadata/md5-cache/app-admin/fleet-0.10.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/coreos/fleet/archive/v0.9.1.tar.gz -> fleet-0.9.1.tar.gz
+SRC_URI=https://github.com/coreos/fleet/archive/v0.10.1.tar.gz -> fleet-0.10.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=5aed98107f0066a8e1a083dcb56e996d
+_md5_=c5b4f17bf38d495166d89dac054bfe83
diff --git a/metadata/md5-cache/app-admin/fleet-0.9.2 b/metadata/md5-cache/app-admin/fleet-0.9.2
deleted file mode 100644
index 115f0b26a89c..000000000000
--- a/metadata/md5-cache/app-admin/fleet-0.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.3 virtual/pkgconfig
-DESCRIPTION=A Distributed init System
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=doc examples
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/fleet/archive/v0.9.2.tar.gz -> fleet-0.9.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=11cffbb2822efc52887d6305b17976bd
diff --git a/metadata/md5-cache/app-admin/fleet-9999 b/metadata/md5-cache/app-admin/fleet-9999
index 6e8a5676494f..8de470303959 100644
--- a/metadata/md5-cache/app-admin/fleet-9999
+++ b/metadata/md5-cache/app-admin/fleet-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install test unpack
+DEFINED_PHASES=compile install postinst test unpack
 DEPEND=>=dev-lang/go-1.3 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=A Distributed init System
 EAPI=5
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ce3cd585ba46c852b0e67a03c3b75950
+_md5_=7bfe3d53deda9760871c2010d1be5fed
diff --git a/metadata/md5-cache/app-admin/mcollective-2.5.3 b/metadata/md5-cache/app-admin/mcollective-2.5.3
index 03c934ebc235..db83730fec66 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.5.3
+++ b/metadata/md5-cache/app-admin/mcollective-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://puppetlabs.com/downloads/mcollective/mcollective-2.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05847f702ccf509c52caf69eeae69d84
diff --git a/metadata/md5-cache/app-admin/mcollective-2.8.0 b/metadata/md5-cache/app-admin/mcollective-2.8.0
index b0637d453268..f88e40705f24 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.8.0
+++ b/metadata/md5-cache/app-admin/mcollective-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://puppetlabs.com/downloads/mcollective/mcollective-2.8.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7cd6e4cfcce7b46ca3296d83d60f47a1
diff --git a/metadata/md5-cache/app-admin/puppet-3.4.1 b/metadata/md5-cache/app-admin/puppet-3.4.1
index 0f060576e54d..69344a94ab6f 100644
--- a/metadata/md5-cache/app-admin/puppet-3.4.1
+++ b/metadata/md5-cache/app-admin/puppet-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/fa
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.4.1.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=cdb4a91af3f00d1de6bdcbb7bd9fe2be
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.3 b/metadata/md5-cache/app-admin/puppet-3.7.3
index dded67b2e5c9..f09340c090eb 100644
--- a/metadata/md5-cache/app-admin/puppet-3.7.3
+++ b/metadata/md5-cache/app-admin/puppet-3.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.7.3.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=723c4a98b0b9ce4d59ecb48ecc0c78b9
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.4 b/metadata/md5-cache/app-admin/puppet-3.7.4
index 98cd42470461..371d858c9656 100644
--- a/metadata/md5-cache/app-admin/puppet-3.7.4
+++ b/metadata/md5-cache/app-admin/puppet-3.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.7.4.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=10c44a0f9d15fa6fcae55a70d1af5bf3
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.4-r1 b/metadata/md5-cache/app-admin/puppet-3.7.4-r1
index c0989d0381ef..b2f0a77cc96c 100644
--- a/metadata/md5-cache/app-admin/puppet-3.7.4-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.7.4.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=167bca7bb13276a2eda0613b11bbb512
diff --git a/metadata/md5-cache/app-admin/puppet-4.0.0-r2 b/metadata/md5-cache/app-admin/puppet-4.0.0-r2
index 9879bd5832a8..fadc3bb020d1 100644
--- a/metadata/md5-cache/app-admin/puppet-4.0.0-r2
+++ b/metadata/md5-cache/app-admin/puppet-4.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.0.0.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	xemacs-elisp-common	81f5b5356f3397c277e83736c42256b5
 _md5_=4051a56e0440d3aa939296ed4cd1394a
diff --git a/metadata/md5-cache/app-admin/puppet-lint-0.3.2 b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
index 095dea292dbc..a181b874c73d 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-0.3.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-0.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=949b3efa071b3cca69f16df0422ab753
diff --git a/metadata/md5-cache/app-admin/puppet-lint-1.1.0 b/metadata/md5-cache/app-admin/puppet-lint-1.1.0
index efacb440f2f8..5dea4810192d 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-1.1.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ee685e62294696aeaceb06789261783
diff --git a/metadata/md5-cache/app-admin/r10k-1.1.3-r1 b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
index f8af28e8703b..9bbf9f601be2 100644
--- a/metadata/md5-cache/app-admin/r10k-1.1.3-r1
+++ b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce2dafca1d4b00cb1547f1d856bf994f
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r5 b/metadata/md5-cache/app-admin/setools-3.3.8-r5
index 14a0cac70302..3f9e3a97ff0c 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r5
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz http://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-03-gentoo-patches.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9cfd92cfa43129f98bdb33b21de5669
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r7 b/metadata/md5-cache/app-admin/setools-3.3.8-r7
index ee2b45eff3f2..71c03971e424 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r7
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 >=dev-db/sqlite-3.2:3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 http://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dcd51c9de03d9750e9c12e8f8e79b1fc
diff --git a/metadata/md5-cache/app-arch/cabextract-1.4 b/metadata/md5-cache/app-arch/cabextract-1.4
deleted file mode 100644
index 0796db662c83..000000000000
--- a/metadata/md5-cache/app-arch/cabextract-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Extracts files from Microsoft cabinet archive files
-EAPI=4
-HOMEPAGE=http://www.cabextract.org.uk/
-IUSE=extras
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~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=GPL-3
-RDEPEND=extras? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://www.cabextract.org.uk/cabextract-1.4.tar.gz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=2694c4fc0748b6121485109b3e7cb9c9
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 47c9747cc65d..56764a5ade4c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3bf3cff6357b..96c3bf9a7a66 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aff7e601abc6..5398d45f29b1 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.1.9-r1
 SLOT=0
 SRC_URI=http://joerghaeger.de/webCDwriter/download/webCDwriter-2.8.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 212f12678004..4410f66ea893 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d0834201c08c2dba01c19c1cbdd0653
diff --git a/metadata/md5-cache/app-crypt/pinentry-0.9.1 b/metadata/md5-cache/app-crypt/pinentry-0.9.1
new file mode 100644
index 000000000000..3645d9346259
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/pinentry-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] ) sys-devel/gettext gtk? ( virtual/pkgconfig ) qt4? ( virtual/pkgconfig ) ppc-aix? ( dev-libs/gnulib ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol
+EAPI=5
+HOMEPAGE=http://gnupg.org/aegypten2/index.html
+IUSE=clipboard gtk ncurses qt4 caps static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-pinentry caps? ( sys-libs/libcap ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
+REQUIRED_USE=|| ( ncurses gtk qt4 ) gtk? ( !static ) qt4? ( !static ) static? ( ncurses )
+SLOT=0
+SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.1.tar.bz2
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=f277afcdaedc6772b26b0dd554b74552
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1
index ded212e40e97..6b6453c89b97 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b941d6648809c92ed9a8e459c0004598
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
index 4dd43cf30f2c..7127fcf0d95a 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e7373230bf9761a48b95aa090750164
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index c72b7d2a0173..903e79dc8008 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eac72c9b3a179682f245ec7834fe2bed
diff --git a/metadata/md5-cache/app-editors/gvim-7.4.712 b/metadata/md5-cache/app-editors/gvim-7.4.712
new file mode 100644
index 000000000000..8b663a9d5747
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-7.4.712
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-7.4.712 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=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(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=5
+HOMEPAGE=http://www.vim.org/
+IUSE=acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl 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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-7.4.712 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=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(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.712.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_md5_=64b26b272ece1c54831af5d7664e4717
diff --git a/metadata/md5-cache/app-editors/jedit-5.0.0 b/metadata/md5-cache/app-editors/jedit-5.0.0
index 5990ba6c7771..9c12aa14e864 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cebb4891db71..1b2992c80b23 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5fbf29e7b64d..9cde6120957e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf39534838c41cacdbf438cc9db783d5
diff --git a/metadata/md5-cache/app-editors/vim-7.4.712 b/metadata/md5-cache/app-editors/vim-7.4.712
new file mode 100644
index 000000000000..97fdff2d7ea9
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-7.4.712
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.712 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=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(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=5
+HOMEPAGE=http://www.vim.org/
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.712 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=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(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.712.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_md5_=b7b826b6e76049cb0ed0e693780b6f6c
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index fc61e63510e5..db9e5ec54ff8 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -9,4 +9,4 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/li
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=d3a3022bf39ae8c9c8274c946b192778
+_md5_=5e4557fc374e444b1426c37b58a4d449
diff --git a/metadata/md5-cache/app-editors/vim-core-7.4.712 b/metadata/md5-cache/app-editors/vim-core-7.4.712
new file mode 100644
index 000000000000..ec664d615f20
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-7.4.712
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/autoconf
+DESCRIPTION=vim and gvim shared files
+EAPI=5
+HOMEPAGE=http://www.vim.org/
+IUSE=nls acl minimal
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+SLOT=0
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.712.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_md5_=864b9cbb408d04a563d5c006dc23ac11
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index e86eb89a6df8..b66baf54940b 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.1.9-r1 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ebf834dffab1dac91d41a5d7e347120
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.2.0_rc3 b/metadata/md5-cache/app-emulation/docker-compose-1.2.0-r1
similarity index 53%
rename from metadata/md5-cache/app-emulation/docker-compose-1.2.0_rc3
rename to metadata/md5-cache/app-emulation/docker-compose-1.2.0-r1
index db51aa4ff8da..95849cb54327 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.2.0_rc3
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.2.0-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dockerpty-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/dockerpty-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docker-py-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docker-py-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docopt-0.7[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/pyyaml-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.6[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/six-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websocket-client-0.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dockerpty-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/dockerpty-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docker-py-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docker-py-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docopt-0.7[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/pyyaml-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[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/six-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websocket-client-0.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[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=Multi-container orchestration for Docker
 EAPI=5
 HOMEPAGE=https://www.docker.com/
 IUSE=test python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dockerpty-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/dockerpty-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docker-py-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docker-py-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docopt-0.7[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/pyyaml-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.6[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/six-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websocket-client-0.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websocket-client-1.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(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dockerpty-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/dockerpty-0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docker-py-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docker-py-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/docopt-0.7[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/pyyaml-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[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/six-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/websocket-client-0.11.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.2.0rc3.tar.gz -> docker-compose-1.2.0_rc3.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=4a96d4868c531d2d1bbb81bf59774a99
+SRC_URI=mirror://pypi/d/docker-compose/docker-compose-1.2.0.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=5e3548d72faa77eb19e79131ec48f750
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.1 b/metadata/md5-cache/app-emulation/edumips64-1.1
index 08c60517360d..275e90464af0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 125ccb226bef..33c4c093d589 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4343aee969c3fd8e68accf82fcb134c
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2 b/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
index e96ccc1abcf1..31f90e3637ee 100644
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.14-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-lang/perl dev-perl/XML-XPath dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) virtual/pkgconfig app-text/xhtml1 dev-lang/perl dev-perl/XML-XPath dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
-IUSE=audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc systemd
+IUSE=audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen elibc_glibc systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt:0 >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lxc? ( !systemd? ( sys-power/pm-utils ) ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq[script] >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] firewalld? ( net-firewall/firewalld ) ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd ) virt-network? ( libvirtd ) firewalld? ( virt-network )
 SLOT=0/1.2.14
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.14.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bedf4cfe6b89576f5a5f111f1350ca21
+_md5_=85ffa8f355d5a65de09dd6addf02ffa3
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2 b/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2
index a6a01671b6f9..50d09213a1a5 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2
+++ b/metadata/md5-cache/app-emulation/vagrant-1.4.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.4.3.tar.gz -> vagrant-1.4.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3aca740e8ab33bcc67f583b1b659c3e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.18 b/metadata/md5-cache/app-emulation/virtualbox-4.3.18
index 189faf239b07..461adb3cf280 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.18
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.18 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.18/VirtualBox-4.3.18.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69adad3f0b67ab094a40640474866beb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.24 b/metadata/md5-cache/app-emulation/virtualbox-4.3.24
index a8b3e5d9a2cd..b1e7110f5e0b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.24
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.24
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.24 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.24/VirtualBox-4.3.24.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c087848220b3856ab6d5a18ca857b99
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.26 b/metadata/md5-cache/app-emulation/virtualbox-4.3.26
index 74a7ac567648..08b972e9ccff 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.26
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.26
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.26 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.26/VirtualBox-4.3.26.tar.bz2 http://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70fe9d51ad067f76d347ebe49b6c75eb
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-0.2_pre20150206 b/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
similarity index 55%
rename from metadata/md5-cache/app-eselect/eselect-rust-0.2_pre20150206
rename to metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
index daf43142790e..c8cccab5c2c0 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-0.2_pre20150206
+++ b/metadata/md5-cache/app-eselect/eselect-rust-0.3_pre20150428
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-SRC_URI=https://github.com/jauhien/eselect-rust/archive/0.2_pre20150206.tar.gz -> eselect-rust-0.2_pre20150206.tar.gz
-_md5_=8b95fb33cf3dc7c3e2d0f7c7740172b5
+SRC_URI=https://github.com/jauhien/eselect-rust/archive/0.3_pre20150428.tar.gz -> eselect-rust-0.3_pre20150428.tar.gz
+_md5_=44c3fe60bc42d0587e00e582f93082de
diff --git a/metadata/md5-cache/app-laptop/gkrellm-pmu-2.5 b/metadata/md5-cache/app-laptop/gkrellm-pmu-2.5
deleted file mode 100644
index 01c1750f129a..000000000000
--- a/metadata/md5-cache/app-laptop/gkrellm-pmu-2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 =app-admin/gkrellm-2* app-laptop/pbbuttonsd
-DESCRIPTION=GKrellM2 plugin for battery display on Apple machines
-EAPI=1
-HOMEPAGE=http://pbbuttons.sourceforge.net/projects/gkrellm-pmu/index.html
-KEYWORDS=-* ppc
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 =app-admin/gkrellm-2* app-laptop/pbbuttonsd
-SLOT=2
-SRC_URI=mirror://sourceforge/gkrellm-pmu/gkrellm-pmu-2.5.tar.gz
-_md5_=6f185affbdaea3b77f6bb7c509c7df2d
diff --git a/metadata/md5-cache/app-laptop/gtkpbbuttons-0.6.10 b/metadata/md5-cache/app-laptop/gtkpbbuttons-0.6.10
deleted file mode 100644
index de67ea2a4740..000000000000
--- a/metadata/md5-cache/app-laptop/gtkpbbuttons-0.6.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2 >=media-libs/audiofile-0.1.9 dev-libs/popt >=app-laptop/pbbuttonsd-0.7.9 gnome? ( gnome-base/libgnomeui )
-DESCRIPTION=On screen display client for pbbuttonsd
-EAPI=1
-HOMEPAGE=http://pbbuttons.sf.net
-IUSE=gnome
-KEYWORDS=ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=media-libs/audiofile-0.1.9 dev-libs/popt >=app-laptop/pbbuttonsd-0.7.9 gnome? ( gnome-base/libgnomeui )
-SLOT=0
-SRC_URI=mirror://sourceforge/pbbuttons/gtkpbbuttons-0.6.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=1cd673f2707a0ad3b714c63086f07143
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
index cf4c715ef8bd..5e0f6a7eec3d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c9bb1437895..92908f6ddc45 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d96c2371fcb9997997678bdfe4194106
diff --git a/metadata/md5-cache/app-misc/booh-0.9.4-r1 b/metadata/md5-cache/app-misc/booh-0.9.4-r1
index e584acc92805..3936da1f1810 100644
--- a/metadata/md5-cache/app-misc/booh-0.9.4-r1
+++ b/metadata/md5-cache/app-misc/booh-0.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/exiv2 gtk? ( >=x11-libs/gtk+-2.8:2 ) || ( media-gfx/imagemagic
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://booh.org/packages/booh-0.9.4.tar.bz2
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f159065c5fa5115030499a605cf23ef2
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 c668adaf41cc..647e23c63263 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a6d0a4659d6c..7bbdfb5b3796 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b488f184504..a1b3fd46d21e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e72896ab34f170e889d38395ee6b80f
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11 b/metadata/md5-cache/app-misc/hivex-1.3.11
index 36bd8ca70a2c..4e07173f1a31 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7959ceff479dd4a34f70ae0725bae10
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11-r1 b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
index efe0d384ef5b..0b1040165bd1 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2b1f86fbbbb338978bf481bd3630a66
diff --git a/metadata/md5-cache/app-misc/jdictionary-1.8-r2 b/metadata/md5-cache/app-misc/jdictionary-1.8-r2
index 0dc525d27ee7..a34cd01ef04a 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2f90e6614392..b0370505d6d5 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jdictionary/jdictionary-1_8.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2a75fbb1a0ae..1f47f4e24ec3 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0fd21320a07c..55c59b819557 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc57a57b04c5f0f13555838553788b9f
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.2 b/metadata/md5-cache/app-misc/tracker-1.0.2
deleted file mode 100644
index ccd9b6816c98..000000000000
--- a/metadata/md5-cache/app-misc/tracker-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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=A tagging metadata database, search tool and indexer
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.0.2 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.2.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=23da16213f4839c48bae8215a5de0636
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.6 b/metadata/md5-cache/app-misc/tracker-1.0.6
deleted file mode 100644
index de06dff1e25f..000000000000
--- a/metadata/md5-cache/app-misc/tracker-1.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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=A tagging metadata database, search tool and indexer
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.0.6 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
-REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
-SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.6.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=80d6a34cf88e2abf1a67fa75ff4d1447
diff --git a/metadata/md5-cache/app-misc/tracker-1.2.5 b/metadata/md5-cache/app-misc/tracker-1.2.5
index 8cf7188c9c29..a12f92cfbf68 100644
--- a/metadata/md5-cache/app-misc/tracker-1.2.5
+++ b/metadata/md5-cache/app-misc/tracker-1.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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 )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
@@ -7,9 +7,9 @@ IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gt
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.2.5 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.2/tracker-1.2.5.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=010326653ae33bbf23b6c753af53e2b6
+_md5_=fd0977e99e45769e11f4b00e34a226f6
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.5 b/metadata/md5-cache/app-misc/tracker-1.2.6
similarity index 71%
rename from metadata/md5-cache/app-misc/tracker-1.0.5
rename to metadata/md5-cache/app-misc/tracker-1.2.6
index a74788d19dfc..a7e0bfab540b 100644
--- a/metadata/md5-cache/app-misc/tracker-1.0.5
+++ b/metadata/md5-cache/app-misc/tracker-1.2.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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 )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.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=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.0.5 )
-RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
+PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.2.6 )
+RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.5:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.5.tar.xz
+SRC_URI=mirror://gnome/sources/tracker/1.2/tracker-1.2.6.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vala	a41415fe361172827ed11b6a32ee38fb	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=da46679ad12ef303b147c1a77eea4e59
+_md5_=96c445a916812fe3355cfed20dc1f4ea
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 51f0a54d752a..b54ef0471932 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f22edb8841d2..ba7985bcedca 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e993b473ba51..f3d4ef3c675c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a3a9edc4bbafd253b91db7b4392ac83
diff --git a/metadata/md5-cache/app-office/libreoffice-4.4.1.2 b/metadata/md5-cache/app-office/libreoffice-4.4.1.2
index 3ad6dc2e0cba..b0c1218c870b 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.4.1.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.1.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.4.1.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.1//libreoffice-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.1//libreoffice-help-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.1.2//libreoffice-4.4.1.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.1.2//libreoffice-help-4.4.1.2.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b2848fade1b1324d9f60ff905b814fb4
diff --git a/metadata/md5-cache/app-office/libreoffice-4.4.2.2 b/metadata/md5-cache/app-office/libreoffice-4.4.2.2
index 9fa6f95b02bd..243f1e75082f 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.4.2.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.2.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.4.2.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.2//libreoffice-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.2//libreoffice-help-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.2.2//libreoffice-4.4.2.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.2.2//libreoffice-help-4.4.2.2.tar.xz http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b403d284671510528f8e43b8c9c4a588
diff --git a/metadata/md5-cache/app-office/libreoffice-4.4.9999 b/metadata/md5-cache/app-office/libreoffice-4.4.9999
index 6b84ebcf0b62..14bcd51c702a 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d6f4fbf55a81b6152373ba9debdeffb3
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 128a079a46e7..a758fb126778 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) http://dev-www.libreoffice.org/src//d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz collada? ( http://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=55f830a7aaf52dc32523fbb79a5a6705
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2 b/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2
index 3689d61d17dd..e82a58a0379e 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-4.4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-4.4.1.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-4.4.1.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-4.4.1.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-4.4.1.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-4.4.1.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-4.4.1.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-4.4.1.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-4.4.1.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-4.4.1.2.xd3 ) ) ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2a7db4fb60c480bb9d9d91d655bd74f4
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
index 0b0eae4c1a25..7e1caa5baa60 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( ne
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75aebca19e5db57eb12090b967bddcd3
diff --git a/metadata/md5-cache/app-portage/layman-2.3.0 b/metadata/md5-cache/app-portage/layman-2.3.0
index 933811df1db5..0df58d9340e4 100644
--- a/metadata/md5-cache/app-portage/layman-2.3.0
+++ b/metadata/md5-cache/app-portage/layman-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to manage Gentoo overlays
 EAPI=5
 HOMEPAGE=http://layman.sourceforge.net
 IUSE=bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~x86
 LICENSE=GPL-2
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[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(-)] ) !sync-plugin-portage? ( sys-apps/portage[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(-)] ) gpg? ( dev-python/pyGPG ) >=dev-python/ssl-fetch-0.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(-)] 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(+)] ) python_targets_pypy? ( virtual/pypy:0=[xml(+)] ) >=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://sourceforge/layman/layman-2.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4564eac342a3b89aaac497165f068f47
+_md5_=24895b663e6ff03d33217689bc4d8553
diff --git a/metadata/md5-cache/app-text/calibre-2.21.0 b/metadata/md5-cache/app-text/calibre-2.21.0
deleted file mode 100644
index 79ebdd45e35e..000000000000
--- a/metadata/md5-cache/app-text/calibre-2.21.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] virtual/ttf-fonts x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) >=dev-python/setuptools-0.6_rc5 >=virtual/podofo-build-0.8.2
-DESCRIPTION=Ebook management application
-EAPI=5
-HOMEPAGE=http://calibre-ebook.com/
-IUSE=+udisks
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] virtual/ttf-fonts x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/2.21.0/calibre-2.21.0.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ae485046666916cbe4f7243287a2b376
diff --git a/metadata/md5-cache/app-text/calibre-2.25.0 b/metadata/md5-cache/app-text/calibre-2.27.0
similarity index 70%
rename from metadata/md5-cache/app-text/calibre-2.25.0
rename to metadata/md5-cache/app-text/calibre-2.27.0
index 102a698b354c..d6cc636659fe 100644
--- a/metadata/md5-cache/app-text/calibre-2.25.0
+++ b/metadata/md5-cache/app-text/calibre-2.27.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst prepare
-DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] virtual/ttf-fonts x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) >=dev-python/setuptools-0.6_rc5 >=virtual/podofo-build-0.8.2
+DEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) >=dev-python/setuptools-0.6_rc5 >=virtual/podofo-build-0.8.2
 DESCRIPTION=Ebook management application
 EAPI=5
 HOMEPAGE=http://calibre-ebook.com/
 IUSE=+udisks
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
-RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] virtual/ttf-fonts x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+RDEPEND=>=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= dev-libs/glib:2 >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)] >=dev-python/pygments-2.0.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-fonts/liberation-fonts >=media-gfx/imagemagick-6.5.9[jpeg,png] media-libs/fontconfig >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
 SLOT=0
-SRC_URI=http://sourceforge.net/projects/calibre/files/2.25.0/calibre-2.25.0.tar.xz
+SRC_URI=http://sourceforge.net/projects/calibre/files/2.27.0/calibre-2.27.0.tar.xz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=0731eabfc6fa7cfbb2f8847727d33133
+_md5_=d6551413c0cc263465ab95aa8d0d54e9
diff --git a/metadata/md5-cache/app-text/deplate-0.8.5 b/metadata/md5-cache/app-text/deplate-0.8.5
index 46ae50836b29..95b96b496ccd 100644
--- a/metadata/md5-cache/app-text/deplate-0.8.5
+++ b/metadata/md5-cache/app-text/deplate-0.8.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/deplate-0.8.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd5306a99ca3c216364bbb8bb9664b40
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r2 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r2
deleted file mode 100644
index a11b86ef062e..000000000000
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2* !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to convert docbook to man and info
-EAPI=4
-HOMEPAGE=http://docbook2x.sourceforge.net/
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=348847b4d79143391517e8475a3b2e77
diff --git a/metadata/md5-cache/app-text/docbook2X-0.8.8-r3 b/metadata/md5-cache/app-text/docbook2X-0.8.8-r3
deleted file mode 100644
index 466665cad8ae..000000000000
--- a/metadata/md5-cache/app-text/docbook2X-0.8.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2* !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to convert docbook to man and info
-EAPI=5
-HOMEPAGE=http://docbook2x.sourceforge.net/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=57e0c5f16bf8bfe94c5566cd5083c573
diff --git a/metadata/md5-cache/app-text/epubcheck-1.1 b/metadata/md5-cache/app-text/epubcheck-1.1
index 550485c400c1..f6a1ff887262 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb28736fe002941d248d8ee357d8912c
diff --git a/metadata/md5-cache/app-text/glark-1.10.4 b/metadata/md5-cache/app-text/glark-1.10.4
index 761bccfd8778..e700a5747428 100644
--- a/metadata/md5-cache/app-text/glark-1.10.4
+++ b/metadata/md5-cache/app-text/glark-1.10.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.4.tar.gz -> glark-git-1.10.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=237eb49de59b6582821c8fa57a045d85
diff --git a/metadata/md5-cache/app-text/glark-1.10.5 b/metadata/md5-cache/app-text/glark-1.10.5
index 57603be25ac6..415d2c866f4b 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5
+++ b/metadata/md5-cache/app-text/glark-1.10.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9813e83fcc8fdec515f6f7e0580b005f
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index 99ec74132105..7b37ee5488b3 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f3848ef1aeea02d1d8506a3936511ac
diff --git a/metadata/md5-cache/app-text/jabref-2.10 b/metadata/md5-cache/app-text/jabref-2.10
index 336689533c1f..829391c7eee9 100644
--- a/metadata/md5-cache/app-text/jabref-2.10
+++ b/metadata/md5-cache/app-text/jabref-2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d99f33444563ca65982e10caf94c3fd
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r1 b/metadata/md5-cache/app-text/jabref-2.10-r1
index 962057812d95..023079305ce7 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r1
+++ b/metadata/md5-cache/app-text/jabref-2.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64366369dc4dc820cd27f86d1ab545ef
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
index af61db96f5a6..f0783574fb5d 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:3 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 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7553463da5b6b9208e13c2c7ea90746
diff --git a/metadata/md5-cache/app-text/jabref-2.10_beta2 b/metadata/md5-cache/app-text/jabref-2.10_beta2
index 07ef5a35808d..8fed5db02947 100644
--- a/metadata/md5-cache/app-text/jabref-2.10_beta2
+++ b/metadata/md5-cache/app-text/jabref-2.10_beta2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10b2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15afa9be0940f4625986517c3741a9d4
diff --git a/metadata/md5-cache/app-text/jabref-2.10_beta3 b/metadata/md5-cache/app-text/jabref-2.10_beta3
index c78811c30aac..b27696d14f52 100644
--- a/metadata/md5-cache/app-text/jabref-2.10_beta3
+++ b/metadata/md5-cache/app-text/jabref-2.10_beta3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10b3-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b16ff23ac7e054e35f779491f19a6cd
diff --git a/metadata/md5-cache/app-text/jabref-2.6 b/metadata/md5-cache/app-text/jabref-2.6
index 2bba53f563f4..a94ebc2f1eee 100644
--- a/metadata/md5-cache/app-text/jabref-2.6
+++ b/metadata/md5-cache/app-text/jabref-2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/spin:0 || ( >=dev-java/glazedlists-1.7.0-r1:0 >=dev-java/glazedlists-1.7.0:0[java5] ) >=dev-java/antlr-2.7.3:0[java] >=dev-java/jgoodies-forms-1.1.0:0 dev-java/jgoodies-looks:2.0 >=dev-java/microba-0.4.3:0 dev-java/jempbox:0 dev-java/pdfbox:0 dev-java/commons-logging:0 dev-java/jpf:1.5 dev-java/jpfcodegen:0 mysql? ( dev-java/jdbc-mysql:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.6-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=63d6140eb30d9ead9f1633b66a25346b
diff --git a/metadata/md5-cache/app-text/jabref-2.9.2 b/metadata/md5-cache/app-text/jabref-2.9.2
index 43ab6d6d140a..9ee4a8447f38 100644
--- a/metadata/md5-cache/app-text/jabref-2.9.2
+++ b/metadata/md5-cache/app-text/jabref-2.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.9.2-src.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e4b1c7ab92e1eb6757419472f08780e
diff --git a/metadata/md5-cache/app-text/jing-20091111-r1 b/metadata/md5-cache/app-text/jing-20091111-r1
index b0c8419023db..d9ccf1321221 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 51a340179981..fff5d6e5d07e 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41b9a9e0d622c7f77f2f2a3126a6d2a6
diff --git a/metadata/md5-cache/app-text/jist-1.5.1 b/metadata/md5-cache/app-text/jist-1.5.1
index cf1f0fe50d94..0e875d4110f0 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1
+++ b/metadata/md5-cache/app-text/jist-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1663c9edf712434a8e1e10fa8e6e362
diff --git a/metadata/md5-cache/app-text/jmupdf-0.3.0 b/metadata/md5-cache/app-text/jmupdf-0.3.0
index 78b168c8a907..b77bba161518 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 db24a8061402..f92685729607 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0beee37b9cf98c56e99dfe142853c9ba
diff --git a/metadata/md5-cache/app-text/jmupdf-9999 b/metadata/md5-cache/app-text/jmupdf-9999
index 63744528e41e..240d6bb59128 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.1.9-r1
 REQUIRED_USE=!system-mupdf
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 180c45aca493..d6384ee8b6bd 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb224198e6d185da74dedc4e8bf72161
diff --git a/metadata/md5-cache/app-text/migemo-0.40_p2 b/metadata/md5-cache/app-text/migemo-0.40_p2
index 6c0900bf4fca..8f937fbe0741 100644
--- a/metadata/md5-cache/app-text/migemo-0.40_p2
+++ b/metadata/md5-cache/app-text/migemo-0.40_p2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ruby-romkan[ruby_targets_ruby19] dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/yshl/migemo-for-Ruby-1.9/archive/0.40p2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e14a843f5a626e84631d9583753b387
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r2 b/metadata/md5-cache/app-text/ronn-0.7.3-r2
index 8e1a2de8c526..f5a0c7f9821a 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r2
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d28d75b8063dd034f8d40e0aac235df
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index d3d1c9658292..3dd40c37500b 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e02781017c4973553f7b8607d02a99fe
diff --git a/metadata/md5-cache/app-text/trang-20091111 b/metadata/md5-cache/app-text/trang-20091111
index 46d8839086b3..e9b61f3ddc58 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9847e752364e..31c2058c9cfe 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69fc8bfdd0fe0f0b5da410ade08d058f
diff --git a/metadata/md5-cache/app-text/webgen-1.3.0 b/metadata/md5-cache/app-text/webgen-1.3.0
index 31a534b3d206..411f9d611625 100644
--- a/metadata/md5-cache/app-text/webgen-1.3.0
+++ b/metadata/md5-cache/app-text/webgen-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/cmdparse-2.0.0[ruby_targets_ruby19] de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webgen-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82d021cb034bfb430df434f65913d64d
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 4f824e0587d0..552cdc584a3a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f8fe5dbc0c44..0a005c160629 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8725d02f001b095066a7949a6cbedea1
diff --git a/metadata/md5-cache/app-vim/command-t-1.11.3 b/metadata/md5-cache/app-vim/command-t-1.11.3
index d64699a58c26..4d65ee69ba09 100644
--- a/metadata/md5-cache/app-vim/command-t-1.11.3
+++ b/metadata/md5-cache/app-vim/command-t-1.11.3
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.11.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.11.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=c31343b465553545b46fd2919ced97a1
diff --git a/metadata/md5-cache/app-vim/command-t-1.11.4 b/metadata/md5-cache/app-vim/command-t-1.11.4
index 5e1875b84ff3..bf8c438d7a63 100644
--- a/metadata/md5-cache/app-vim/command-t-1.11.4
+++ b/metadata/md5-cache/app-vim/command-t-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.11.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.11.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=fb6c1654584b2d20f67a0f531ba7a975
diff --git a/metadata/md5-cache/app-vim/command-t-1.9.1 b/metadata/md5-cache/app-vim/command-t-1.9.1
index 7b79c39542a4..ad93ee3ab0a6 100644
--- a/metadata/md5-cache/app-vim/command-t-1.9.1
+++ b/metadata/md5-cache/app-vim/command-t-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.9.1.tar.bz2 http://dev.gentoo.org/~radhermit/vim/command-t-1.9.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2	vim-plugin	286547e90fbbc4c841eee80cd73e646c
 _md5_=3d6640b4243a0c4090dd7ad6ef3fa03e
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index c5a712fb94f5..bfa76280a1cf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b44d9afc8304..8ff43e273148 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4d6798df2bce..4918f16ac026 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a607668d7401..f0e5d520c286 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c7ab88c675d4..2416ad515ca7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f84908462d36..ed1afb866d4c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cd11ac61ba01..042947830376 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 321a29c6fa0d..0ed8e526f470 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5f341aa35e6a..92718f6c0f8e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fbf151ae211e..1692e22b4fde 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ce0c28849af7..fb201e388ed8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f448683f64c852ef07506d8d6c7aca3
diff --git a/metadata/md5-cache/dev-db/jxtray-0.5-r4 b/metadata/md5-cache/dev-db/jxtray-0.5-r4
index 1eb8e75f1855..e5e8f5d324f7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8a27c5120685db11f299d9d1ea76a08
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.19 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.19
index 29c725266410..aec954a134c3 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.19
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.19
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.19.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.19.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.19.tar.gz mirror://gentoo/mysql-extras-20150210-1758Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150210-1758Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnuconfig	00a0530e40148c254cebb925df0e87ef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-v2	b1f8a94e028db243ff6a62a136e82512	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnuconfig	00a0530e40148c254cebb925df0e87ef	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-v2	b1f8a94e028db243ff6a62a136e82512	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=738b5cbfacb42ada80e92c3622808abb
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.8 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
index d737635bf1f3..c8b144261959 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.8.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.8.tar.gz mirror://gentoo/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150210-1758Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	13530f46a0963261ecce2a32978fdd21	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	13530f46a0963261ecce2a32978fdd21	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ded211f8c3bf19026b215fb420b0d6
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 5821c27a61fe..0d32b13be827 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b19c7b8c6e3..be7633850164 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65e944f4aa9e562a263a76c2b9847054
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index d5cff5d6823e..996255e18cd5 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=745d100c94fc544d35e4bf59df07b906
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 fd863304bfb8..87a397a8aa76 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 56de5dcb315a..117bc193dc86 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 105ecc439309..8984adb4c698 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3a29fb30543c..b007ef76d54a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1fb72183bb1f..61e3870f86d7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cab919d36bd5..865a05be12a9 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d73ee37c320b21e2dd260951de179a3
diff --git a/metadata/md5-cache/dev-games/crystalspace-2.0 b/metadata/md5-cache/dev-games/crystalspace-2.0
index 813be1214182..1b4d3d3cd3b9 100644
--- a/metadata/md5-cache/dev-games/crystalspace-2.0
+++ b/metadata/md5-cache/dev-games/crystalspace-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng:0 ) wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crystal/crystalspace-src-2.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=a9e203453adadff5cd9966659573367c
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0
deleted file mode 100644
index deab0b417622..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
-DEPEND=>=dev-lang/ghc-6.6 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.2
-DESCRIPTION=An automatic, specification based testing utility for Haskell programs
-HOMEPAGE=http://haskell.org/ghc/
-IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ~ppc sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6
-SLOT=1
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.1.0.0/QuickCheck-1.1.0.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6dc3f67304090a95594082504f188e70
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
index c9c89477e022..c146094c917e 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random >=dev-haskell/cabal-1.2 doc? ( de
 DESCRIPTION=Automatic testing of Haskell programs
 HOMEPAGE=http://www.math.chalmers.se/~rjmh/QuickCheck/
 IUSE=doc profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random
 SLOT=1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.1/QuickCheck-1.2.0.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e183ac28ee1cadb2622e4d3a9eb9e5bb
+_md5_=c826d5b13e1398eea5a616e0f2d60667
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1
similarity index 58%
rename from metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0
rename to metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1
index c9fcec449200..5bdd92b66a7c 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.0
+++ b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random:=[profile?] >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Automatic testing of Haskell programs
+EAPI=5
 HOMEPAGE=http://www.math.chalmers.se/~rjmh/QuickCheck/
 IUSE=doc profile
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random
+RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random:=[profile?]
 SLOT=1
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.0/QuickCheck-1.2.0.0.tar.gz
+SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.1/QuickCheck-1.2.0.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=065766d977516a79ee0956e5bad2297f
+_md5_=80ca5fe6a1b1c8fd84ca7ec3ca190e7b
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3 b/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3
deleted file mode 100644
index 40189b86f11a..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/cabal-1.2 dev-haskell/mtl doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-HOMEPAGE=http://www.cs.chalmers.se/~koen
-IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/cabal-1.2 dev-haskell/mtl
-SLOT=2
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.1.0.3/QuickCheck-2.1.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34b80de4f2763c41a3b0f26f6db1fac2
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1
deleted file mode 100644
index b3294812eb48..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-haskell/mtl dev-haskell/random >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=3
-HOMEPAGE=http://www.cse.chalmers.se/~koen
-IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-haskell/mtl dev-haskell/random >=dev-lang/ghc-6.8.2
-SLOT=2
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.1.1.1/QuickCheck-2.1.1.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5bf14e8e67f256cc03c9973423e94858
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1
deleted file mode 100644
index ce64db3a7a09..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=3
-HOMEPAGE=http://code.haskell.org/QuickCheck
-IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.1
-SLOT=2
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.1.1/QuickCheck-2.4.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7816988d4394b575cf74a3a575481630
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2
deleted file mode 100644
index 43e004831fd5..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=3
-HOMEPAGE=http://code.haskell.org/QuickCheck
-IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random
-SLOT=2
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.2/QuickCheck-2.4.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=daa67efb82eac8f21bc94fbe59b7f70c
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1 b/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1
deleted file mode 100644
index a2ea511c1f1c..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.4.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=3
-HOMEPAGE=http://code.haskell.org/QuickCheck
-IUSE=+template_haskell doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.1 dev-haskell/random
-SLOT=2
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.4.2/QuickCheck-2.4.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4ff514a0994bdeb09949684deb8e69e8
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1
deleted file mode 100644
index 6568e9ffdbec..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.5.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=5
-HOMEPAGE=http://code.haskell.org/QuickCheck
-IUSE=+template_haskell doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=2/2.5.1.1
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.5.1.1/QuickCheck-2.5.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=23c4193fe08994742a19eb823f98a2ee
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.7.5 b/metadata/md5-cache/dev-haskell/quickcheck-2.7.5
deleted file mode 100644
index db7d79850c4c..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.7.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=5
-HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=2/2.7.5
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.7.5/QuickCheck-2.7.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=856c7b64f6394dde7eef9fd037a7500a
diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta
index ac78d7038d3b..b24920d0d878 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0239aae6de2e..0eccd2f946cf 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b31820bb7d02..6cdcf2055ebe 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e01212de1092..7b4d71c13ee0 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 09dc59bf1ac3..f1cc6dd88437 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 753316e5d2ac..12d69260bbe6 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6765225319d0..cadf12ba5377 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c377aa0090b..dd3766c62cc4 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c5828e97030b..1e99e6c9bb6d 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d828d01f2d1e..9fb50a80ba3c 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2868b3baf452..1bd77492cab3 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 adf58da5216a..a698e6ff8823 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 14e81dde0cc3..97ef16d88d83 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a5d01d9b28d..5874306e0c30 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3cb88c6144ef..5585e3fb033f 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7a5358b5d9ff..6222c1c375d9 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.1.9-r1 ~dev-java/a
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 821896f6526d..a1f144f7f62c 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.1.9-r1 ~dev-java/a
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 79fedd208b41..3a4598e88cd0 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.1.9-r1 ~dev-java/a
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d4b7c43e8686..68bde3084c90 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.1.9-r1 ~dev-java/a
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 54d5cd220251..729fa143b7fe 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 609a2b90fdd7..66776d3fb216 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ec7f4a75a91f..44e2050f4820 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cf83c80e47e5..8f1ee5bf3752 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7e89dab25f3d..a1d4f2f6f909 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.1.9-r1 ~de
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5933e06a0d4..491b8b27d56c 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.1.9-r1 ~de
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4b02bca6a579..05123d02521e 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.1.9-r1 ~de
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8638209b098a..bcdccd3e1276 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.1.9-r1 ~de
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 39d1d08c28d6..9bd31024376c 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 00b9d3065756..e0ade85fcc36 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cd08aadda528..c8021ee67a5e 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29c047c6536f..04afe6471245 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1ea9bbaac1be..ae45d6cc4314 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.1.9-r1 ~dev-java/ant-core-1.8.2:
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 11d1a489ca9f..66d3213ad82b 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.1.9-r1 ~dev-java/ant-core-1.8.4:
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 52ec87edaca6..0fad57e11617 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.1.9-r1 ~dev-java/ant-core-1.9.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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3ef66fb3a0c6..a647186dcc55 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.1.9-r1 ~dev-java/ant-core-1.9.2:
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3c366ddde287..113459476e77 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cbe3fd3699ad..4d30d3b41457 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 011ce1ebbeec..36aed9960038 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b9a7284aba6c..05cc28cacf9b 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5e31a57be5a9..e533ac367ddb 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 42d1bfab0da0..caf34d061596 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1195a2b110ad..5e96bc9349bd 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1360cae8aba..6789db89971a 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 393d6a598988..b68f72f6354a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bbf4b9d1152d..95ef4c5fa32e 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 406145e02b1a..510cf320b070 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5b05af851c09..7d4fdf0fe59e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5491666f911..9846663e251a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fe56f0822dc4..afef0bca4447 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4255b46965a5..8f9a250cf23f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab9a3c7c044a..84756191957c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d8e7a70f9f8f..9e36d0aaeb57 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1e15a911a93f..ee74287dbc91 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fa60fd9b322f..f9c562c8e176 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 17737a8b643c..57f11ec55496 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/ant-tasks !dev-java/ant-optional >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78d7747368142d3de224a7a4dfe2db23
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.3.0-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.3.0-r1
index 1c35377aac4d..a8c8d359e1ff 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.3.0-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.3.0 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
 SLOT=3.3
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7c4de2c30e9503140bfcfe33aa4bbbd
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.4 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.4
index 4f497b263588..9fa1200f6ee7 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.4
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.4
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
 SLOT=3.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa2db68e5f19855f3797d8ca849af05d
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.5.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.5.2
index 508f7f4d2dde..1a5662df13e2 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.5.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.5.2
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.5.2 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9141b2cb761ad350ff7dce6b2586676f
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.6-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.6-r1
index 89b19adde962..7866f3c93398 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.6-r1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-3.6-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.6 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
 SLOT=3.6
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c22392e90d100c807fbb79cb39934eac
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 2f078d559b44..1a4afdc8e35a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 274b252f9f88..e85a6eb1723e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c747c46a81b9b8e2a5d1cb7b512b3cf
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 ef0dee690bb1..62d946db4042 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6d07717abcb2..f52e13de8caa 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 be878463f9b7..6eb40c6256fd 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c86569a97533..b4206f11a059 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1bb10457faf3..8490e7bbce9c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 07a1a28735c9..918891a4bc33 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5a6ecd13ab2..99117e43f96f 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2734ab5d5ff4..2da23b723608 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62319c9caf72..c27a8c070ccd 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6e895b5e1c92..4a268b34f0c0 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a495bc3be2c8..c9af38b621d1 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 926fbb81b0e1..6de317f09efa 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 eaa388aa2c5f..aaba4d0335e1 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dac247863035..4d0f96fe5f93 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9517cb9061a0..257a5ea173da 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab2f7f46196a..d93d1390ab26 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.1.9-r1 ~dev-java/an
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8729a0ea0de5..7bf028ab622e 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.1.9-r1 ~dev-java/an
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8566eae84aeb..399cdf155aeb 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.1.9-r1 ~dev-java/an
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fbaf74217e24..ac12cb671aa5 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.1.9-r1 ~dev-java/an
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d03ab13115f3..53330aa135df 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.1.9-r1 ~dev-java/ant-core-1.8.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d7af510af08e..882c8c033580 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.1.9-r1 ~dev-java/ant-core-1.8.4:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ee6d9ca30bb6..9d70917b94f3 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.1.9-r1 ~dev-java/ant-core-1.9.1:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8b4f6d767cad..1410ce4b71b4 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.1.9-r1 ~dev-java/ant-core-1.9.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f1c65cf6996f..ff67dbbded99 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1d8aaa5d32e0..8462e6acef7c 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e0cac0767a15..7a36b1fcc2ae 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fe33f650b181..693dd97b84f1 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b47dc552b576..e54c2d221428 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.1.9-r1 ~dev-java/ant-core-1.8.
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6c391be9e58e..902e4841ba81 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.1.9-r1 ~dev-java/ant-core-1.8.
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d2cc3c3c6114..433be12d8f99 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.1.9-r1 ~dev-java/ant-core-1.9.
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 218404741da9..a2ac74d361f4 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.1.9-r1 ~dev-java/ant-core-1.9.
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c5f960db565a..641abe4d6a00 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.1.9-
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 21ef1b1e9789..b54296721f11 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.1.9-
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 33d9bbe5aa80..af0a89b68754 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.1.9-
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77df8831de4a..999aa5c7c0f3 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.1.9-
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7b7c086e3eae..3b485c59fc0c 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 881bcac7240d..9d2a0dc0c85e 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 42a48fadf6c2..b9bb975abdd0 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5e7e7ca0caf0..a2ba5641824a 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c6c923db0970..3bd10feef8ee 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8d4a99b0cd55..3f1c907d04a7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e5ff027e66bd..a8b98b4e4d8e 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.1.9-r1 ~dev-java/ant-core-1.8.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a4c0050856d0..b158bdebebc8 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.1.9-r1 ~dev-java/ant-core-1.8.4:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4492310904df..76f1deea66a1 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.1.9-r1 ~dev-java/ant-core-1.9.1:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 552875fa0f1c..fcacc3e940e4 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.1.9-r1 ~dev-java/ant-core-1.9.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 423563c26fcd..50a2cca0de6f 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.1.9-r1 ~dev-java/ant-core-1.8.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 120102f9a577..a03f5a558f50 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.1.9-r1 ~dev-java/ant-core-1.8.4:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8f9d2c1c5c87..21c6c950ccc4 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 df657844ebef..ebfe457907ba 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 772d79aa8d4b..519b52d38bb5 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.1.9-r1 ~dev-java/ant-core-1.8.2:0 >=virtual/jre
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 574d1614593e..d7dc6d39fce8 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7b56e33441ac..e84f9a39b78c 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c95caa3ddf5b..efa6580bb177 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.1.9-r1 ~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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=ant-tasks	04c2320a11929b77cb8ac031fcfbf95a	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5eae1f2bae49..ebb0ff83bf46 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2e93ab778d88..9ed7c32d9a4c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bd5ed821d19b..8d0f96d81d55 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	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f44ffa95824bef08ba2c7603f0a2ee75
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 def54d68bf8b..012ce71fb3a0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c601bb0c8f0e..25cf4d295ce4 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.1.9-r1 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=40a2814838190fed5d74966c365e9dd3
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r1 b/metadata/md5-cache/dev-java/aopalliance-1.0-r1
index 270634ec8fb9..0635a919ef2c 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r1
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1095bf430020419227a23aebba3c8742
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index e35a696dca35..c3b6ac0e2c24 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=26475a6f7032fad111e86be52af86dcc
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r3 b/metadata/md5-cache/dev-java/appframework-1.03-r3
index a3cc18505f32..08ea29f1e464 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.1.9-r
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8ad18ef39e55..738108c10f74 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b0d987bedf58..666984bbb4cb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fdc59369d2c2..d16b5447ed17 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8c32b36c5a1eb50b99fe32c129648e6
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 352dabbd7331..a6a9ad5dc88a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 544c8f701543..025003d0e85c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1c5f3f3cc5b1..fa01a24b0d1f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7102f3aebca0..e887681d77b5 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a069796ca8b6..b31fd8fb6edb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 28baa414a1f9..abeb2dab9776 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9a0515a0be2389f6396eb11dcf9001c
diff --git a/metadata/md5-cache/dev-java/asm-3.0 b/metadata/md5-cache/dev-java/asm-3.0
index 0c1f3b506cb5..443f545e189e 100644
--- a/metadata/md5-cache/dev-java/asm-3.0
+++ b/metadata/md5-cache/dev-java/asm-3.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2a13efd8e616ff70e92b13a9e8748f9
diff --git a/metadata/md5-cache/dev-java/asm-3.1 b/metadata/md5-cache/dev-java/asm-3.1
index 2f0c4299a4c4..81870daaaa31 100644
--- a/metadata/md5-cache/dev-java/asm-3.1
+++ b/metadata/md5-cache/dev-java/asm-3.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip
 RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f20ed0c366daf9d9863dffea46b5dde
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1 b/metadata/md5-cache/dev-java/asm-3.3.1
index 663b2e2ba93b..2537a1549f18 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 46ac381f5d34..52a9bd77a6c6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f33947902196d8b0334877f1012a513
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index 4337eb784ad8..2f689dc15969 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b977ea8e4623..100587eb0e0f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aa8d0e729b6c..f3b8bd83bf47 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab3394c1004a..d308fcaa1a14 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ead638f06640..71adb7de7251 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 468617179b9e..07b5c18eccb9 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f806e8f4a3ee..49435356ab7f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 68fb0e3f63ad..d940b55edf79 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 067fd47c27c4..418433f5cad5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77bb82d89f93..1495f75ce24e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 86872d4d453d..980e41698a6c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f74d0133d7b..4df197fe830c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 366850474e09..8f43d482bdc5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4ee548b2aeaf..8672352d9490 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 88fd96053adc..9c8507d98d19 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33db3a0e94bc793a74c92b204c2db927
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r2 b/metadata/md5-cache/dev-java/bcel-5.2-r2
index 40e06397d18c..faf92f720912 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 91bfd9bdee0c..b5b5e25d8ad6 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 50040802e8db..98cd95db0005 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bff1fca2b641..51f3247e0217 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1cc730b2d5c..d835e06c21a5 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d32a775f84ebc06c2f2ca804f65451d3
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50 b/metadata/md5-cache/dev-java/bcpg-1.50
index a3f3e5281548..9454c6f769f4 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7dc4f6dd4a2e..deb364f77f6c 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=470251c94c7e1366e499505889994f29
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r2 b/metadata/md5-cache/dev-java/bcprov-1.38-r2
index f8e514dffbfd..566e5f93d6c2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 df299653f41e..9605d1d430bf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4d43c5d92d03..3f45f7909c72 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7b2224433340..6f882edcc07b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0d1d751ab27a..01eed5c31bc4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e83262412c75..3654a0cd7daa 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6465806eba9a..f44904e8d9c2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9a81c2c1a8ac..f2fe3d6b48fc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c7503d74d627..1d24f95dd621 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1594c2ca10c4ea0ccdd69dd5a7aa006
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45-r1 b/metadata/md5-cache/dev-java/bctsp-1.45-r1
index f0d11b0f7709..6008796e550c 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f1b7ec505f10..a7e4b37f6d26 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b0ac85e0e25c..907d7652fa1c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8db0c197b21b..9643533b7644 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c876812d459..87702d6da965 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6c3f55561abd..02a390378232 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 57d060cde207..3f6561e1b9fa 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 test? ( dev
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=348446703c6c08fee26a7a1b28afe529
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index f42eb1ca2b9c..ea5ce30b0dbc 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a1e7e91d1e89..4826abf6e198 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 82d8d6893cbc..dd63464a0e7b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 70b1508cd541..378467b443ac 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ef21e59cb2542d6e60e68a7315da8e3
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 32ffa041e3b2..8dd077200098 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c63b89be46d0..021c7a1936cf 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2c64374f5718..f45501b66eac 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61ac948f9a8fb70a2159c9bcbb281685
diff --git a/metadata/md5-cache/dev-java/bytecode-20081007 b/metadata/md5-cache/dev-java/bytecode-20081007
index c827c678b614..7f1d6989db1c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9916f53be5fe..67646a694c68 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a567250fbf86..4cbf81141bbf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9b3ca5e717d2..dbbf7a51092c 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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 40c97557b9c7..54cb29faf780 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8003172fdab1d5663842b3f68de8d8fd
diff --git a/metadata/md5-cache/dev-java/castor-0.9.9.1-r6 b/metadata/md5-cache/dev-java/castor-0.9.9.1-r6
index 88125498cdc5..e5c528d5d145 100644
--- a/metadata/md5-cache/dev-java/castor-0.9.9.1-r6
+++ b/metadata/md5-cache/dev-java/castor-0.9.9.1-r6
@@ -9,5 +9,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.5 >=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:2 java-virtuals/transaction-api >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11759bb61ca0b6a658d2cfba730ddb66
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 da35c5509f8d..18ca3daebe54 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eae099b02fa5fcd57734bad4da54bae6
diff --git a/metadata/md5-cache/dev-java/castor-1.1.1-r2 b/metadata/md5-cache/dev-java/castor-1.1.1-r2
index 54ee63ab28bd..deda3b516040 100644
--- a/metadata/md5-cache/dev-java/castor-1.1.1-r2
+++ b/metadata/md5-cache/dev-java/castor-1.1.1-r2
@@ -8,5 +8,5 @@ LICENSE=Exolab
 RDEPEND=>=virtual/jre-1.4 =dev-java/cglib-2.1* 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cddb6f5ad428d1e4b5f7367fc6833781
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 a71cd477cbea..81f7bd0beffc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ced36d96f025b1c9c5fcc79d39c4c36
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 026584896954..bd5dad49b6e5 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2cdeb1d55b20..243a7cfb9594 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af94e2333aff04ba50bd500c9e7a1f8c
diff --git a/metadata/md5-cache/dev-java/cglib-2.0.2-r2 b/metadata/md5-cache/dev-java/cglib-2.0.2-r2
index 903123e5921b..16fcecee089e 100644
--- a/metadata/md5-cache/dev-java/cglib-2.0.2-r2
+++ b/metadata/md5-cache/dev-java/cglib-2.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/asm-1.4.3* =dev-java/aspectwerkz-2* dev-java
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://sourceforge/cglib/cglib-src-2.0.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c5eeda52cd5fdc6c9de0bf78eda53c5f
diff --git a/metadata/md5-cache/dev-java/cglib-2.1.3 b/metadata/md5-cache/dev-java/cglib-2.1.3
index 6bb4723e7836..afa537106233 100644
--- a/metadata/md5-cache/dev-java/cglib-2.1.3
+++ b/metadata/md5-cache/dev-java/cglib-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/asm:1.5 dev-java/aspectwerkz:2 dev-java/ant-c
 RESTRICT=test
 SLOT=2.1
 SRC_URI=mirror://sourceforge/cglib/cglib-src-2.1_3.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=37e4f9b798541b95f645afa8e71c331b
diff --git a/metadata/md5-cache/dev-java/cglib-2.2 b/metadata/md5-cache/dev-java/cglib-2.2
index 79bdd9f3247a..e1401cf3f932 100644
--- a/metadata/md5-cache/dev-java/cglib-2.2
+++ b/metadata/md5-cache/dev-java/cglib-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/asm:3 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://sourceforge/cglib/cglib-src-2.2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2206f923afe3a6b6cd5792c37a8cbde
diff --git a/metadata/md5-cache/dev-java/cglib-2.2.3 b/metadata/md5-cache/dev-java/cglib-2.2.3
index 46939e532746..bcce80c55952 100644
--- a/metadata/md5-cache/dev-java/cglib-2.2.3
+++ b/metadata/md5-cache/dev-java/cglib-2.2.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/asm:3 >=dev-java/ant-core-1.7.0:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://sourceforge/cglib/cglib.2.2.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6938db511774c340032e88d6068b8d85
diff --git a/metadata/md5-cache/dev-java/cglib-3.0 b/metadata/md5-cache/dev-java/cglib-3.0
index f4bfc0459a74..606788192403 100644
--- a/metadata/md5-cache/dev-java/cglib-3.0
+++ b/metadata/md5-cache/dev-java/cglib-3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=22a4dfc8a12200027496541593a2c1aa
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index 1b6486846e16..38f943381ec5 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-1.7.0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc2ba03250d147d5acc7ccf3c20d2c2a
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 383ba116de25..c32b9fcbaf9a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dea7d0145827..bfd99543f6fe 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00f5fd93cdb9bf8d8be40b2938c489a5
diff --git a/metadata/md5-cache/dev-java/classworlds-1.0-r3 b/metadata/md5-cache/dev-java/classworlds-1.0-r3
index 9b9760e5e212..b686c9d025cd 100644
--- a/metadata/md5-cache/dev-java/classworlds-1.0-r3
+++ b/metadata/md5-cache/dev-java/classworlds-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 >=dev-java/java-config-2.1.9-r1 >=sy
 RESTRICT=test
 SLOT=1
 SRC_URI=http://dist.codehaus.org/classworlds/distributions/classworlds-1.0-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b52238ab460876f49e8cee8170d73c3
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1 b/metadata/md5-cache/dev-java/cldc-api-1.1
index ce8982d4942f..976257c9953a 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.1.9-r1
 SLOT=1.1
 SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7da2b6e1ff86..81fbe664141a 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e305d0e21aba53672d816fae4e22de35
diff --git a/metadata/md5-cache/dev-java/cocoon-2.1.11 b/metadata/md5-cache/dev-java/cocoon-2.1.11
index 650c72742dcc..0da9d3c1c11c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 68ce79fbc3e5..0ceac6a64597 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0b8085aca811..a100579f3458 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ca53089c0f66..0a6ab6381223 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f4a7a7b8234e..9ba9fbe399ef 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4e69b15491b7..935e17177df5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a3da5c02784a..5d4a37d2d143 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db439895b8f13c282774ddb645b023b9
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 e44cde78cdcb..8e2f99d8b7c0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 90be0af298f3..6fc16ef66d85 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 67cd4831f1e1..4f663b1c297e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 58140b2b6d3b..a91706e1eff9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4bec21583389..2a0bae6615ba 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b1136bce1f7a..1ab7e6e55af9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5aee29289e5f..128abf2404cd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5f8483faf9f5..1e0764a908e9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 476a7b67989b..4cfcbc4bcd7d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3272ab1230d9..726a0830ca97 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f85cedc08bc5092d0adb07bea0569fdf
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6 b/metadata/md5-cache/dev-java/commons-configuration-1.6
index c3dcf4410450..062479f0eacd 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64d78c41932069e2e2c1428db0a0579f
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 f32db3ac0b8b..61531f33b145 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f963a0682d3d..e93e59dd1d9a 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.7-src.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5c9dd0276b15..554d06e4419d 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f249bbf4a3a0..c709bec74167 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 def36aff89c0..10aeeb1b9ee0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bbc7dcbf8768..da47267f348f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fd643c5823d3..59062b67a1d7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29469f65651d..7fdebeb6f78e 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76921261e591e77a893d198675df9b82
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2 b/metadata/md5-cache/dev-java/commons-digester-3.2
index 7f1d8746de90..fdeae4245d89 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-logg
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ddd0d28d0ca2958d8f653a9cb1ca286
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 bdedfa9a3629..c511fab82557 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58e3405b2aee03fc3c67fce6cba371c9
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.4 b/metadata/md5-cache/dev-java/commons-discovery-0.4
index 421793a417f6..ee45d99bab65 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 efa277720c79..918c94137ffa 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 13e1aa9de331..c83d1f96ae9c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8d6c0c8aa0cb..12c2617d7316 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9adf95a24f5b..7876ed69380b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 22b8da496f8c..7438bb9a89e4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e70217237bf9..18cc63c86144 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 395e05f72c3f..996d70be78ef 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.1.9-
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fedb05af7faf..536e1a371fcb 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=77d0124614843c9cd29a9af0503df53f
diff --git a/metadata/md5-cache/dev-java/commons-io-1.4 b/metadata/md5-cache/dev-java/commons-io-1.4
index df55da2ae8c2..6e7a8a09d6ed 100644
--- a/metadata/md5-cache/dev-java/commons-io-1.4
+++ b/metadata/md5-cache/dev-java/commons-io-1.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-1.4-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7796e7897990c4768d11861dd588ba8
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 5b928aac2a4e..99088812a742 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 45d3250602e4..e7359009c818 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae46da770c945a8fd0042edccda0dbc5
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r4 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r4
index 99336cec0f30..43b1b00758a5 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r4
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-discovery:0 dev-java/forehead:0 dev-java/jakarta-jstl:0 dev-java/commons-jexl:1.0 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/jaxen:1.1 >=dev-java/xerces-2.7:2 dev-java/junit:0 dev-java/commons-logging:0 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=219378d517c5c2aeb0e661cc693dee06
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 14e5d395d95f..7a36c074fce3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8fa1484a3653632e64a94907988a987
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1 b/metadata/md5-cache/dev-java/commons-jexl-1.1
index 9a1634a5a81e..b7267f8bb8de 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62fb6a6cbb92..a4280f7e1ab5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7f69a522996e..b013ce6c0132 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=652ea0d185a188a87db8441cb1af2705
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 cc646643a944..14babfcaf6b1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4ff3945f525a..5f2564964f51 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 01ca1915107e..cce663ede225 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2513d8c07325..9b8eb3bb2203 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f32860291004..df476b2669c4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2a50732d7e49..1bf5f66021d0 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f587a0c891b7..a9d593989e4e 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b27a68d3eea7..ad54abf66d54 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ba3b34c12ebe..205f10de3b12 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 11357ad35dcf..d628288d760f 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9428f44238f5..f350f38b9c06 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 03eaeccfa02c..dd3b7282d218 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8a94590cccc8..d9ac0cec06ea 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9b55faec6daa..52c3d5325b95 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2d6e0c6155b9..2d0e80c5f0a0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 928022f82420..a1a46ff3ed3c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0df52473dfa3..c7c70f68a5ed 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f206d8caebd1..82deb518d6e4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ba3ca7101202..b8b84423e34d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3c2a5c80d494..262438a62221 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 36bab9c68dc6..fcb3d8962609 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ee4b4848646d..fb331e6984c4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 87f6715b60f5..72a7b0b6d509 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 96751114682d..37e44a8f6291 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7a80797320b5..19fc165ee57a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 038a4fc774b3..574be83ebd58 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6be4136e1503..3e4714ff42f4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fac855332a20..f8246ca17c23 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-1.3 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.14-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28b0cab2dcc1858202e83d26fe2148cd
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index b98312297747..ff4a5ee5146a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cd067805919d..31f0803ef0f1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2af2e66f060a..66eee1c86102 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f671b8e57681..e8a2d4573b1c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 79cb014a3bee..b2a20f627a38 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5e3044372ced..e38a3ecdcb5b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 082c48622504..a9f1fbef3665 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e7f7946c77e2..d7cce4734382 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=562f062f1231c0729cf3566168e1a0cd
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r3 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r3
index 144d26ebf1bc..495e27525c9b 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r3
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r3
@@ -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.1.9-r1 >=sys-apps/portage-2.1.2.7 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa6c58128f940484f80902f7943b92da
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 8574d6530025..102fdc5d7bf2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=758ed6a9e20957eeb6428bec9540d930
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 7ce77d8c60e8..3d235215d6b4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aac72d1b398e..3a25b8029526 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e9a4ea8f7d8e..ebd6705c66ef 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 da0e5150634b..1e69ee70dc4d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d9893b9e6d2e..ea3030acdf3a 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.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:2.2 >=dev-java/java-config-2.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f42fe04404027575b72081f534aa4223
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1 b/metadata/md5-cache/dev-java/easymock-3.3.1
index 636cc1113c55..5b196ee78242 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a3e510a0dc6..71f85b3e1bfe 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a23e1286e931..ce97219342d4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b8a8997bc168..f2fbd914b3c4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e0a5ef595752..7dee898c0383 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6628624be15a..bb42d62f0486 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8d764a4e5e56..b4e02ca616a9 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a2986c32a700..7723def97336 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11308a8026cd5771f765519c76719adc
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r3 b/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r3
index 21a8e542cef1..5b660243c085 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r3
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r3
@@ -8,5 +8,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 app-eselect/eselect-ecj >=dev-java/java-config-2.1.9-r1
 SLOT=3.3
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d40fa470ecf921e51f7ea7494c90d9ba
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r4 b/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r4
index 4311cb0e8aa7..d88ba7eb6a32 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r4
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.3.0-r4
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 || ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=dev-java/java-config-2.1.9-r1
 SLOT=3.3
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e1625e045d986d543eb175101f626fd
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r4 b/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r4
index 38e19f66e536..6101c17888af 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r4
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r4
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=app-eselect/eselect-ecj-0.3 !java6? ( >=virtual/jre-1.4 ) java6? ( >=virtual/jre-1.6 ) >=dev-java/java-config-2.1.9-r1
 SLOT=3.4
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65e9e81b5665669f0e4e0d354047aaa8
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r5 b/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r5
index ec4b16423d48..ab0b98bb7054 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r5
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.4-r5
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) !java6? ( >=virtual/jre-1.4 ) java6? ( >=virtual/jre-1.6 ) >=dev-java/java-config-2.1.9-r1
 SLOT=3.4
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fdc2d625bb3d6ee7db2a870044071ea6
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2 b/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2
index 56887596f103..1809b07a11f8 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.5.2 )
 RDEPEND=>=app-eselect/eselect-ecj-0.3 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=3.5
 SRC_URI=http://archive.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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7227ad3a716791a8eec6686d50b658cb
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2-r1
index 1e0be0318838..8b8865e5fe64 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.5.2-r1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.5.2 )
 RDEPEND=|| ( app-eselect/eselect-java app-eselect/eselect-ecj ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=3.5
 SRC_URI=http://archive.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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fafbedd8745e72994875c72f8c01a9db
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-3.6-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-3.6-r1
index 1b51e030a536..3aa817cfcf6e 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-3.6-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-3.6-r1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-3.6 )
 RDEPEND=|| ( app-eselect/eselect-java >=app-eselect/eselect-ecj-0.3 ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=3.6
 SRC_URI=http://archive.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd49d63e9e485b30798edd49abd80332
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 d21ec916bb95..5333e07c42e2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 abb8910db4fe..a07a7d1f72dd 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27b12276c2970c4cde2e29cdb778ccf8
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 431c121454b7..881dd62225c2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ef7be2c473fb..fb4d07c1e160 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 839ef9dba45e..cefa137e5774 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 66c97101b29a..8e88803e78ee 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 167175df7b85..cd387879c449 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e27a511578e7..632bbd888ed1 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bb4d6d476b13..5f370335f511 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 23123373c1ea..82a7092d400e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a79feefd0ee4..9db2333b56d6 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 621f84b3ad4c..2e338b7f2ca7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dba5f50a7b4f..9a63b30a0617 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc42b7eb539bebf19a7ea9955b822bc7
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 177a010aef38..9f8d3ab9df0e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 654e100791a2..d16d2e65f5a4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 eba174cd4338..e522e738b063 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ee2737ca3ce5..4f9dc978d679 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3f4e89dd4721..2cd89b9cb9fd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6b6e195d6504..07d74f9da49f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9ae7d601bec7..1ae9a5c5776c 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 33b02d1c95ee..2c74bae0b2e5 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.1.9-r1 source? ( app-arch/zip )
 SLOT=4.3
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c8937671f4bf..3b7bac77d9d3 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.1.9-r1 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-4.4.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0a7fbb27f395..00562a39df65 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d00ad9ac9320..9eadc034612b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 71c89524dfef..2d48161e5802 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/fec-1.0.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 56fc5dceda9e..52fd9ffb8e08 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5e946b5f7e2..2db6a6ce1ebc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5780cfc6deb..e501e01fd017 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fd72c1ecbc36..18acee99aa03 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aa8c0ca50135..daff52596dae 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 da7a19716632..ae45ca8a199e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 551096cd5e46..6929a4a48863 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7743b3fc3b7c..ae7c0bdd50e4 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 73ebab672ed5..826ad6539dfc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 be4dd7061cae..0fbc0c79f529 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6cdded2f6e63..0d7438f5fc0a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 55cc1877b30b..5a16385982a6 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5bcdfe9b3d5c..e1f75973194e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 755c9fb64a0b..fcbb6820031d 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5d65745b5eaa..ee547a0980bd 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f0256686d7a5..103ea511583f 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77dee41c096a..6e8ef100dce3 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77739f14b0e6..556b7b39699d 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e9b034a95302..703ff5e7f362 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 27ecb08f3e59..be4906ca22ef 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7f53df2de898..7c8be22b94d9 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b1d8712d2037..4e54e043fdda 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5e30f425237b..c39e4770eeb0 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4f4c6cf68cd2..b68378ec7a0e 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 076b9c3f502a..c883c6baf254 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ac4bd105ad56..960701de2e93 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5db0246be9bd..1ab5fba980cd 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a49d7353887..eb2f5a66063b 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ba8d9566a4b2..01416e7588a8 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5fdfe6d3bef6..7d7a31fc5025 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 737de207dfe8..221a0adf171d 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ea149f3cbd22..49abf8a1a228 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c9eb4dbedd22..4c23ed1d1c6a 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1edd7ba468ea..1bccf74b0a2f 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 de96f7b92cf3..378fdb4569b4 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 83334367749d..275bf57df88e 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ee25606a6ba8..97877e00e87a 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-mvn-src	8f34189713bfd1a69e8ead66bedff242	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c40e1862ae9..08c57e1661c9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b47c8e701b03..3d2be60669d1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bbbc60edea33..d4a0808ed14a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3733b1fc4413..c60f53d0f9a5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e55fef6fe55c..f9a64282ba1a 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6722ca23240a..b61406ce83d7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 64a3b593814d..5e04684f8574 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e8e6eaa7c5fe..0c4fdf574899 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88d528586b3456fbfcb0c50826b1e75d
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 3a0e8ddc3d21..33730e23efa6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f1d4b0088f09acade381e29de020d2d
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 fc3b83734a24..eeb9252e9811 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5b28c11a4ee4..05fb074b31cc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b31bade8912d..1788827a6edc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5436f879868..7aeafbff1635 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 016b8d7a8045..12ad4e720d21 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79cf3a662f379f527876e0e7644b811f
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 a77665139682..899a32f6c350 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a78c0b56951a..79e2b5baf200 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ecf84799f5654b05397bc3ba2e5e0ce
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 7beaa831d354..de0e96c33392 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.1.9-r1
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9d510e33360f..627fd93e2aa0 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.1.9-r1
 SLOT=1.0
 SRC_URI=mirror://gnu/classpath/inetlib-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8d1b73be0b70..7e0bfa5bccb7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e838fd453579..e4d1572954a5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 74c6926166b4..6b80076af237 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8e6218ecd3b7..f3eecf0e4381 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 10f8ba8ba950..92e62f188fdf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0e2f696e0a60..18d8e1d6784c 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.1.9-r1
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/mail-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0b3c0eec2831..9bc73736b1b2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a2281355add4..7a5b0b4f2b21 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 65a91709b006..ea66a3d03224 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 86e1fac9d4ec..24a1c49f3472 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 558b13e8a0a5..a249f4ae46ab 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5290a0095d6..692c4cb5cbc6 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2a6847de6cdd..0ca10d3f6f6a 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b328d2098a8a86fa6e14301e1d9fdfda
diff --git a/metadata/md5-cache/dev-java/guava-07 b/metadata/md5-cache/dev-java/guava-07
index 0377938cd512..24c8f38fdc64 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c27530960ce0..5ab479abe5a7 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a67c89bce799..340713c49a0c 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1cd7f732dd0e..34ada0687653 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 20f235ea598b..bb1e7ee638e3 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b8b9f0afff10..bfcbdf84ed1b 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 998afb02eb86..9375f4f7fe48 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e75facbe8f747261b00559fc331f810f
diff --git a/metadata/md5-cache/dev-java/guice-2.0 b/metadata/md5-cache/dev-java/guice-2.0
index 04f1b9f8886e..97feaa47c969 100644
--- a/metadata/md5-cache/dev-java/guice-2.0
+++ b/metadata/md5-cache/dev-java/guice-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/aopalliance:1 dev-java/asm:3 dev-java/cglib:2
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=30bfccbd5865d9154e32b7c3d8f664d5
diff --git a/metadata/md5-cache/dev-java/guice-2.0-r1 b/metadata/md5-cache/dev-java/guice-2.0-r1
index 8245b0d268f9..fd5849d403b0 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9cdcadff17bee58446894e28d0497c0f
diff --git a/metadata/md5-cache/dev-java/guice-3.0 b/metadata/md5-cache/dev-java/guice-3.0
index 973b3fe6b605..bc4f33a19314 100644
--- a/metadata/md5-cache/dev-java/guice-3.0
+++ b/metadata/md5-cache/dev-java/guice-3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67255fd595de7630b31784c8870beae4
diff --git a/metadata/md5-cache/dev-java/guice-3.0-r1 b/metadata/md5-cache/dev-java/guice-3.0-r1
index 0d43d52b274c..6cd8c1770b37 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b056935dc73b5a02bb302445fa80311
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1
index 363e7e0ad6d2..fb21d52ce4d7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 41331614d8c9..5981dbde40bf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6406022aaa5a..39c316f447dc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 70259f5d9e88..b9bce9d83646 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aa9a317b0de0..6ab3eb2ff4fd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 872a3a96184f..7e5a73c8d1e5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80c2e07f9a007b001f169fa49c2a2c1c
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.1 b/metadata/md5-cache/dev-java/hamcrest-integration-1.1
index fe51522db100..52842a99aea2 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a27686d2af6644c16876e0d0ee8f279
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.2 b/metadata/md5-cache/dev-java/hamcrest-integration-1.2
index d26675688229..8ac5eb8ff482 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.2
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.2 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0390779b787b46a3a4e882587de3414f
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 2b284a87e41e..7b09a996a420 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=326dac9f016eb56fcde6c2c870a9a87d
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.1 b/metadata/md5-cache/dev-java/hamcrest-library-1.1
index 60dd684dba98..d8a7f17d2060 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7e2cc4cb85c6..e9b918388a23 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fe4c88b42515..c9fcc311a1ab 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8db06025bbfdcbb666604eca449c9e72
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index 6c7e45091e37..080bbe0834cf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ed93099d3b16..ca5b7d47218c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3bee04c8bae1..462f047b5a35 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 31b430a9162c..b9b09d1512da 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6213ec80c4fb..d84afccbb29e 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 df492ed46939..ddf1bef9efaa 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2a850ee0c8aa..95ec8ae3eb58 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c27b04304bd4c00f8708b3e19a6e151
diff --git a/metadata/md5-cache/dev-java/hibernate-3.1.3-r3 b/metadata/md5-cache/dev-java/hibernate-3.1.3-r3
index 5674519f556a..0509fb4507a5 100644
--- a/metadata/md5-cache/dev-java/hibernate-3.1.3-r3
+++ b/metadata/md5-cache/dev-java/hibernate-3.1.3-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[java] dev-java/c3p0:0 dev-java/cglib:2.2 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 dev-java/sun-jacc-api:0 dev-java/ant-core:0 dev-java/asm:2.2 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=753803fbf3b11bd2701ee37757525f42
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 9e62dddd53ec..5dc3264b7981 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec72e085e3f7b3b3c64ac27e499540da
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 6f2b7868f05c..20e5c5c5c641 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fbcaaabdc6af..4cdc9d138e14 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.1.9-r1
 SLOT=0
 SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 83306e5b4026..c40ebe4c0ee2 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b6ec06f8176a..f71d45257097 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 14a44bcf9065..45157feb6ebf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6f5c3f5df6ae..95addc0cde05 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62736aa81c37..f28388b9453d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1bddaf6baa84..98899e8698ad 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4c77443a004d..7716c8e1f8d3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fadb26aef282..2d95c5305638 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7df13a8abfc7..4338bb1dd252 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6249173e5ba4..0c0e52b50ae6 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fbb91be354e2..30bd517ecd96 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 715c821e025c..dfec34aa7a69 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:= >=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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 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	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=95b95e8e1efed3e16190eb469661c092
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.6 b/metadata/md5-cache/dev-java/icedtea-6.1.13.6
index 8c93c7311f8a..ef48c2d6848b 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.6
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.6
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:0 ) nsplugin? ( dev-java/icedtea-web:0[
 RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/libpng-1.2:= >=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/icedtea-web:6 !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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.6.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b34-20_jan_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	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0fb59d0b48fbfa96619c4a02e864411c
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 cf5f80fb353c..2b8b6bf6f5dc 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:= >=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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 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	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ca3965222805f96ab404de74f12ea467
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.5.4 b/metadata/md5-cache/dev-java/icedtea-7.2.5.4
index c9fa16a0bfc2..971ba262f2f1 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.5.4
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.5.4
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7] ) nsplugin? ( dev-java/iced
 RDEPEND=>=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 >=media-libs/libpng-1.2:= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) kerberos? ( virtual/krb5 ) >=dev-util/systemtap-1 smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) !dev-java/icedtea-web:7 !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.5.3:2=[infinality?] >=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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.5.4.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/openjdk.tar.bz2 -> icedtea-2.5-openjdk-6cf2880aab5e.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/corba.tar.bz2 -> icedtea-2.5-corba-3c9f523bf96e.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/jaxp.tar.bz2 -> icedtea-2.5-jaxp-ca26767d3375.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/jaxws.tar.bz2 -> icedtea-2.5-jaxws-9a6c90336922.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/jdk.tar.bz2 -> icedtea-2.5-jdk-1e6db4f8b0f3.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/hotspot.tar.bz2 -> icedtea-2.5-hotspot-6144ca9b6a72.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.5.4/langtools.tar.bz2 -> icedtea-2.5-langtools-960cdffa8b3f.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	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e20a7efdbb894b24f614a116498d68d9
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 72cba909c007..a3ab5c11e009 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e9e0d53ce1710407bab15f21958ceac
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3.2 b/metadata/md5-cache/dev-java/icedtea-web-1.3.2
index 6085480b08c2..92d338381daf 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:6 !>=dev-java/icedtea-6.1.13.5-r1:6 nsplugin? ( >=dev-libs/glib-2.16 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ca67479def00c364ae2b5ae0026636a
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.3.2-r7 b/metadata/md5-cache/dev-java/icedtea-web-1.3.2-r7
index b8aa7b374296..0ec293d8101a 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.3.2-r7
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.3.2-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=dev-java/icedtea:7 !>=dev-java/icedtea-7.2.5.3:7 nsplugin? ( >=dev-libs/glib-2.16 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.3.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=97a30542c58a70f38d1cff20a7d689a4
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.4.2 b/metadata/md5-cache/dev-java/icedtea-web-1.4.2
index 3f6f32c92d82..2c573aa7c98d 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.4.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=|| ( dev-java/icedtea:7 dev-java/icedtea-bin:7 dev-java/icedtea:6 dev-java/icedtea-bin:6 ) app-eselect/eselect-java nsplugin? ( >=dev-libs/glib-2.16 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.4.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9897fecf088004481d723393cc7e3973
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.4.2-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.4.2-r1
index 244c1108f9d4..b5c371d06d9d 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.4.2-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 nsplugin? ( >=dev-libs/glib-2.16 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.4.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cc3ef89b50cf010a1d7dc90deae24ed
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 3e9a92781b22..1cb994f1aec3 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.1.9-r1 =dev-java/java-config-2* || ( app-eselect/eselect-java <dev-java/java-config-2.2 )
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.5.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-vm-2	3be2b41fb351dbaa00c7d14a732c75cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4cc0ecc08b04ae94a7b937cf9379ef80
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 4e3bec2bcf24..706f37557e6a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dc8ee55d5cd5..4d950214bf07 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 da8be3a33420..30722974e4c2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1130a27216b6..5762e8c86fb8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5bcd7690ab46..09669952d4c8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3dd69638f541..a2c1c7912d3f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 75b4b16745ff..f33a27315557 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1f647f7fbf26..dd80bda8bef4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 934686c52185..bca1f61093e7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b96ed4269a0c..582f6eb281b2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fd1bcb521f97..c50a034c68c4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0dfec396feea..4aed0a211d5b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3518c42fc7db..a9aeba66d370 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c27cba76b70338fa82c1ef2e223795cd
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620 b/metadata/md5-cache/dev-java/istack-commons-buildtools-20090620
index dd01146447dd..476141f2e2f0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a446a714c39b68344660286b8259f38c
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 aaa45c67ba93..7b7dfa586589 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0155de77b00f..dcdd82525433 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0feca0658543ad8bfdb00366c6ef753a
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 78ad5ac63ba2..2bcefc325dc3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 36b795f0249e..99168c2b5f5f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fed1ff2a0cc7..11287ec0d687 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 507cccf31b33..d2c5213a9f1f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2055921308b8..afce1a7efcb9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7ef805faf67fb314df19d1c6510a8fb
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
index d734d0bf3628..038faacd9134 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.6.2/jackrabbit-2.6.2-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4ebb653288bfeb0326f8fbdaa67f013
diff --git a/metadata/md5-cache/dev-java/jackson-1.9.13 b/metadata/md5-cache/dev-java/jackson-1.9.13
index 0a00fd13ea37..7469df83bbc0 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fa21f5c84ded..690e52820559 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 15471b899535..4fa35a20388d 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d87c92fe40551fe68601f410b5feff72
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.5.1 b/metadata/md5-cache/dev-java/jackson-databind-2.5.1
index d0b188fcf990..897eb1196128 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-databind-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-databind/archive/jackson-databind-2.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ea0703715bd05809a8f5dc5ee185d3
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 f3bd5d86de04..1491c7a98e4f 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4913a4603480..bf899b4584be 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a9c82ec283e..80ff48ef9d8f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 986645632a70..50f1993bf497 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.3.3.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0f1064fdd0f6..78e88d78b490 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 466a7aaebb0b..e87ede301197 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 685fbddbeccd..8caee2059d1c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ecb3c873bf57..f4cae233adde 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b281c34c3fd..e5c2cc873e6a 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.5 dev-java/jffi:0.4 dev-java/jnr-x86asm:0 dev-java/asm:3 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3520ae98c20923848445c0edcdf1f9c7
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 2c1776427436..a1ea369e55fa 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7a598ae9ddfe..c4a8db32d4e4 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.1.9-r1 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=070bf0a0b37d7f4cc628fdcb77a654d7
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 88d0160aace9..97503c48895d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 00569aca232e..e8f7799873e0 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 82edf8fb9b4f..d206e375d433 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c92483c90635..4a854ead2ff9 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5de162b3ed83..deb44a493e28 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b88f7d523dab5f6b24774f33da276ace
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 b3362422e36c..543f48c15457 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d0e071245bf9..028a4178894b 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a7c517f09353..2af5909a434b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0a8dd3bcd77d..bf61bf14f4b0 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.1.9-r1
 SLOT=1
 SRC_URI=mirror://sourceforge/jamonapi/JAMonAll_103005.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 41c6ec24ea95..9b0c6d67ec00 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a355cd0b3d80..153753c23e41 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8f26182933c0..f5437224777b 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.1.9-r
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 529c7e1b57cd..bcb8c27db4e4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5caf0949ad3e..ec9a9e341d90 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a6457556cafd..ae9284c6174f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4afcebc9894b..d7c1daa8c62f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e3ce4bd4c2f3..a966e0879f37 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 468160250990..a6476450a749 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8a2f5e99a334..ee2f12f34103 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8e798a22c331..756f68cf1b51 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a0664b533cbe..407a971e4878 100644
--- a/metadata/md5-cache/dev-java/jarjar-1.4
+++ b/metadata/md5-cache/dev-java/jarjar-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-getopt:1 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a92337d4c49f3072116a2fc62f9d9a09
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 7f2d6e095eb8..d8a35bafec97 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.1.9-r1 >=sys-apps/portage-2.1.2.7
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7e71b82475e9..f51804ecd6f8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fc96ce116b54..69d1fc014500 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab485b406dc462b7820be58ce264db34
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 7dbe4e22e0e3..41091306a34b 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d04eecf6a516..b47edddf216d 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	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29baf4ccf1aa..528e3cec6ec8 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	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 47f2475a54ea..496026506618 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 08e5cd4f89f7..d3877b177a4a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2864ec345509..b68170f7e609 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 46cbf5f49c24..e7cf34542cc0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 418b669a4978..abd8c383ce22 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 41a50357a55c..03d98c76995c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 92a5fa5c21a5..054313375474 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 536f38ed6710..0fef39050379 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0251488cdf10..ef6de21810ce 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c15ceb8ac4d8..1de336a2f1e3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 af775567cf44..ba3917c6c4d0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d61cf2df28a70f57ed260f75c502d520
diff --git a/metadata/md5-cache/dev-java/javacup-0.10k-r1 b/metadata/md5-cache/dev-java/javacup-0.10k-r1
index 7ad2a88935aa..3b0a7c50eeea 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 629c4b1c3be6..289b727715cc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bb491a679c3d..4a1e4928049e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 71dd217f2d72..7815d917daa0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9b0c60ccda89..fc55e1835bfa 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ad204e0e97f2..3a3e05b6a4db 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 816934081e34..fa933e1fa6b9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 783aa897de0b..38ef7cb335bf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 381ee6a5cc1b..ed9a9c202a69 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9c1cbf75cc71..d4652a99a676 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 892c9ac370ae..218f822573ac 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 617b00ba014a..c2af1e5cbc13 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=540df4bb3924e12e3cc90b0ff9817764
diff --git a/metadata/md5-cache/dev-java/javax-inject-1 b/metadata/md5-cache/dev-java/javax-inject-1
index b5a20a9cb78b..122a4b0c2594 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1
+++ b/metadata/md5-cache/dev-java/javax-inject-1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://atinject.googlecode.com/files/javax.inject-1-bundle.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6d03c6340c6ab99ea465df4f5f13dbc5
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r1 b/metadata/md5-cache/dev-java/javax-inject-1-r1
index 3f893ce0704c..106c0adcfca0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9c857bf055963003d3f68050f29ceb2
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 959050a510f3..9a513e07dc94 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6db3630c8966..51fbf9b09891 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c1a03450aefd..9bd4e503caeb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b08aa04632e3..994c29b77a7f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3fd22b12779c..08c47f3e3023 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8f218e6c0563..e5f39d7c80e9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6e461c4efe74..123b07d15910 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9aacfef51f57..f8c6780a8461 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c9a1f8291032..fbea41421821 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 17f47d0d5bf9..eb0a269125a6 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b235362abb2e..468228a29e11 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6af14f1777e7..06f20a9a7067 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ea4c6b3bac2f..4e7ba7bade8f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0cdcb06c2982..f8a5ec17282e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 157fc42d4cd6..f0e13d39e097 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 36145d2e4f16..13e194db5fde 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4094a9f6ab5e..ebcb27918c28 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 aa1e9f98a363..500cc09cf623 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b6d35e423fc3..ef2c51290082 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b89a68842936..4accb4adb467 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9d831b1c2d2541ac2adf44ccacf5f6e
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.3 b/metadata/md5-cache/dev-java/jboss-logging-3.1.3
index 250d8a91c705..38ef51648739 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.3
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-logmanager:0 dev-java/slf4j-api:0 dev-java/log4j:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.3.GA.tar.gz -> jboss-logging-3.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51135e55794f46009e12660d84b57d7b
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1 b/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
index a456b5503a6c..c4360737d3f4 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-logmanager:0 <dev-java/slf4j-api-1.7.7:0 dev-java/log4j:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.3.GA.tar.gz -> jboss-logging-3.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aea80a5bcc3760e55bb8c8bdb7fd3834
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 cbcc44ce8454..3fd199f48533 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.5 dev-java/jboss-logmanager:0 <dev-java/slf4j-api-1.7.7:0 dev-java/log4j:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f71e543f3275631c343c223a7c5c7cbc
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 e37c37b75fc0..2c155e639085 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b07192fd65234720610dd8d327dbecb3
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 feaab9417788..77f7622c6d53 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8ee17e67f09e..1cc9a5d968f2 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f872e1a38f6a..c0aed56a7ba4 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff468c8b47c62178f3f8605b07343ca7
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.3.3 b/metadata/md5-cache/dev-java/jcalendar-1.3.3
index 4a55973fc13a..f59da1148705 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a6b59b39b49c..c56f4f914b51 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.1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 223e6e77ffbb..85b8bf3bad2c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 99d95b1db689..7097c2fea9b2 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ac104e923bcb..9b0982bd43ff 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 426d6f79ef27..b84cea65a4ca 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 050a94a94da9..3406a3341cf1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 deae49470d37..50146f26b533 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c1e41a4db2f..21bb52d81b21 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 19bbbf70b21a..019adc9836ed 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8df87ce59b7f..79882c6d7290 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 913689aec943..f0371d70b00a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f7be8bfd7662..e2319fd7c037 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29755f7ded60..3f3597bf0058 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c38479e81da0..42938e1b0d82 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ac80d1ac190c..850c4beb0563 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c12bfa01f24df10ad9d52a7514449ea
diff --git a/metadata/md5-cache/dev-java/jcs-1.2.7.9-r1 b/metadata/md5-cache/dev-java/jcs-1.2.7.9-r1
index 31493ba4a98c..06b5e8f2e114 100644
--- a/metadata/md5-cache/dev-java/jcs-1.2.7.9-r1
+++ b/metadata/md5-cache/dev-java/jcs-1.2.7.9-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/jisp:2.5 java-virtuals/servlet-api:2.3 dev-db/hsqldb dev-java/commons-dbcp:0 dev-java/commons-lang:0 dev-java/commons-logging dev-java/commons-pool:0 dev-java/concurrent-util:0 dev-java/jgroups:0 dev-java/xmlrpc:0 admin? ( dev-java/velocity ) >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://gentoo/jcs-1.2.7.9.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae65490997bce12694a90325bca21ffd
diff --git a/metadata/md5-cache/dev-java/jcs-1.3-r1 b/metadata/md5-cache/dev-java/jcs-1.3-r1
index 28402b3d8d90..49150026371b 100644
--- a/metadata/md5-cache/dev-java/jcs-1.3-r1
+++ b/metadata/md5-cache/dev-java/jcs-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-lang:0 dev-java/jisp:2.5 java-virtuals/servlet-api:2.3 dev-db/hsqldb dev-java/commons-dbcp:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/concurrent-util:0 dev-java/xmlrpc:0 admin? ( dev-java/velocity ) >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/jcs/source/jcs-1.3-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f20e982d491a7a575df143986d6d8e1
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 7c3900967248..a4e59cd6fcc9 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=JDBC.3.00.JC3.tar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ccbef71d800f..ba72af107e4d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dfe9e51afc9a..4e16010f71db 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6deeef89da4b..7330dd0066a2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18a0ea0d3d1f39927ce9b4079f83b419
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 3cc69a97ec55..67788309688e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1c21e146fe47..cbda91bb022a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 55985d623364..be46167be41e 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 30b81960552a..74fdc9a952b3 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 984f0735822d..93d9bf23286a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5d9477c5b37b..13f6531e6392 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62e9753f1414..893b3941620f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f9ca423e5c83..597a3aa8b3cf 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d361d6f4886a..54434829dc18 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 59eb08c3c600..0240ad9dc03b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c592ef8777e6..bcb299f6890f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 795e6f33bbba..1491a3a9f842 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 26e5713f99e9..2540aa0ac64e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f6642875d22a..02cce3013fe4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1b3596ae0aa..0a97b55f597e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bbda64d39cbf..9fc82c7ff653 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bd342d1148c0..4309352ead29 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=564e7ba4556cfa640d27816a3e730758
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r4 b/metadata/md5-cache/dev-java/jdepend-2.9-r4
index 0409ecfb36ca..600db019f57f 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r4
+++ b/metadata/md5-cache/dev-java/jdepend-2.9-r4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9ee5e823b10277054b07451fbf40422
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index 8d4053ec1d21..b9ea3ccd5797 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bde49bd9965abc802c4be1afd3e53f6e
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index 928ad8872184..f1add6be5242 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e501b06a9825..a62405f68df8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0a23f595a68d..2556ecad281d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0f03226ecf6e..2b51c85376b0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b501fe52823c..e6159a9259bf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 474b2eccd719..f9fa2e75d15c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cd31116af53a..43db5675c7a6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3508653f85ec6df8c6bd0302ab19f55b
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6 b/metadata/md5-cache/dev-java/jdom-2.0.6
index dab28de34b27..94b753d03254 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd4c25d5de99d37c521bb02ea44c3b7b
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 b7ef20346e41..48f9da1d1580 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d857915c9883..2797f73632dc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 143d064061c1..c8e2d6d46169 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 04ebbd14a6be..95c16575ab0f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ca54bb945f2a..93af2626eca9 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e411ec0727a5e1ca9d923a4452cdf643
diff --git a/metadata/md5-cache/dev-java/jebl-9999 b/metadata/md5-cache/dev-java/jebl-9999
index be66fc0fa4ca..7c8d00d0999f 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 db54ca064c96..d480ce99b1a6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6468cb172180..457c697bb34e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4a9c23321031..fe480ca2708a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e215caf2c80e..eecdf5e8893d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 36ce120e3a72..d75faf1a35c9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 84b0463df1a9..cb12815543c5 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0.4
 SRC_URI=mirror://gentoo/jffi-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 059b028dd4ba..612efbee490a 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0.4
 SRC_URI=mirror://gentoo/jffi-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9256274c8bf0..c21e89f24bce 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 76b0cbad4c15..92263705edf0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3a4870541375..5aafbfbcb11d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1db41ddabf37..cec40468b7ba 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5b6d9ece8802..f614b3ca93a2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 24167c957be2..2199778ac3c5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ec15a5cd44cd..aaf3fa185bc9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 341c21bf6ad7..06f176cab696 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cce648754626..072016bb3b56 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fe78184524c4..b6a244a51273 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 235f4c98937b..58280103ee22 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1780c0ab970..a735ecdd81a6 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3e43cdf37070..abe30d83c3a1 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0d2075744107..d3bde174a8e4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 489085be18af..1f684d8093dc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2877aa7c7f63f70c3b7cfaffebe43dbb
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 6c9d5d3c26ee..0c4886e15bfc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 94274bf62794..e982780e2f13 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3920aee34aed..a663c16ade70 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 91fdc3c91c46..2dd1209f3523 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2991a91e621b..737c290e4de4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2065c9ca5aac..880741277226 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 378462867912..1b4ce8c24236 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0bb803009592..d953185caf8b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1526b4a2bbd2..ba4111769c3a 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a79cf973d98e..ed05f96c1e3d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2708a6119f51..40c400508037 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5cd777c81cbe..2906a28d183c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f44603e2e17c..b5691f3e4491 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e9cbaba9ed25..59b64e9cc8e9 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 33c7ba84c5f2..aa4135df23e5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 51d04099e15f..853baefdef3e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2806e020f67f..8b2024d3beed 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 64ce0c1f01bc..24cf0c689a6e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d536d12d7fea..2fcc564cee71 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d09ca0d6e2e0..5c0a102b0dcb 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a6505c2e7b5..937b74bca473 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ddee312ed883..e142ee42b65a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f970c6a247f5..59866454b21e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b6537db65f94..06f9a8cd3d2f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fb58c4f7e9cd..b5645d3d4a4e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8a05ed075e65..d3d2c42aeafc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8cd9f0a74c21..4c7bdb7be959 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2d8550a43243..3fc26c5e7bc4 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/jjtraveler/JJTraveler-0.4.3.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c0d471d3662f..a12009bcc4b7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87d00cf6667e9cf59e99c4c6216eef82
diff --git a/metadata/md5-cache/dev-java/jldap-20060300 b/metadata/md5-cache/dev-java/jldap-20060300
index 0974e91bcb0b..ebc4fc65d804 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c89ec831bf04..58db29bc8518 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 70354b466ff5..d19e0d91c74b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6d195b4d0028..e9062082b8e9 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/jlfgr-1_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 176e09e29f0d..be52eed1e9d6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 913e93b64933..05cdbdbed657 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 78ca9123b566..0c96822091d3 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b68f7d775d14..51a93b7047f8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fcd9fc89528b..46c3b8429da9 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1a1da7d39740..1f94133d69a6 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 33d65ea752a5..e1abfaab01dc 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmf-2_1_1e-alljava.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 554f839554aa..2c55d67991f9 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a411a28796ef78e5cf26e0a6a2f52d8e
diff --git a/metadata/md5-cache/dev-java/jmock-1.1.0-r2 b/metadata/md5-cache/dev-java/jmock-1.1.0-r2
index 3a1c1401307f..adc5a8ce7224 100644
--- a/metadata/md5-cache/dev-java/jmock-1.1.0-r2
+++ b/metadata/md5-cache/dev-java/jmock-1.1.0-r2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 =dev-java/cglib-2.0* =dev-java/junit-3* >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://jmock.codehaus.org/jmock-1.1.0-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1035038fd407301408023fe0cbe29391
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0 b/metadata/md5-cache/dev-java/jmock-1.2.0
index b2027e1c8603..15e571418ed5 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/cglib:2.2 dev-java/junit:0 >=dev-java/java-config-2.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88e0a2f0690719b09b58a4ffb5d51062
diff --git a/metadata/md5-cache/dev-java/jmock-2.5.1 b/metadata/md5-cache/dev-java/jmock-2.5.1
index 452cad740cc4..1fd899d3dc59 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9b1354100bb7..c1a80862a995 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a8334d5cad59..b5e7972edb1b 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.1.9-r1 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7b0b2cfa8111..e0493a71f3a5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 72f9e580cd31..268d5b74191d 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 502a8917cada..a3b4813cb21c 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.2
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 5b1f886f9bdf..e03cb156c99b 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index ebe141f88001..dd05bc3826f6 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.3
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.3
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1abe16f7e256..0d07a1034346 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index cd5ac7c6d28b..4e2e4458c1bf 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.4
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.4
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 47cf384c567b..47933827ef43 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.5
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.5
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e438265e5c27..8c857bae4504 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.6
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d84370386dd61c1fbe467dcf445c3eb
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.4 b/metadata/md5-cache/dev-java/jnr-enxio-0.4
index 6f4af1885d14..ad2b4a88f5d3 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.4
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.4
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dec2066d42d4..d52b86173763 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36cb969a03250c3fa8de034f92a07318
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 9d5b7941e340..23920731cee4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3fd08751d44a..2aad0b2d1e47 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 11e950cbb3d4..59aaff74cfe5 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 06a84e5c775b..21ac8aab6f96 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
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47496b0c05f120110954b9c63b9a5b66
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.7 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.7
index 41d760c64691..fd3791823d03 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.7
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.7
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 4461176abb71..68910f16d301 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.9
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.9
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3aa92d9c797c..1e54ca98c293 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=42c56bdc0a6eca23f2af072d4929fb7c
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-1.0.6 b/metadata/md5-cache/dev-java/jnr-ffi-1.0.6
index d192b23185a5..b4e8030f2cc0 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.6
+++ b/metadata/md5-cache/dev-java/jnr-ffi-1.0.6
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a5eaaa56014d..661328f1a798 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e514a44329e75d182c05fa8261d43136
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 1220ddc0d63d..dc37625a963f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index a8663d056529..66a7a4f60723 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.0.6
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.0.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 59675c57872c..30f6cd87ae47 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index f7f3422b26a2..1d1795506a55 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index bea2584165b1..b9f0e9ecb655 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:1 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a9646be3b7be..bcb5c1da26b7 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2de79e7c1b8a787c52493dc51bdd34e
diff --git a/metadata/md5-cache/dev-java/jnr-posix-1.1.4 b/metadata/md5-cache/dev-java/jnr-posix-1.1.4
index db47e813dd57..27a27a61ecbc 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-posix-1.1.4
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d7b7fdeb06f2..d3d1bda1448f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index f15f68f14960..1913fd99d376 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.0.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.0.0
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 32825d034aa3..1c67a9d0ec78 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.3.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.3.0
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f748672e174..4342bf45e745 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.4.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.4.0
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab47937b1afbbdbbdced6868304214ab
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.5.0 b/metadata/md5-cache/dev-java/jnr-posix-2.5.0
index 43b201aa8999..a2898165ca7f 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.5.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.5.0
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index c3df00038d46..c18e00056332 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.5.2
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.5.2
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 035553d7b78a..f0c80a693c89 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.0
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index 72df88fd8f13..aa6ef9a46933 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.1
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.1
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 871bbbb1d1d6..19655ec07ec6 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
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2b51adfcb91a12ea730ac2e66b98402
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
index 9db22f94d30d..e3c633de88df 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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
index f3ad373ad53d..a61904c08f94 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.3
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4f016ad5b47b..82139161a711 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c83b80e763b3721b4c5e12904316ec7e
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-0.1 b/metadata/md5-cache/dev-java/jnr-x86asm-0.1
index abb14c7b2be9..3b85aa4dc565 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0b529f3a4c66..d290124e1c74 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e15a2b1ed323..e7e02a69b2cf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 582903af762d..3b172eca5c9c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2b52df2c275e..360f66a462b6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9dd00e0a1ab0..d514927c4da8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 46afef475403..183a35c89805 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5f927b5e9485..b0fcf30de549 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a0c0e08c0ad3..287a3b3a0cb9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4f58988e0be4..0aa8e21a7cd5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1c6781e46f0e..88edfcbdd67d 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 98682dee1cf5..85ab7b5663f1 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 83f1bfd13417..efdb29625df1 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 614f171f27f7..ae13e6c6755f 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3e9725b5e308..7238363b00d2 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3d9100c36ef2..dfc18a6f1054 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 59bc3226e04d..ce99af1a22a9 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d888f7eb7708736067b739ca91b68014
diff --git a/metadata/md5-cache/dev-java/jrobin-1.5.14 b/metadata/md5-cache/dev-java/jrobin-1.5.14
index 7ef63f82726d..9da8620f69bd 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.5.14
+++ b/metadata/md5-cache/dev-java/jrobin-1.5.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=virtual/jre:1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jrobin/jrobin-1.5.14.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0791b8e086aa818ddf52f965826ac84
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 9de94f929405..4339c9b55ea0 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.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c8c2d409d570..44f9bf922a7d 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 765f583398f9..435814d5c6f7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b8ce69b391b60a579c436b4e53519a9
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.41 b/metadata/md5-cache/dev-java/jsch-0.1.41
index c14b1a0ffe62..21bdd0daf8e3 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.41
+++ b/metadata/md5-cache/dev-java/jsch-0.1.41
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.4 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.41.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afce85f6cad30e8c89940c7daf5f18ec
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.44 b/metadata/md5-cache/dev-java/jsch-0.1.44
index c7c827daf726..c62ef84e33a6 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.44
+++ b/metadata/md5-cache/dev-java/jsch-0.1.44
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.5 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.44.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=13ac188f9083ea9a2a8eb75ad1df5a33
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.49 b/metadata/md5-cache/dev-java/jsch-0.1.49
index 6b0d703b6d6a..cc50185769e1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca3e355177ee9b4a300242ec910e5002
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index 25860eb85e62..9e97a0dc091d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 346e657b0a6f..978b4775b53d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 14e481447661..59bb55345c4c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2e6c42c795cf..6fbcf1ecec5b 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29f7bd1eab57..2686f48c3977 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db0db903c47db150e9872d261e9ffe7e
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 7054b44c686c..f0a94218db15 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4712da3790d2a26821c5faf967bf73de
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r1 b/metadata/md5-cache/dev-java/jsr101-1.4-r1
index 997af84e4b31..8d5eb7f249e1 100644
--- a/metadata/md5-cache/dev-java/jsr101-1.4-r1
+++ b/metadata/md5-cache/dev-java/jsr101-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 java-virtuals/servlet-api:2.5 java-virtuals/saaj-api >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f07ab8d82c487ef1d2f57784209874b
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index 352740c4c7a3..f314a2b7267e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f65433abc521..36e0333b9bea 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.5 >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f9aeeb2b696e276bf11fc7e5115918d
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r1 b/metadata/md5-cache/dev-java/jsr223-1.0-r1
index 4a3ba8523188..12f93ef189fb 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e23388cf2d90..7ec9389afa77 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b98e0c2c0c71f04a0a7d55ab3644814
diff --git a/metadata/md5-cache/dev-java/jsr305-1.0-r1 b/metadata/md5-cache/dev-java/jsr305-1.0-r1
index bb3cbd82ca50..7e8eee5667e3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e47f565959f2..2e3cbe4faa15 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e01b4162cfa1..a1e904733b3a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5379f769176..88e2576c2a2a 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1977c18d744e..cac10e67350b 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f5776a1af539..38a9b8293950 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	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 750a0aea3ff7..9206d9bbe870 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	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87e77a8feb056738ae4b49ef997564a5
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index 763511c302ef..5642dc5029d3 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.1.9-r1 s
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9a2dcc1e1a0b..3aa0512e24bc 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_0_1B-classes.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 88a9ae4ee77b..ae7481574316 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_1-classes.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3d2a237c7f30..02814901dbb7 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 539768218ddc..cf3c64087be0 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6571670923dd..40fd02b11e49 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4c0e6817fc4c..7889f19d4b0b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 153ed9d532fb..dc1f40996124 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1f7124e51942..8496e9019a95 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ae2d93af4821..8f7a0815099e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bebabd7bfbc4..17d9239c4dae 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c3910411f547..7906f73dd7c8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c7c62a8ffc59..ce7a5637e98a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f61f9a4184f9..faf4747fdae3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a8079bde8904..ce9b8e51fbe6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 170d2e348d16..971ad3d1ff38 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 729c66ab7715..5b65d26133b6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 208ced022219..7b97d94bd71a 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6820e051f44d..b56dfedc48f1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 27f0572bd8bb..821b9ca36d38 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jusb/jusb-0.4.4-src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f71f8b95d819..c99fa1fe45cd 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0e579b30bc54..86f3e7359100 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.1.9-r1
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=jvmstat-3_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f6ce4f66bd05..b02d2066910a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f220bb670e8..8b29afb17411 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3d4e3248d15d..9cefb65c4bea 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/jython-2.1.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f5cc9caad4aa..01d4e8df450a 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a0b7a1ade992..1922d193abb7 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5c2fcbe4b510..10c4e511616c 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=034eec401a1e22311466988b140a9888
diff --git a/metadata/md5-cache/dev-java/jython-2.7_beta1 b/metadata/md5-cache/dev-java/jython-2.7_beta1
index 2bf82fa625fc..25473e1c6800 100644
--- a/metadata/md5-cache/dev-java/jython-2.7_beta1
+++ b/metadata/md5-cache/dev-java/jython-2.7_beta1
@@ -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-b1/jython-2.7-b1-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d895c7445315275151bb2c56563d3d20
diff --git a/metadata/md5-cache/dev-java/jython-2.7_beta2 b/metadata/md5-cache/dev-java/jython-2.7_beta2
index 02f32f054bba..d2d65df39507 100644
--- a/metadata/md5-cache/dev-java/jython-2.7_beta2
+++ b/metadata/md5-cache/dev-java/jython-2.7_beta2
@@ -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-b2/jython-2.7-b2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df2b8e2f86c814919ca9d5278291c74a
diff --git a/metadata/md5-cache/dev-java/jython-2.7_beta2-r1 b/metadata/md5-cache/dev-java/jython-2.7_beta2-r1
index 5104963ae063..1c8909258d98 100644
--- a/metadata/md5-cache/dev-java/jython-2.7_beta2-r1
+++ b/metadata/md5-cache/dev-java/jython-2.7_beta2-r1
@@ -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-b2/jython-2.7-b2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ceedc75533af2235f83fc60f3ad3dce
diff --git a/metadata/md5-cache/dev-java/jython-2.7_beta2-r2 b/metadata/md5-cache/dev-java/jython-2.7_beta2-r2
index 66821f2d0a8a..8e87a8abac0f 100644
--- a/metadata/md5-cache/dev-java/jython-2.7_beta2-r2
+++ b/metadata/md5-cache/dev-java/jython-2.7_beta2-r2
@@ -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-b2/jython-2.7-b2-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=055a97c18e3c1b48681a40b51d2983b5
diff --git a/metadata/md5-cache/dev-java/jython-2.7_beta3 b/metadata/md5-cache/dev-java/jython-2.7_beta3
index c622d91b0645..1ddccb85099f 100644
--- a/metadata/md5-cache/dev-java/jython-2.7_beta3
+++ b/metadata/md5-cache/dev-java/jython-2.7_beta3
@@ -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-b3/jython-2.7-b3-sources.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=080728f52a9fd9cb46e275932e1541c1
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 f34706972f95..47c489e6c8b8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 107c159c08ae..0a2d9d82f69b 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 da268b5c69a5..e3a0a2b5057f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1182cfdebcb8e9e3541de5b3677524e7
diff --git a/metadata/md5-cache/dev-java/kryo-1.05 b/metadata/md5-cache/dev-java/kryo-1.05
index 7b70d9375252..fa3d14c8f4e1 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a4b090f01c83..adef0e3fe9f4 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4c26c1bcbafe..104364f22e1e 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b12b5ef76f4e..c6f75ba5618a 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 087c1574e64d..bd96fd7c49fd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 23268c43b8dd..bcf8833bb1db 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8c61778293fa..7f65bb343da8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 75674826378e..7b7c2033e1c7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62589976d3d4..35981e817d77 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0915916ec060..2110c91b956e 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.1.9-r1 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	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6f4d8c9a44f6..fd9256d7feed 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f8e5ac1195a..a7d66ec71df1 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9a15d723d208..8df6fd9f8661 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 40db81a08038..fc6391bced1e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fb5adc2826e6..86019cde9779 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 333439742f7f..84afbcda0ce6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0915d6c970af..15ac12eec8b3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 68cf9f11f77e..a88b4ef2dc0e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ebb54d013589..ab09c05fe792 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f3d23e21d0a..fcc024b9d237 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cf8195f3c174..e33a7e83a8ca 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 95b79fa7fb3a..796b97ce2bc6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c67602c39d52..099d3056a28c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a0715f245a55..ea5047335ee2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0d895ddda75d..2bc8595d772a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c63453ff05b8..93e834cf461a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8d338522516d..6bbcddf48c70 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c9c018a6839f..d0e5cf231e25 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8c95ecef63c6..057ab01824c5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a275efe7322..c00bffb74bb5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7b387e0b3b98..dd630619a9f8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b4ca1c8fc854..3981cbc0e846 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 68233e8d79ab..d0a0310f0928 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b9a5906c8877..6bc36bfbc940 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 783d35ec437c..7da5c02f411a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 34ac3af49b11..b381f7f34b2f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e00b57f109de..d750409fd081 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0a67408f829b..d31c27451f4f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f77137d0b31..83832f642405 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6ea9e7b49a16..a353942adc0f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ecb3855d3f12..2242a0b32cf1 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5a2873bd81f..f152cd358227 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2f9fc460592a..47a5f01a4dde 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d8e5f99cd454..dde7c6182bde 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 98746c297808..c4f0b089b6fe 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8be93039dcc1..8249633ced4c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bbc986c86820..0a3cb98afede 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5800cc87bf31..40e4d53baa5c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1624de277ce7..12c6a339d1d0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9b19ad1f086e..219d61c1a274 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f2616103a16e..b2a15660f778 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d856dbbc7bd2..bbf35f7b6383 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 00cb409e7fc4..8f7d0a1f0045 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 68eac59e2c50..4990655ee444 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8fd9c5936826..ae49851a5424 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fb1b7572197f..3efa182873d9 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 794e703a0aee..9b04f4322987 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0596475a5253..4785b427d27d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 29f0093ca8d9..7de2b71f9cd1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1ff00125e6e7..a82cfd04dca0 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fab371dc3094..d8fc7615ba6b 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c020f1c26088..2b5359f92f4e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d0a5cf6121b1..208228e17e2b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 889c2409f59b..298cc0f891bf 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 50ef9b25b021..6078af2142c4 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 05481d663a51..f0c93c3bdbea 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a56c459e23d6..2eeb55d91839 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5a8e8cb53f4e..9bff135af380 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b69b83efd7b77e3702ee9d4d4f2774f2
diff --git a/metadata/md5-cache/dev-java/msv-20050627-r2 b/metadata/md5-cache/dev-java/msv-20050627-r2
index 6e8a264b2461..9a4be4b2257f 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f1a0978798a1..1dc5e31e4f96 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89c8fde0ef00accb767a09750d2fc6a1
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 64fe0bdc4857..f406c8e5f1f9 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 341e60a86a04..aa67cef032a9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3510d6ce0427e22fcf3127a42e083a31
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 34703442a67e..2ae5bff3a890 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8399e00c4e08..0cb5b981522d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=392b3b38ded8ad17b13d0d8f975c6baf
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 04ef0363c6c5..cd8fbf34f24c 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 473f40d1a8f7..91f3e759d60e 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f285a2c38170d9ac6cc4a935c603aee3
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23 b/metadata/md5-cache/dev-java/nachocalendar-0.23
index 2cefa87681cc..3361d35485a1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d6e746adc6ff..439c885bcc6f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 301449c39910..b968a3f1e970 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a8b586c5494e..dfeea887a25e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 235ebc96a0ac..377475db504d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a9ecb88117e6..83757ee68868 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c985a2dbe2e54e468913a80e0b73bfe8
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-7.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-7.2
index 1fea9c220c92..edd9ac9f4b44 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b980944a4ac36f4ba7df9ff3eda07608
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 0c1f433cff28..7c17b37a5d3f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=01e4334abef47d18416f1178cbcfce0f
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-7.2 b/metadata/md5-cache/dev-java/netbeans-cnd-7.2
index 7c5d3778a149..549bb9309b83 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-dlight-7.2 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/A17998A985D048F3195B6ADE1A360440FCE30102-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e871cb1cf8bc843b699ecb1e5a184454
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 b87c19848240..2688f67f4548 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11d99c81c0967522ca220d34527ad2b6
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-7.2 b/metadata/md5-cache/dev-java/netbeans-dlight-7.2
index 10b7c654eb64..eac1fb1b0d64 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b593753ecc283439025188657f622592
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 c783b0d4b37a..c973e963feae 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0bd64684181ea23d8ecc2a9a9bbc2b19
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-7.2 b/metadata/md5-cache/dev-java/netbeans-enterprise-7.2
index 9aa62208fd5b..7014cc6db344 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-profiler-7.2 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-webcommon-7.2 ~dev-java/netbeans-websvccommon-7.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/jakarta-jstl:0 dev-java/antlr:0[java] dev-java/asm:3 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/jettison:0 dev-java/jsr311-api:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/A48449579E1EC9257407CCB2B15CEA2698C8B8F0-el-impl.jar http://hg.netbeans.org/binaries/F28E9567138D6B9AD87D79592F77874334FF5BA8-glassfish-jspparser-3.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.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/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/26F461B41CF3E9070A76E44ACDD1FD8560FB1E25-javaee5.jar http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar http://hg.netbeans.org/binaries/75BB262D60528EACC0BCA22B1BF77D20A7AB652C-primefaces-3.2.jar http://hg.netbeans.org/binaries/A8C121019B222DAE0139299B58FDB9C71FE839F3-servlet3.0-jsp2.2-api.jar http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1e6081104fe3791eb4625a7eaba644d
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 4c276dfbd93b..55923cbb9e58 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=71fa8c0cb677cd447b8dab03a0869889
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.2
index 945561f998ef..e5004f256cea 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-nb-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5e9a0fb000b1a053f479a7aa16ae85e
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 21eab42945f4..ac581178f132 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b738ee39ca34c06caeb0bde5f6e2b5a
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 01141003ebc1..e409a1d610ae 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7df8eed18d551593c2c37c413a4fd1d
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-7.2 b/metadata/md5-cache/dev-java/netbeans-groovy-7.2
index 25b0f2e9c19c..8ee110049938 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/96A26BFA6E5AEA2E3C46DF44A19DE93A2ACD2366-groovy-all-1.8.6.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=006ce1798ee00af97d54762fccc90572
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 59b6c1675aa7..a6ab9de098b8 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fe3ac5357f6763929ab74233aa0fa58b
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-7.2 b/metadata/md5-cache/dev-java/netbeans-harness-7.2
index 50f56b324b00..66380403dea7 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.2 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6949384dbc687fef5d8953bb56b26a6c
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 c721e0b5e1e7..240ba32a3e5e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0acc555e1b4d25cbc052c2f4e9ee1a2
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.2 b/metadata/md5-cache/dev-java/netbeans-ide-7.2
index 43936017e880..0872c7bf931b 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-platform-7.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:4.4 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql: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-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.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/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar http://hg.netbeans.org/binaries/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar http://hg.netbeans.org/binaries/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip http://hg.netbeans.org/binaries/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar http://hg.netbeans.org/binaries/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar http://hg.netbeans.org/binaries/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11497599909637d1d62ff0cd3ae0a985
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-7.2-r1 b/metadata/md5-cache/dev-java/netbeans-ide-7.2-r1
index e8970690a489..8c0e0d0a4a0b 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-7.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-ide-7.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-platform-7.2 dev-java/commons-httpclient:3 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/freemarker:2.3 dev-java/icu4j:49 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql: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-vcs/subversion:0[java] >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.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/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar http://hg.netbeans.org/binaries/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar http://hg.netbeans.org/binaries/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip http://hg.netbeans.org/binaries/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar http://hg.netbeans.org/binaries/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar http://hg.netbeans.org/binaries/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar http://hg.netbeans.org/binaries/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=092c044dc535d99a4dd2139d09dc3b26
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 42cac5159ae3..6e425aa2d85f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24193a559f610b3bd63c27a9aaf6587b
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.2 b/metadata/md5-cache/dev-java/netbeans-java-7.2
index dc0f7d1b805a..3eccaf4ac102 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-websvccommon-7.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/lucene:3.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.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/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar http://hg.netbeans.org/binaries/7306EFB94B54B650A21AF595913219D7FA85FB12-nb-javac-impl.jar http://hg.netbeans.org/binaries/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar http://hg.netbeans.org/binaries/481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43733a90eba81f5cb6ee94349a30cec4
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2
index b6fa02268967..2ff0af69573e 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-java-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-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:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/c3p0:0 dev-java/cglib:2.1 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb244702ac2a5ddb7a3b300c7d35608d
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 56a717287ef6..567d4bcd2b34 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d150c64a568c612e74fd85578f38405
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-7.2 b/metadata/md5-cache/dev-java/netbeans-javacard-7.2
index b114ba23cfa9..43d866a80b85 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.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.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c08a378fd8173b344d0dffa5926c1528
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 0993993b32f3..e385ad91cebe 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41263c2de802cc4b7cf6ab157a012d25
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-7.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-7.2
index b715800f01c4..e200e512690b 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b8b03ee3d457e2a9f2a185ff715334e
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 a760b7daa242..cf6ad83ddf1d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd430b0bfb4532b8a3c14a8adc6d728e
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-7.2 b/metadata/md5-cache/dev-java/netbeans-javafx-7.2
index a2bd25c45003..f8bda76d35dc 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f360a3fcd40134976f6f337f2ebc856
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 d9b2be2fb142..1145f49c5db0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef432e5e3f5226f2e55506f939d7a590
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-7.2 b/metadata/md5-cache/dev-java/netbeans-mobility-7.2
index bee54832a9cb..ed78873281a3 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-apisupport-7.2 ~dev-java/netbeans-enterprise-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-websvccommon-7.2 dev-java/ant-contrib:0 dev-java/commons-httpclient:3 dev-java/jdom:1.0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a593a3bc3d9f6b93041decf2af1e4a5f
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 eeb29aac8145..335151bd62ef 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed48c12db35ce34e6a2189f5c31fbcf4
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-7.2 b/metadata/md5-cache/dev-java/netbeans-nb-7.2
index cc84d83857bf..dedde161eb75 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=198e5604d9c0e3114c563af57d98d9e8
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 426ff5e1e65c..996926021edb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1120244557db79d903564558ac776b65
diff --git a/metadata/md5-cache/dev-java/netbeans-php-7.2 b/metadata/md5-cache/dev-java/netbeans-php-7.2
index f4d63b9a6552..ba99aa62bf58 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-webcommon-7.2 ~dev-java/netbeans-websvccommon-7.2 dev-java/javacup:0 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/CFC66D677007430C0841704183EED3A5DD72E5D9-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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eebf7b05ae0902e9bfd5534c2fd32c5e
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 efe9f09f3c99..5c89f64546e0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11f9b0caf90e31f9eaccaa1d380f4362
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-7.2 b/metadata/md5-cache/dev-java/netbeans-platform-7.2
index 7a1ee672d992..f14b7e191f56 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-java/osgi-core-api:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.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/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar http://hg.netbeans.org/binaries/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6c938a67f92483a5b71d6fb364ad828
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 d61113b7f3c4..0626030753cb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68a2c8d483be516d68c1fcdc92c811ed
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-7.2 b/metadata/md5-cache/dev-java/netbeans-profiler-7.2
index d806476af598..65922a46607a 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-java-7.2 ~dev-java/netbeans-platform-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c30d81343e75f80d0842c6c6015ef5e7
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 d7a3c373e327..230eea38a2c8 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6ccf94253bbec02ed4d0b314b8589f7
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-7.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-7.2
index f0fb69a9bd42..9db451399914 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-ide-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44d99bd10f320c4db86a167bd621af2b
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 52174a462a8f..8c5e362034b4 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3cc1c3ee6089cc839e6e84a9f390574
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.2
index e533b55bd6d8..26afb7e145da 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-7.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.2 ~dev-java/netbeans-ide-7.2 >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4605a0533817bcf2aa2e54a12e111b4e
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 98d53d16619c..2f4ddde74fbd 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b86186766f112579c3cca8583bd176ec
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 b0bb00a424a9..81690898d26d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6c5973cccc9c..0589497b4c7a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 327b36d5b241..12a4e8885c75 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4306bd159780..6a5890bf694c 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 065fce99db77..0086187333d5 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9e0638ba7d91..89283452b3f9 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 608759345607..d4136e4e70f3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8e0dcf04dd22..d64625ed27be 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 66279ccfb6e2..2f3789decf57 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1f751919dfec..3df80a6522bb 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4b326d8b3fe0..11bdaa37343e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 533e64fc557f..18f21c01ad1a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e742555cf0d4..d308f8c4d4b1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 82edb75a6d21..29d42040d5ee 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1f519bc14c92..450a04e60388 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4f27c626fc30..f2e73e0996a5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b9b3429022cd..27061c9fb577 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dd8bac31654d..475c5367e807 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2f2c996ff180..d14214d7c2c7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=957c72a5aab2534decd25cdae33acc7e
diff --git a/metadata/md5-cache/dev-java/openjms-0.7.6.1-r8 b/metadata/md5-cache/dev-java/openjms-0.7.6.1-r8
index cd2c738c2454..29609e5aab74 100644
--- a/metadata/md5-cache/dev-java/openjms-0.7.6.1-r8
+++ b/metadata/md5-cache/dev-java/openjms-0.7.6.1-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[java] dev-java/castor:0.9 dev-java/commons-dbcp:0 dev-java/commons-logging:0 dev-java/concurrent-util:0 dev-java/exolabcore:0 java-virtuals/jms java-virtuals/transaction-api dev-java/log4j:0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.1.9-r1 >=dev-java/gnu-classpath-0.98-r1:0.98
 SLOT=0
 SRC_URI=mirror://sourceforge/openjms/openjms-0.7.6.1-src.tar.gz mirror://gentoo/openjms-0.7.6.1-scripts.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6ebc5b8b42347ad46a58ba5dfb5e5ee
diff --git a/metadata/md5-cache/dev-java/openspml-0.5 b/metadata/md5-cache/dev-java/openspml-0.5
index 536ba07e1f03..c75fd91b2f97 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 88f9a615fa24..da88e64279e0 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fae7db804193..8c3f14c25f60 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6c6bb3c749f2..cb2ef6f3cdaf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 483d1aba7dd7..f0471cadab51 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ea446450f287..e07ad9f372f6 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f5a1eec3fac4..6ffc0637bcb3 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e064eb676ed5..203ba28efcb4 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b6d39d11f8c0..8fc58b246391 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5043a67a770e..8255baff8a33 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fac778aea889..2d3c25bf3785 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 288822a40924..c85ce387c1fb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 46b386029d18..cc7991fe7d82 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 72ed217f0ade..d221ca4ca9e5 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ae184e4ab51f..794c499b37fd 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 67956dca58ac..f05b015ea7f8 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.8
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 >=dev-java/bcprov-1.50 dev-java/bcmail:1.45 >=dev-java/commons-logging-1.1.1:0 dev-java/icu4j:4 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8271b2d07b953e753109bd6446f66c60
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index 54b3a4931c67..670574ea6bbe 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2d68e303b386..2d41e42596f1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a91c01bebfdc..8288a8298231 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 212636b1d530..01d8a901adcc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cb06a7a6764c..9f82f9d02aae 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 415fb00fcbe1..7791c080361b 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 830a4c9f764f..7290694fdde7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2c44ccc98eed..4f112bea9937 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6583ddbf6707..835d191dff57 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b8bc7cb6d81a..dad2195c8344 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7798bf509e8d..b6b6ee994fbb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ed948ff4fe81..2d132d445292 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0aba9f7afc11..866d5baf95d0 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7f8a15bf33d1..e20dc8825ac0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6d31bbbd7c48..7a71b094d1bd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 238ba1be2218..ebc472aa012d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d35d54b63204..d810dece155d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8bd1d3384115..f1d704737a28 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2260bfa33203..1757291e9153 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e108b746d10d..0418fcb93686 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4cb338469bda..3c35fcd8317a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b3b39849873..cdd3d4fca787 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2403fb2109f5..4373c503d9d5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1e7f4b723759..815b646eea73 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 87bbae929927..bbc06c710375 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f38ea12451df..97107b100437 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 361410393303..1386b56edd8b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 55c340fb8541..b9e9f36aacf0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ba3e8c9a46bc..04b12749bf38 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 506af130329f..cd6aaf20485a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b9b2ab7426f5..ff8f8d3fd268 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11a43c2719851210cee0852e85243f26
diff --git a/metadata/md5-cache/dev-java/rhino-1.5.5-r4 b/metadata/md5-cache/dev-java/rhino-1.5.5-r4
index fa87bcd9632f..25004d715edd 100644
--- a/metadata/md5-cache/dev-java/rhino-1.5.5-r4
+++ b/metadata/md5-cache/dev-java/rhino-1.5.5-r4
@@ -8,5 +8,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1
 SLOT=1.5
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_5R5.zip http://dev.gentoo.org/~karltk/projects/java/distfiles/rhino-swing-ex-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51a9245b4a4beeb39e52928407abf5d2
diff --git a/metadata/md5-cache/dev-java/rhino-1.5.5-r5 b/metadata/md5-cache/dev-java/rhino-1.5.5-r5
index 085acbdcbb08..150ca33709fe 100644
--- a/metadata/md5-cache/dev-java/rhino-1.5.5-r5
+++ b/metadata/md5-cache/dev-java/rhino-1.5.5-r5
@@ -8,5 +8,5 @@ LICENSE=NPL-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=1.5
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_5R5.zip mirror://gentoo/rhino-swing-ex-1.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=031a58bd98048a644b45891b2f126463
diff --git a/metadata/md5-cache/dev-java/rhino-1.6.5 b/metadata/md5-cache/dev-java/rhino-1.6.5
index 970584c74419..e4dffab11bd6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4c640d2bc84a..11ecbb71bc59 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc8ca37dd2bf6749350ef91d0aad6522
diff --git a/metadata/md5-cache/dev-java/rngom-20051226 b/metadata/md5-cache/dev-java/rngom-20051226
index 4d298ae8c123..d9ba3b52ae62 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 36ee2dd85e1c..5a2c1ab165c9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9d142da4ad2e..4e7d1fdbe0f0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d9a5e95af75d..77d6008e780e 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.1.9-r1
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.1-7r2.zip
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 497e11894294..caa940caa19f 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.1.9-r1
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c05fb3884acc9351d65a4123279cb1c1
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 d5f64c7fb73a..98083b5c15ef 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6ef3c12685b7..d9c1b920d23b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 57038493269b..d19a9b337cc3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5b82530e27e7..97551cdd0526 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 018c5b9d5a9c..b49e7463ff06 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7bc3c203e80f..29b8edad87f9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab61720cb380..c6df2905ea11 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62f2f59c87c4..79777bef79b9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f87ca3b29a27..707acdb9dd55 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2fc85e80c992..5dc7bf7f4bfb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 63728e661c14..5e7383998773 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f0bd849cdd62..5aa22b7f5f42 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 11be672ece34..408eec13104d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=900bdacfe3a4be070d9234e12b158024
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index b33da1d6c101..59b70ea40969 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 43cf07c4228b..59d4507c01e5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 34368dcb8f9e..f2920b51f999 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8b2fefcec64f..3e209808874f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1210d429cda3c7c8dad37fb904d23fc0
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.4 b/metadata/md5-cache/dev-java/scala-bin-2.11.4
index 48f8bc864004..42115e6f78b4 100644
--- a/metadata/md5-cache/dev-java/scala-bin-2.11.4
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.4/scala-2.11.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f4ac62f04ff31fe9e6c833d89c78a09
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.5 b/metadata/md5-cache/dev-java/scala-bin-2.11.5
index fd36227073b4..7c662e792c39 100644
--- a/metadata/md5-cache/dev-java/scala-bin-2.11.5
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.5/scala-2.11.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c53f731dcb17ab266c72adfa24fb90c8
diff --git a/metadata/md5-cache/dev-java/scala-bin-2.11.6 b/metadata/md5-cache/dev-java/scala-bin-2.11.6
index ccbcf11273c5..ae5d69f3e506 100644
--- a/metadata/md5-cache/dev-java/scala-bin-2.11.6
+++ b/metadata/md5-cache/dev-java/scala-bin-2.11.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b5dfaf046e150097bdd3cc755bc4bee2
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index 1be3b10994da..19c417e7f867 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0173fd85c138..c734f8c582ee 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 395baea76215..eb9b08d5c334 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 150e7099d5f4..a48c5f0c4f82 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d422a68cea4c..a89980f078f4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 326ce341a278..35f95c6034b4 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3e0d4dc8a20d..7adccdc9a33e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7cf2d09fa7ae..39488329ea21 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7cac2e8f8a2e..de21d3cc5a02 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0ddf103fe2b4..ba80d37e18f0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9f8f1739de44..2ff00fd579df 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c2933a3425ad..f0f021df7c98 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f3db0628dbf8..6650889fab49 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61c4b035707395e073bc6251b3ac66fd
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 c55ff345e6b4..41f73e7284da 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77b91f853151..858dca82538e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fba6042df009..d2296cf7da5e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 463bc0bfc077..bcb2a3f14d73 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 616d32d7a2ae..1c47ebf9baba 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4a41a6122d1f..cca10db4db75 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 66e91d3520cf..d764a91f105c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1adc385d48b1..ff3db57f2395 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4682800977a6..a43f79bd6a2f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e9de8be4f1cd..11fe3a1f1c62 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c8344779acc9..65bd22d9c0c1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b881101165d6..6c4c9964e55d 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1abd6402044a..f91aab749c41 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1cbccdb83d7..f4f410d0bb7e 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bc5b5cabca36..f079289fb433 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f34621d06045..0d0342a96edb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 45a1ef273543..e77e01c993ea 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0e571145ceb7..beedd834e9a0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7d08810ff996..ec8f9c8e6f29 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0328ab638078..ab3ecd8f09ee 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acfbaf69016fa3a680f29b42e973dfb0
diff --git a/metadata/md5-cache/dev-java/spin-1.5 b/metadata/md5-cache/dev-java/spin-1.5
index a09db3ecbead..97c901c10952 100644
--- a/metadata/md5-cache/dev-java/spin-1.5
+++ b/metadata/md5-cache/dev-java/spin-1.5
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jre-1.4 =dev-java/cglib-2.1* >=dev-java/java-config-2.1.9-r1 s
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25b0fde4e9c7a92cfd3e51c8e2912620
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index d9a9de510553..ab584b99c4ee 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd85662c2866ab25bac4d54562e93f27
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 f6e72c176b81..e41a039f70eb 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ee83344e8749..339310fd3b3e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 99516d1a7ff9..87fd0604a0e2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a281160000e8..e3bcb8f81ac3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6df4b56a2e63..91d2ccb18891 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e180274d690b..8be148397b69 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e44b74ec0a32..525fe8885336 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c64ee15a6ad..56c47f1ade3c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d8aceefa6fd2..8ed9bfcf36bd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ec387b79d162..81c1eba1555b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7878a7d21c7c..61d5e1900991 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 39ea52c8cb0d..f97bfbdd12bb 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7eecc9de2935..b06944cc2755 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 85730e5f965e..fe2dd644a3b9 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1c627f39eb32..49b133e10164 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8b14489c5321..ef95d103bbdf 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bba060c4073e..ae8a0808e833 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 15cf7194abfe..37da508dee0f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e78acdf3a414..484e20ac4586 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d171561b9fa2..9df69406dd02 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1be145da4007..30141d9579d8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7323e429ac41..49f9c6b4a891 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ffc063ffed3d..ff78ed0f67f0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a1cdc0ef4eecde546a986f3e66649a2
diff --git a/metadata/md5-cache/dev-java/sun-j2me-bin-2.2-r3 b/metadata/md5-cache/dev-java/sun-j2me-bin-2.2-r3
index fe31797e56d9..da9520be9789 100644
--- a/metadata/md5-cache/dev-java/sun-j2me-bin-2.2-r3
+++ b/metadata/md5-cache/dev-java/sun-j2me-bin-2.2-r3
@@ -9,5 +9,5 @@ RDEPEND=dev-java/sun-jaf dev-java/sun-javamail dev-java/xsdlib >=virtual/jdk-1.4
 RESTRICT=fetch
 SLOT=0
 SRC_URI=j2me_wireless_toolkit-2_2-linux-i386.bin j2me_wireless_toolkit-2_2-update_2-linux.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb6d409bac702a478051eaf933440af9
diff --git a/metadata/md5-cache/dev-java/sun-j2me-bin-2.5.2.01 b/metadata/md5-cache/dev-java/sun-j2me-bin-2.5.2.01
index 5157f0851c39..39263fef7aa3 100644
--- a/metadata/md5-cache/dev-java/sun-j2me-bin-2.5.2.01
+++ b/metadata/md5-cache/dev-java/sun-j2me-bin-2.5.2.01
@@ -9,5 +9,5 @@ RDEPEND=dev-java/sun-jaf dev-java/sun-javamail dev-java/xsdlib >=virtual/jdk-1.4
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48bebf95a1e6acc2fae6806890d21793
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 489527e6f3fd..a0f531a5a2dc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a68999c8516c..671390ff249d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 13093f3d58bf..a074b769a755 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 22997507436e..1ae3a2361591 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3c1ca70557cb..c9980584686e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c62dc69c0e21..75c8e2fa3baa 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 712722a1f038..36eb04ce818b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 21be0fda42bc..bdce26025ec8 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jimi1_0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4d4bc89efc8a..19c9e3d99a73 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 46f74233e10b..4877e4dfc987 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.1.9-r1
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmx-1_2_1-ri.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 755661b15a56..87c9b9f7c6b3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 442b80a9b8d0..cfa787bd3b42 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e48289e15e80..3f227627f336 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2fce9babfcb3..f3de5aa014b2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7fa869e3f968..a942555ed349 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2ec0292659bd..3dd7a053ea8f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bab8626a9733..900b16fcb7e3 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f90fbd4fa5a2..e9d2465b9d4d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9db973969d22..0619e8cf8bac 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 718ed7a3064c..b0288e1d23e7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 512ee6b224b0..1dcb667bf8a4 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d6873e0b9c9a..3b2f4b5c0ecb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0ee3f1643e7f..448cd0357a78 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 426dc14f78d9..c8d7a90571b8 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 54b0f956a5f3..b2acdfd3b6a0 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 10eb2c08b1fb..0c9258f69bf8 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4e204b54e9297bf68f5a1b6512de58f
diff --git a/metadata/md5-cache/dev-java/tablelayout-20090826 b/metadata/md5-cache/dev-java/tablelayout-20090826
index b0e301491555..45ea723f7ca9 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5c75e293191..24616aea0285 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27e69106b810d45de286841cb8bdb69f
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 0a99a632ab9f..3ba8d2c38f8f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fcd96a8ec9b3..d020da68c0f5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 63704a8bbdb5..4904444a9a59 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 af7b7f15615d..2544ad463f15 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7027f7673117..a3b7690554ab 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 74fd297420ba..1b739c988071 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.1.9-r1
 SLOT=0
 SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc5e23cd3bb0572767d25baa08964357
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 ca15cb1e7de0..bdb71d3bc611 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 db71679e8dff..0637ee6031d2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9dbcf8486d9a..cd6dbcdd865c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a8cf7e2e3d4..b0b90481365f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fb422823b07f..20ac4acd47a2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7c432b6f597f..5864f38a57af 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-osgi	fb81d0ede6b5759b64ec19226fe6d2f2	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d013cd0385d3cc513948a84132088921
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41
index 5fea1e17c039..4a0251a3271f 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.41
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=250051766ebd2feaed8d8797ad12469d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43
index 5a5374d865a7..bb1fb09064e6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.43
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.43/src/apache-tomcat-6.0.43-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d1bb49489202c7434e755a80116bcd4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56
index 12ae23b046cb..9290fe4e6f19 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.56
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.56/src/apache-tomcat-7.0.56-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ab560ec97698254d922f3799fce7e21
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57
index 1eeed7b3abf8..9c61aa157ee1 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.57
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f08ca9d988cbdbe3a6d5d91423954ff5
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 64069af075d2..f871ff700ec7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c8405f2b411be4b2483c75e1ba966f5
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.18 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.18
index ec0c345a6421..fbe344709f37 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.18
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.18
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.18/src/apache-tomcat-8.0.18-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aadcb01c5ae753416748a7624ee3aa92
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.20 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.20
index d24ce503a335..14236fe1197c 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.20
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.20
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.20/src/apache-tomcat-8.0.20-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2585201dc2d063ece3a47468b42bfbcc
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.21 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.21
index 8ea9e0d701ff..456af18a7aa5 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.21
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.21/src/apache-tomcat-8.0.21-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a27ddf71338f5a6e218f4a63875d8447
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 85077b7dc8ff..726a85bf3505 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c70544db6a39..25c1b81fc7bc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0df3f5a0185d..e38acad6e915 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.1.9-r1 sourc
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d05d70a7e606..1a4729afb695 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4abd01c8cfbc..f63626ce8c1c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 edb737941e3a..45ee154a64fc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 529500518205..7950a8f05564 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cb97b8fc7e33..5c33fff891b8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e1667c87f7b8..b95a500df386 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f772bd75b5f6..4d08cc979454 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5d9214eb74b3..2dea02504e7b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b6151f3f12d..cfa6e41df6db 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 237a4c9094bd..0948349aee0a 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7fc3ef0ecaf5aa95715352e30bdfaff
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index e7a33d96d2d5..32fa46060c5e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c1a166d7044b..d3a25c4ec16b 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 50942396b47d..4958e584812c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3cfb316de828..96b835677518 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 019d3139b702..145d7692f076 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 db1537fc8967..6804589bccfc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 eab5aefaf5e8..679c525006af 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a398bddaa0f8..30b02239a8f4 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a58c5783edea..6eca21b1c6e5 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7244c6bb091af586ce50d5c875e9d4a5
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index f51c554b6105..2e09a95722e4 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.1.9-r1
 SLOT=1
 SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 106542964f61..e4381352d91a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3fa74811cd31..f2e3d42b5059 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b9180d06cc53..333e81a15229 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ea83a07d3314..6d95964fb2a2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9ba81a84122d..17f98996d61d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 badc2fd797ea..fba44721d662 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 418b8ef1e856..8db7947388cc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b83d8636facd..75fe15b81cb8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 94af14eaca06..8961dedb3a3d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a79cab94d1a6..3084ae228d71 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b7a8898feaea..a1e1001e1987 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1f8fb94dd893..e29da11c1316 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 016cdbcf53f5..c0c778ccd350 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 714e1783ab2f..f481a1af665f 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.1.9-r
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 86ff5e7c49f2..e32f9e24aabf 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 17d5a98f9e51..82fc4dcdb724 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
@@ -9,5 +9,5 @@ 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=76cd47d0733e9c052e72e3695e2dd77c
diff --git a/metadata/md5-cache/dev-java/xmlrpc-2.0.1 b/metadata/md5-cache/dev-java/xmlrpc-2.0.1
index 046fda1641a4..39d6e7facd7b 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-2.0.1
+++ b/metadata/md5-cache/dev-java/xmlrpc-2.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-httpclient-3* dev-java/commons-codec >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=090913baa6fd9d239e692ba57d898599
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index 05d6e3a6df9c..b99735cfa67c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6d0cb72c24d0421ec651f1cf77f0cf21
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412 b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412
index 69e0fc1aceaf..d851870d606d 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-0.5.20070412
@@ -8,5 +8,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 dev-java/sun-jaf dev-java/sjsxp dev-java/stax-ex >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://xmlstreambuffer.dev.java.net/files/documents/4258/55235/StreamBufferPackage_src_0.5_20070412_033857.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9eab0c6c64768e02226f64f9388781e8
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index 1a2d3718a545..cd55b9c2c7ca 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b562d62b846cdf373e61a695dddb6d0
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.3 b/metadata/md5-cache/dev-java/xmlunit-1.3
index 86e0b390a46d..4dba0e885d4d 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.1.9-r1 s
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e09b1e41056f..cebfb8bbf1bc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f28838b0c7e6..a98f56c0286f 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5494905796bd..606a093ae8b1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f29d5a4ac4ae..aafb0849d6b3 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 938b72a9c147..f20b12ebe721 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.1.9-r1 >=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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b5c0cfe30da3..927b3c2870ac 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1577fe010ee7..9ba41fcff14f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21c2ec3db2841ba3c7fbb0d349c0721f
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index cf81b81db766..0dd54ab9622f 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ddb12796956ee9a7df72b83d2c7d2a7
diff --git a/metadata/md5-cache/dev-java/xsom-20060901 b/metadata/md5-cache/dev-java/xsom-20060901
index d85c67a958c7..b320cdc4f66b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=53226150c56f530ecbf8319f749b19cb
diff --git a/metadata/md5-cache/dev-java/xstream-1.3.1-r1 b/metadata/md5-cache/dev-java/xstream-1.3.1-r1
index 28a035324d17..d68e9654e494 100644
--- a/metadata/md5-cache/dev-java/xstream-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/xstream-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/cglib:2.2 dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/joda-time:0 dev-java/xom:0 dev-java/xpp3:0 dev-java/xml-commons-external:1.3 dev-java/jettison:0 java-virtuals/stax-api >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=671e89b2968887f2364cc381bea62f1b
diff --git a/metadata/md5-cache/dev-java/xstream-1.3.1-r2 b/metadata/md5-cache/dev-java/xstream-1.3.1-r2
index 774373121870..8797b1f0e2e0 100644
--- a/metadata/md5-cache/dev-java/xstream-1.3.1-r2
+++ b/metadata/md5-cache/dev-java/xstream-1.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/joda-time:0 dev-java/xom:0 dev-java/xpp3:0 dev-java/xml-commons-external:1.3 dev-java/jettison:0 java-virtuals/stax-api >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d23ef0a4d144e66a4539eedef09bbf07
diff --git a/metadata/md5-cache/dev-java/xt-20051206-r2 b/metadata/md5-cache/dev-java/xt-20051206-r2
index 6b7e696ca470..713674c9c67e 100644
--- a/metadata/md5-cache/dev-java/xt-20051206-r2
+++ b/metadata/md5-cache/dev-java/xt-20051206-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/xp:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.blnz.com/xt/xt-20051206-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b3a68eb0ed9f9979738c5da8a42e30a
diff --git a/metadata/md5-cache/dev-java/xt-20051206-r3 b/metadata/md5-cache/dev-java/xt-20051206-r3
index c85b6b515753..d2f36ca0cccc 100644
--- a/metadata/md5-cache/dev-java/xt-20051206-r3
+++ b/metadata/md5-cache/dev-java/xt-20051206-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/xp:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.blnz.com/xt/xt-20051206-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78db4e3fd825d32541e783ba378f2c59
diff --git a/metadata/md5-cache/dev-java/xz-java-1.4 b/metadata/md5-cache/dev-java/xz-java-1.4
index 100ba9723fc2..3c026824cc6d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4d05f12c48f7..04ddb8dfc386 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 875403979b7e..ee6cfed0a477 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a207ab7e0b86..2f5a63885eef 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3ec721a8dc4e..61b4b7e3ee4b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 df364eee8027..4bcc28b2eaad 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 90d0d77db263..246496fa774c 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ba32690bcbf5..021a37807f73 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cc5020b0451e..d52e5c1d3640 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3b1ad9c1c100..4beb87a3e5be 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f73fe1bef70c..bf64cc803979 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 8ed233cfab9f..6b4aebff90f5 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 324b08190338..7342839ff278 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85c6e987619c0a2f2eb68a64ff251ad4
diff --git a/metadata/md5-cache/dev-lang/erlang-15.2.3.1 b/metadata/md5-cache/dev-lang/erlang-15.2.3.1
index a913dfca086d..04dcb7912c6a 100644
--- a/metadata/md5-cache/dev-lang/erlang-15.2.3.1
+++ b/metadata/md5-cache/dev-lang/erlang-15.2.3.1
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_R15B03-1.tar.gz http://erlang.org/download/otp_doc_man_R15B03-1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R15B03-1.tar.gz )
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=fa656acbae83ce3e233525cad8d2550b
diff --git a/metadata/md5-cache/dev-lang/erlang-16.3.1 b/metadata/md5-cache/dev-lang/erlang-16.3.1
index d40fa750ab06..1ccba6e32e2e 100644
--- a/metadata/md5-cache/dev-lang/erlang-16.3.1
+++ b/metadata/md5-cache/dev-lang/erlang-16.3.1
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_R16B03-1.tar.gz http://erlang.org/download/otp_doc_man_R16B03-1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R16B03-1.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=77615e1d68673c567019c64002965737
diff --git a/metadata/md5-cache/dev-lang/erlang-17.3 b/metadata/md5-cache/dev-lang/erlang-17.3
index 9d5f2dcd5e55..21dc7fe19d20 100644
--- a/metadata/md5-cache/dev-lang/erlang-17.3
+++ b/metadata/md5-cache/dev-lang/erlang-17.3
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_17.3.tar.gz http://erlang.org/download/otp_doc_man_17.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_17.3.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=7034136b984697563d7ab2674bca6836
diff --git a/metadata/md5-cache/dev-lang/erlang-17.4 b/metadata/md5-cache/dev-lang/erlang-17.4
index 0f353907ce70..6478d359202a 100644
--- a/metadata/md5-cache/dev-lang/erlang-17.4
+++ b/metadata/md5-cache/dev-lang/erlang-17.4
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_17.4.tar.gz http://erlang.org/download/otp_doc_man_17.4.tar.gz doc? ( http://erlang.org/download/otp_doc_html_17.4.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=160d2e227859b8e7f415fac93a3b2b30
diff --git a/metadata/md5-cache/dev-lang/erlang-17.5 b/metadata/md5-cache/dev-lang/erlang-17.5
index ad8e926afb28..7adea559ffe5 100644
--- a/metadata/md5-cache/dev-lang/erlang-17.5
+++ b/metadata/md5-cache/dev-lang/erlang-17.5
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_17.5.tar.gz http://erlang.org/download/otp_doc_man_17.5.tar.gz doc? ( http://erlang.org/download/otp_doc_html_17.5.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=545d404fbee44e1d040383d73d3885c4
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index d73fecc0aa12..375f6c2d6167 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=946e5e79a6bf2289852f7c1d27be3c69
diff --git a/metadata/md5-cache/dev-lang/mercury-11.01 b/metadata/md5-cache/dev-lang/mercury-11.01
index c82ac7845591..a349fbf05ff6 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.01
+++ b/metadata/md5-cache/dev-lang/mercury-11.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.01.tar.gz mirror://gentoo/mercury-11.01-gentoo-patchset-1.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.01.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bfcc66e7f2265d6880c442eea0c6258c
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07 b/metadata/md5-cache/dev-lang/mercury-11.07
index 0f65f75c321d..006f2841eccb 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07
+++ b/metadata/md5-cache/dev-lang/mercury-11.07
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.tar.gz mirror://gentoo/mercury-11.07-gentoo-patchset-0.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd17983c27917ae3410740e6c95a6bf1
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.1 b/metadata/md5-cache/dev-lang/mercury-11.07.1
index 7c6bd6bdf660..71f6525acdb2 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.1
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-4.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b803e4c2f2f9f0f9f7cf8513ea7cdd4
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.2 b/metadata/md5-cache/dev-lang/mercury-11.07.2
index 61be3a40f3da..807eedfa386e 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.2
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-compiler-11.07.2.tar.gz mirror://gentoo/mercury-11.07.2-gentoo-patchset-0.tar.gz test? ( mirror://gentoo/mercury-tests-11.07.2.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0558d705e972e4c9171c9d737c81d18d
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05 b/metadata/md5-cache/dev-lang/mercury-13.05
index 94c43dc71b4c..26dcf2ecac97 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05
+++ b/metadata/md5-cache/dev-lang/mercury-13.05
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.tar.gz mirror://gentoo/mercury-13.05-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=605367786f56c8b15dd9f3a3a3b43d68
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.1 b/metadata/md5-cache/dev-lang/mercury-13.05.1
index c43d6510277c..100537c56028 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05.1
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.1.tar.gz mirror://gentoo/mercury-13.05.1-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f4bdb49d5b6a2836b160d959b59b92a
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.2 b/metadata/md5-cache/dev-lang/mercury-13.05.2
index dee9b659ac9b..26710786f68b 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05.2
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.2.tar.gz mirror://gentoo/mercury-13.05.2-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9cc41e8f96dd3b5f8cc52d8f62d51e6d
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-9.1-r1 b/metadata/md5-cache/dev-lang/qu-prolog-9.1-r1
index ea47e022e6c4..54022c6e94e1 100644
--- a/metadata/md5-cache/dev-lang/qu-prolog-9.1-r1
+++ b/metadata/md5-cache/dev-lang/qu-prolog-9.1-r1
@@ -10,4 +10,4 @@ RDEPEND=!dev-util/mpatch !dev-util/rej qt4? ( dev-qt/qtgui:4 ) pedro? ( net-misc
 SLOT=0
 SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp9.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c8e61e3fd5dbaddc5ac4cc900086c0c1
+_md5_=2bdccffb9bf774e9e17d1f4f2a444a43
diff --git a/metadata/md5-cache/dev-lang/qu-prolog-9.5 b/metadata/md5-cache/dev-lang/qu-prolog-9.5
new file mode 100644
index 000000000000..ee0b6cfc69a4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/qu-prolog-9.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!dev-util/mpatch !dev-util/rej qt4? ( dev-qt/qtgui:4 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap ) dev-lang/perl
+DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
+EAPI=5
+HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
+IUSE=debug doc examples pedro qt4 readline threads
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Qu-Prolog GPL-2+
+RDEPEND=!dev-util/mpatch !dev-util/rej qt4? ( dev-qt/qtgui:4 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
+SLOT=0
+SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp9.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=2617a1bd33eacef36a2892e2f3b6b0b9
diff --git a/metadata/md5-cache/dev-lang/rust-1.0.0_alpha2 b/metadata/md5-cache/dev-lang/rust-1.0.0_alpha2
deleted file mode 100644
index 20857c2f0fe0..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.0.0_alpha2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.0 clang? ( sys-devel/clang ) system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=5
-HOMEPAGE=http://www.rust-lang.org/
-IUSE=clang debug doc libcxx +system-llvm
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0
-REQUIRED_USE=libcxx? ( clang )
-SLOT=1.0
-SRC_URI=http://static.rust-lang.org/dist/rustc-1.0.0-alpha.2-src.tar.gz x86? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-i386-191ed5ec4f17e32d36abeade55a1c6085e51245c.tar.bz2 ) amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-02-17-f1bb6c2-linux-x86_64-acec86045632f4f3f085c072ba696f889906dffe.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=804a6931992e0678389a1c3004216429
diff --git a/metadata/md5-cache/dev-lang/rust-1.0.0_beta b/metadata/md5-cache/dev-lang/rust-1.0.0_beta3
similarity index 61%
rename from metadata/md5-cache/dev-lang/rust-1.0.0_beta
rename to metadata/md5-cache/dev-lang/rust-1.0.0_beta3
index dd520c6cf08f..84e1e7d0c139 100644
--- a/metadata/md5-cache/dev-lang/rust-1.0.0_beta
+++ b/metadata/md5-cache/dev-lang/rust-1.0.0_beta3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.0 clang? ( sys-devel/clang ) system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
+DEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.3_pre20150428 !dev-lang/rust:0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.0 clang? ( sys-devel/clang ) system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=5
 HOMEPAGE=http://www.rust-lang.org/
 IUSE=clang debug doc libcxx +system-llvm
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0
+RDEPEND=libcxx? ( sys-libs/libcxx ) >=app-eselect/eselect-rust-0.3_pre20150428 !dev-lang/rust:0
 REQUIRED_USE=libcxx? ( clang )
 SLOT=1.0
-SRC_URI=http://static.rust-lang.org/dist/rustc-1.0.0-beta-src.tar.gz x86? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 ) amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 )
+SRC_URI=http://static.rust-lang.org/dist/rustc-1.0.0-beta.3-src.tar.gz x86? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-i386-1ef82402ed16f5a6d2f87a9a62eaa83170e249ec.tar.bz2 ) amd64? ( http://static.rust-lang.org/stage0-snapshots/rust-stage0-2015-03-27-5520801-linux-x86_64-ef2154372e97a3cb687897d027fd51c8f2c5f349.tar.bz2 )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=cfd1f859b67b871671692de964a3879b
+_md5_=c6aceb9975709e3ae0ceecffb9dec304
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta b/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta
deleted file mode 100644
index 7f5b2221224c..000000000000
--- a/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=>=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0 cargo-bundled? ( !dev-rust/cargo )
-DESCRIPTION=Systems programming language from Mozilla
-EAPI=5
-HOMEPAGE=http://www.rust-lang.org/
-IUSE=cargo-bundled doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=>=app-eselect/eselect-rust-0.2_pre20150206 !dev-lang/rust:0 cargo-bundled? ( !dev-rust/cargo )
-SLOT=0
-SRC_URI=amd64? ( http://static.rust-lang.org/dist/rust-1.0.0-beta-x86_64-unknown-linux-gnu.tar.gz ) x86? ( http://static.rust-lang.org/dist/rust-1.0.0-beta-i686-unknown-linux-gnu.tar.gz )
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=69db23f9ba014921c25dcabb57353b0d
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta3 b/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta3
new file mode 100644
index 000000000000..22692d05c9c1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.0.0_beta3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=app-eselect/eselect-rust-0.3_pre20150428 !dev-lang/rust:0
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=5
+HOMEPAGE=http://www.rust-lang.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-eselect/eselect-rust-0.3_pre20150428 !dev-lang/rust:0
+SLOT=0
+SRC_URI=amd64? ( http://static.rust-lang.org/dist/rustc-1.0.0-beta.3-x86_64-unknown-linux-gnu.tar.gz ) x86? ( http://static.rust-lang.org/dist/rustc-1.0.0-beta.3-i686-unknown-linux-gnu.tar.gz )
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=1d53f81e32e63382bbb73774c185d9a4
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 8fb0acb440e2..ec3256b198db 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5490a54f6f105b1350e528309092947
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 7f0b47b47b6b..9a3061301648 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=81a6dbaa2d8ae27eb5d20ac11635d72d
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 8f560afe6c7c..a6f833e6a523 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1d80a1e5ead899755e4d7a9f75a9146
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 175f0d7fb327..3772ef9f02b8 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8c47d154aa04d44d54a6334bf1fcdf6
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 17ac7eacfa45..799145cd9222 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f53e725355de9d021defc0df0dbe6fa
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 7984d86148c6..8f74e34ad1c7 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc30f78c9f3e99b893ebcd84e0d984e9
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.6 b/metadata/md5-cache/dev-lang/scala-2.11.6
index 02fbd8e781b0..32280e0811d0 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-java/scala-bin:0 >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6a90c222ffdd6a7f2be16a5812b26b6
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 18b7f7d96c63..102c03e3617c 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-java/scala-bin >=dev-java/java-config-2.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=039034d56e32c28a6dff46c4b64c196b
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.6.4 b/metadata/md5-cache/dev-lang/swi-prolog-6.6.4
deleted file mode 100644
index 896af2b00978..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.6.4.tar.gz mirror://gentoo/swi-prolog-6.6.4-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=41e86ca48270df99df7a91a04d83bc44
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.6.5 b/metadata/md5-cache/dev-lang/swi-prolog-6.6.5
deleted file mode 100644
index 5b713064512c..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.6.5.tar.gz mirror://gentoo/swi-prolog-6.6.5-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=23906f871213b43ca8291b7499792603
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.6.6 b/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
index 0998872ab0cc..4c3fb6a6c824 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
@@ -9,5 +9,5 @@ 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.6.6.tar.gz mirror://gentoo/swi-prolog-6.6.6-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cecfef0a1c43e84eae9eeda5aa45cca2
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.31 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.31
deleted file mode 100644
index fb739efc562a..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.31.tar.gz mirror://gentoo/swi-prolog-7.1.31-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8d3482ee5c53713be37b6ad0fa44a81b
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.32 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.32
deleted file mode 100644
index 3ad4adeaf41b..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.32
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.32.tar.gz mirror://gentoo/swi-prolog-7.1.32-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d78097059108ce3432f8e26d972cd6eb
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.33 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.33
deleted file mode 100644
index 29c83bba98e1..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.33.tar.gz mirror://gentoo/swi-prolog-7.1.33-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f5e5b9cbcb4bb38e0da6ad95836326a0
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.34 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.34
deleted file mode 100644
index e6f8a09167f1..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.34.tar.gz mirror://gentoo/swi-prolog-7.1.34-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c6a3da94c48eaeec3ead6b188bb02557
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.35 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.35
deleted file mode 100644
index e0eb2c71b2ad..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.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.1.9-r1 )
-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.1.9-r1 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/pl-7.1.35.tar.gz mirror://gentoo/swi-prolog-7.1.35-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=32fe835e1a30f8b7437de9940c5b613f
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.36 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.36
index 9d632226975d..138cd9555aeb 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.36
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.1.36
@@ -9,5 +9,5 @@ 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.1.9-r1 )
 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
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a36d7d0b1b93931e76e42c475721d5c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.1.37 b/metadata/md5-cache/dev-lang/swi-prolog-7.1.37
index 2f319875ed00..d6470a3678d0 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.1.37
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.1.37
@@ -9,5 +9,5 @@ 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.1.9-r1 )
 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
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da8f4a9f0ea9a119d8d3a547a4bc20f4
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 24304ff35a8b..d66405957aa4 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 730057fec6fd..eb9fd982ede0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b051ba8ae2f2..4139bef6f5dc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 23707c0316eb..c97863ff6275 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1ff1a18d4392..a8869c7b4f02 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a413028dfb39..b8b11dfce632 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa8c48c17bdfe70725cec8f0837b0c74
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.5 b/metadata/md5-cache/dev-lang/xsb-3.3.5
index 1ea37273b6a2..4244d99d015c 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.5
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB335.tar.gz mirror://gentoo/xsb-3.3.5-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f4623c7d952637eea4edca107a06e09
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.6 b/metadata/md5-cache/dev-lang/xsb-3.3.6
index b20c9dac8796..cc1e315ccf1d 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.6
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB336.tar.gz mirror://gentoo/xsb-3.3.6-gentoo-patchset-1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ac5c2ba59964d94fac2c419870b350c3
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.7 b/metadata/md5-cache/dev-lang/xsb-3.3.7
index 04e20ebbcc59..a30819f775bb 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.7
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB337.tar.gz mirror://gentoo/xsb-3.3.7-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f6c6a4ffe1bd7fc8a9d5b53f627a24f
diff --git a/metadata/md5-cache/dev-lang/xsb-3.5.0 b/metadata/md5-cache/dev-lang/xsb-3.5.0
index 1df36bda81bb..1f5c067a54ad 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.5.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB350.tar.gz mirror://gentoo/xsb-3.5.0-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5f4daa63e3463312db00ffc3f04e3ac
diff --git a/metadata/md5-cache/dev-lang/yap-6.2.2 b/metadata/md5-cache/dev-lang/yap-6.2.2
index b8f99c45b9d1..c1fd0f72263d 100644
--- a/metadata/md5-cache/dev-lang/yap-6.2.2
+++ b/metadata/md5-cache/dev-lang/yap-6.2.2
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.2.2.tar.gz mirror://gentoo/yap-6.2.2-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a4449f4be0135eae37bc43782009dda
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.2 b/metadata/md5-cache/dev-lang/yap-6.3.2
index ce68e4d749cb..bee85779dab2 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.2
+++ b/metadata/md5-cache/dev-lang/yap-6.3.2
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.2.tar.gz mirror://gentoo/yap-6.3.2-gentoo-patchset-6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90acf3335fd7f1ebbd89ef2a1a5eca1d
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.3 b/metadata/md5-cache/dev-lang/yap-6.3.3
index 6fd7e76c563d..d41a0f85d4bd 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.3
+++ b/metadata/md5-cache/dev-lang/yap-6.3.3
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.3.tar.gz mirror://gentoo/yap-6.3.3-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09e516c75f3e989528624c08a13f79f6
diff --git a/metadata/md5-cache/dev-libs/Ice-3.5.1 b/metadata/md5-cache/dev-libs/Ice-3.5.1
index bd543b0bbc48..b21baef7f7a4 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.5.1
+++ b/metadata/md5-cache/dev-libs/Ice-3.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 >=dev-libs/openssl-0.9.8o:0 || ( sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) ~dev-cpp/libmcpp-2.7.2 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) ruby? ( dev-lang/ruby:1.9 ) mono? ( dev-lang/mono ) !dev-python/IcePy !dev-ruby/IceRuby
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.pdf )
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fafccf57bc0a9dec928f719dd8a30c58
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
index 5171ade37de9..a15bfac673e3 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d5c1880fbe849efa546da4296c1bd77
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index 5252653364ae..795d327e9803 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -7,5 +7,5 @@ IUSE=doc java opengl elibc_FreeBSD java
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=848911ace395714bc06938f7244c519d
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
index 9e1bbcfcb1e3..a479def2d16c 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b4786af1a1b0b4ebb2007194475dff8
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 3fa272c2617e..55343b8b598b 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -7,5 +7,5 @@ IUSE=doc java neon opengl static-libs elibc_FreeBSD java
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b4bc07e1fdc740d952ca02a21ff2592
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
index ae0d1234afdf..5aec15adedf8 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jre-1
 REQUIRED_USE=cxx? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b435641996054497e16b5d6ccee57688
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
index a64dafe66a5e..73d0cfb4c059 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) java? ( >=virtual/jre
 REQUIRED_USE=cxx? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ebab171cf4d713484ccb04e2b6144fdc
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r2 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r2
index 10eb52b62871..2dbce2c55f2a 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r2
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) python? ( >=dev-lang/
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d78c80cdd0006b2e5899a9a820b7e30e
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
index 853d519b35d5..38b41ef1c570 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) python? ( >=dev-lang/
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5bb71801710fd8d96df9c9c750af7398
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r7 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r7
index 4c6ec33f77f4..196efb0941f9 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r7
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.23-r7
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz ntlm_unsupported_patch? ( mirror://gentoo/cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b36429dd2c1ac7c83f142b87667b3b4e
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
index ae1c55b99796..f29f876a3d70 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c64d90babdd462ba70b6e6175aa2ad0
diff --git a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2 b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
index 713d910e70e3..1c8cbe065b10 100644
--- a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
@@ -9,5 +9,5 @@ LICENSE=Sleepycat Apache-1.1 BSD
 RDEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl:0= ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build(-)] java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=147827790cc8eb5ed73bc6ee6c649143
diff --git a/metadata/md5-cache/dev-libs/link-grammar-4.8.6 b/metadata/md5-cache/dev-libs/link-grammar-4.8.6
index 62462b25f31b..6ef209ba6566 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-4.8.6
+++ b/metadata/md5-cache/dev-libs/link-grammar-4.8.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/link-grammar/4.8.6/link-grammar-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=214e7fd5dfed17e175a366fa708d3051
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.0a b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
index 05024707bc69..4837d9f4bfc6 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.0a
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.0a
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.0a.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0dc718dc8e02d1b3bd9d7d8d7e428e6
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.1 b/metadata/md5-cache/dev-libs/protobuf-2.4.1
index da51ff45fba8..ef9d2d74520a 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils	92e738ea29389cb3f34778d7a349ac71	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dc5a4c8cfdfbc966e313a35ed02101f
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0 b/metadata/md5-cache/dev-libs/protobuf-2.5.0
index 8943abc0f1bd..0bf7842e6538 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8eccf20d9a05cd78847d2e5229c42355
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r1 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r1
index 8bcd75fb468c..8c88c548aad1 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7dbaddba61c4aecfc2395c83b728027
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
index b013969e5755..93a4fdaf5fa6 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69f025b2698f311ac6595d2738a65793
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r3 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r3
index 94dcb9bf9ec6..00ee3d0ef702 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r3
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c8e03274ff6b0efe8e0c30d57623d91
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.0 b/metadata/md5-cache/dev-libs/protobuf-2.6.0
index 5ef81177261b..b5680f32e775 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.0
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://protobuf.googlecode.com/svn/rc/protobuf-2.6.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d76ba48c8374b260c68d8ef8f5302b99
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1 b/metadata/md5-cache/dev-libs/protobuf-2.6.1
index 34b4d546d17b..62046e48a543 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d557107932fb2a1703d7e6448b2a7fb7
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r1 b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r1
index 4a1f6ca6cb79..472d04a66ef6 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e2a688e13c64ceeaa440f5ad0e74026
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r2 b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r2
index d759d7b66519..9f7e0ff4c269 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54b0ddc494dc147df4c7777235d5decd
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
index d66f313ae104..be579c1eb8cd 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a2bf2913d47e5bf29e2007a6ebd179e
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
index 825481f388b5..5e911f1056f2 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.2.19* lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/pe
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.19/xapian-bindings-1.2.19.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f24e277d7e1185f845f5cebe065827d2
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.20 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.20
index 7a44f8a1cba1..dfa8a66b8ae6 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.20
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.20
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.2.20* lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:=
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.20/xapian-bindings-1.2.20.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=892eee271b384df4041819ec6e79640b
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.3.2 b/metadata/md5-cache/dev-libs/xapian-bindings-1.3.2
index 7a888649b4a8..044cef68e365 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.3.2
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.3.2
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.3.2* lua? ( dev-lang/lua:= ) mono? ( >=dev-lang/mono-
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) php? ( || ( php_targets_php5-4 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.3.2/xapian-bindings-1.3.2.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0a3a165cca8ecae0a576c1efd22bc780
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.2.20 b/metadata/md5-cache/dev-libs/xmlsec-1.2.20
index ac652b946743..b2386b279c61 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.2.20
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.2.20
@@ -4,11 +4,11 @@ DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting
 EAPI=5
 HOMEPAGE=http://www.aleksey.com/xmlsec
 IUSE=doc gcrypt gnutls nss +openssl static-libs
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 ) gnutls? ( >=net-libs/gnutls-2.8.0 ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( >=dev-libs/openssl-0.9.7 )
 REQUIRED_USE=|| ( gcrypt gnutls nss openssl ) gnutls? ( gcrypt )
 SLOT=0
 SRC_URI=http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.20.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=4d4d8ad5a4bcd8a97188edb37a06fa1f
+_md5_=c1bc3ccf491c49539a6865155d3dd16b
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 c63c3ee9c729..137f5f0ed56b 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.1.9-r1
 SLOT=0
 SRC_URI=http://armedbear.org/abcl-0.0.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6e4ddaee0223..0480f4e5cef7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a9f181981147456abb1354168d8489e
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.140.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.140.0
index c177554a6158..40955bbd5c30 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.140.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Execute code after a scope finished compilation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/B-Hooks-EndOfScope/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Scalar-List-Utils >=dev-perl/Module-Implementation-0.50.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Sub-Exporter-Progressive-0.1.6 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.14.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=a151c8a25f13855e1064d16b5dbcb2cf
+_md5_=cf70f12e1adc90de4645123ef3f10dff
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.230.0 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.300.0
similarity index 75%
rename from metadata/md5-cache/dev-perl/CPAN-Changes-0.230.0
rename to metadata/md5-cache/dev-perl/CPAN-Changes-0.300.0
index 0d0252f2cdcf..b23d1cf3e6fc 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.230.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.300.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Text-Tabs+Wrap >=virtual/perl-version-0.790.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 virtual/perl-Test-Simple dev-lang/perl:=[-build(-)]
+DEPEND=virtual/perl-Text-Tabs+Wrap >=virtual/perl-version-0.790.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Read and write Changes files
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Changes/
+IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Text-Tabs+Wrap >=virtual/perl-version-0.790.0 dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.23.tar.gz
+SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.30.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=ffdc6148ef2fd669a846642f277fee9a
+_md5_=b77e348ef890b9a1eca0591724e8fd2d
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-1.980.0 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-2.140.0
similarity index 75%
rename from metadata/md5-cache/dev-perl/CPAN-Perl-Releases-1.980.0
rename to metadata/md5-cache/dev-perl/CPAN-Perl-Releases-2.140.0
index 4f34b9ac60de..7c832e02c452 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-1.980.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-2.140.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:=[-build(-)]
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Perl-Releases/
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-1.98.tar.gz
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-2.14.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=751a5e2c80e9df842d38ecebca4dc69b
+_md5_=01974bad12a9e5e678a87ae4e43c97d2
diff --git a/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0 b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
new file mode 100644
index 000000000000..40420b42a809
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/CQL-Parser-1.130.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Class-Accessor-0.100.0 >=dev-perl/Clone-0.150.0 >=dev-perl/String-Tokenizer-0.50.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=compiles CQL strings into parse trees of Node subtypes
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/CQL-Parser/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Class-Accessor-0.100.0 >=dev-perl/Clone-0.150.0 >=dev-perl/String-Tokenizer-0.50.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BR/BRICAS/CQL-Parser-1.13.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=cb70a342bd9fd67b7dff8e2e96ee0659
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.220.0 b/metadata/md5-cache/dev-perl/Class-Load-0.220.0
index 702990ab118d..c38cb071cbdf 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.220.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=A working (require q{Class::Name}) and more
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Class-Load/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-OptList virtual/perl-Exporter >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-perl/namespace-clean dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.22.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=87334d764a8d9b79db655e54f02242f4
+_md5_=b05c36f7c6a44a4d9d7bb65355cfa55d
diff --git a/metadata/md5-cache/dev-perl/class-returnvalue-0.550.0-r1 b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
similarity index 95%
rename from metadata/md5-cache/dev-perl/class-returnvalue-0.550.0-r1
rename to metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
index a7fa3eacad69..06ed003705a3 100644
--- a/metadata/md5-cache/dev-perl/class-returnvalue-0.550.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-ReturnValue-0.550.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Devel-StackTrace dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=504dd81b5b94b37584fab4cc791d4765
+_md5_=09f92157f0a930de3ea29b9b7d9394dd
diff --git a/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.120.0 b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.120.0
new file mode 100644
index 000000000000..799ec7ea5c08
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-Rijndael-1.120.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Crypt::CBC compliant Rijndael encryption module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Crypt-Rijndael/
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=LGPL-3
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Crypt-Rijndael-1.12.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=14a9739f91e9e1fdcc064ec9242291cd
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.640.0 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.640.0
index 406f48227b3b..17000ee10811 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.640.0
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.640.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/openssl-0.9.7c virtual/perl-MIME-Base64 test? ( dev-perl/Try-Tiny ) dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-libs/openssl-0.9.7c:0 virtual/perl-MIME-Base64 test? ( dev-perl/Try-Tiny ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Crypt::SSLeay module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Crypt-SSLeay/
@@ -7,8 +7,8 @@ IUSE=test
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 PDEPEND=dev-perl/libwww-perl
-RDEPEND=>=dev-libs/openssl-0.9.7c virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-libs/openssl-0.9.7c:0 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=53481b79b886313386fc3fa60016309a
+_md5_=f1b51dfe98eb611a9bae1eec7ccfbad4
diff --git a/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0 b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0
new file mode 100644
index 000000000000..47cb69a8dae4
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-SSLeay-0.720.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/openssl-0.9.7c:0 virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker >=virtual/perl-ExtUtils-CBuilder-0.280.205 virtual/perl-Getopt-Long >=dev-perl/Path-Class-0.260.0 >=dev-perl/Try-Tiny-0.190.0 test? ( >=virtual/perl-Test-Simple-0.190.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=OpenSSL support for LWP
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Crypt-SSLeay/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Artistic-2
+PDEPEND=dev-perl/libwww-perl >=dev-perl/LWP-Protocol-https-6.20.0
+RDEPEND=>=dev-libs/openssl-0.9.7c:0 virtual/perl-MIME-Base64 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=3216cc27b9acb1e9352723b8f13ac85f
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.210.0-r1 b/metadata/md5-cache/dev-perl/Data-ICal-0.210.0-r1
index d0a6cd537cf8..507a5d7e8120 100644
--- a/metadata/md5-cache/dev-perl/Data-ICal-0.210.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.210.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Accessor dev-perl/class-returnvalue dev-perl/Text-vFile-asData test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Warn dev-perl/Test-NoWarnings dev-perl/Test-LongString ) dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Warn dev-perl/Test-NoWarnings dev-perl/Test-LongString ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Generates iCalendar (RFC 2445) calendar files
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-ICal/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor dev-perl/class-returnvalue dev-perl/Text-vFile-asData dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.21.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=28a5faf7f7c0239ccb688855b0306114
+_md5_=f6e6bf282610b4b8fa57e6ff7cdf3908
diff --git a/metadata/md5-cache/dev-perl/Data-ICal-0.220.0 b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
new file mode 100644
index 000000000000..1b39b852a73d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-ICal-0.220.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData >=virtual/perl-ExtUtils-MakeMaker-6.360.0 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Warn dev-perl/Test-NoWarnings dev-perl/Test-LongString virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Generates iCalendar (RFC 2445) calendar files
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Data-ICal/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor dev-perl/Class-ReturnValue dev-perl/Text-vFile-asData dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=9cb876bc6748c196094c3d5aa8d7d0ce
diff --git a/metadata/md5-cache/dev-perl/Data-UUID-1.220.0 b/metadata/md5-cache/dev-perl/Data-UUID-1.220.0
new file mode 100644
index 000000000000..87776936ce43
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-UUID-1.220.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Digest-MD5 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl extension for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Data-UUID/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/perl-Digest-MD5 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.220.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=103dc44c2078c1eef2c7fe183efe3a9f
diff --git a/metadata/md5-cache/dev-perl/Date-Calc-6.400.0 b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
new file mode 100644
index 000000000000..671973755209
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Date-Calc-6.400.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Bit-Vector-7.400.0 >=dev-perl/Carp-Clan-6.40.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Gregorian calendar date calculations
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Date-Calc/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ ) LGPL-2
+RDEPEND=>=dev-perl/Bit-Vector-7.400.0 >=dev-perl/Carp-Clan-6.40.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=e2f6bae35674d0c6492649bb261b73f4
diff --git a/metadata/md5-cache/dev-perl/DateManip-6.490.0 b/metadata/md5-cache/dev-perl/DateManip-6.490.0
new file mode 100644
index 000000000000..40025f7be57e
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateManip-6.490.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-IO virtual/perl-Storable >=virtual/perl-Module-Build-0.210.0 test? ( dev-perl/Test-Pod dev-perl/Test-Pod-Coverage dev-perl/Test-Inter ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl date manipulation routines
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Date-Manip/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-IO virtual/perl-Storable dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.49.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=ff17ecc250509e85d144f1a4aeb462ad
diff --git a/metadata/md5-cache/dev-perl/DateTime-1.180.0 b/metadata/md5-cache/dev-perl/DateTime-1.180.0
new file mode 100644
index 000000000000..655f8eef859b
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-1.180.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-0.760.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader >=virtual/perl-Module-Build-0.280.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Storable dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-Warnings-0.5.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=A date and time object
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DateTime/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-Locale-0.410.0 >=dev-perl/DateTime-TimeZone-1.740.0 >=dev-perl/Params-Validate-0.760.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.18.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=089615bd5aff24af71d8012611a7c15f
diff --git a/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.120.0 b/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.120.0
new file mode 100644
index 000000000000..ddcb8d4a3c07
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Event-ICal-0.120.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Perl DateTime extension for computing rfc2445 recurrences
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Event-ICal/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Event-Recurrence-0.110.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.12.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=1025e0fd4fcaf87c3de1c446e2c75df5
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.240.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.260.0
similarity index 66%
rename from metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.240.0
rename to metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.260.0
index 8a9815599c5b..f6b7a5e61ec2 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.240.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Flexible-0.260.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.74 dev-perl/DateTime-TimeZone virtual/perl-Module-Pluggable test? ( dev-perl/Test-MockTime ) dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils virtual/perl-Module-Pluggable virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-MockTime >=virtual/perl-Test-Simple-0.440.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Flexibly parse strings and turn them into DateTime objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Flexible/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.74 dev-perl/DateTime-TimeZone virtual/perl-Module-Pluggable dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/DateTime >=dev-perl/DateTime-Format-Builder-0.740.0 dev-perl/DateTime-TimeZone dev-perl/List-MoreUtils virtual/perl-Module-Pluggable dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.24.tar.gz
+SRC_URI=mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.26.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=4a73a7b6d124d3b8d681f3badb99d736
+_md5_=43c2a8e35f55be8274ef1de1fc8aedf3
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0 b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
new file mode 100644
index 000000000000..ddbf4e459bb2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-HTTP-0.420.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 >=virtual/perl-Module-Build-0.380.0 test? ( >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Date conversion routines
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-HTTP/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DateTime-0.170.0 >=dev-perl/HTTP-Date-1.440.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=ed35a93f6338393adddf61769b4cace3
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.401.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.401.0
new file mode 100644
index 000000000000..effb62e864e0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Mail-0.401.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp >=dev-perl/DateTime-0.180.0 dev-perl/Params-Validate virtual/perl-File-Spec >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Convert between DateTime and RFC2822/822 formats
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Mail/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-0.180.0 dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.401.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=d449ad60f7cc75f6ade11c0b0a06a065
diff --git a/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0 b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0
new file mode 100644
index 000000000000..415df05422cb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/DateTime-Format-Strptime-1.560.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-0.450.0 >=dev-perl/DateTime-TimeZone-0.790.0 virtual/perl-Exporter >=dev-perl/Params-Validate-0.640.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Parse and Format DateTimes using Strptime
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/DateTime-Format-Strptime/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp >=dev-perl/DateTime-1 >=dev-perl/DateTime-Locale-0.450.0 >=dev-perl/DateTime-TimeZone-0.790.0 virtual/perl-Exporter >=dev-perl/Params-Validate-0.640.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.56.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=b33518a88ec33273e5491e1c8cd23662
diff --git a/metadata/md5-cache/dev-perl/DateTime-Set-0.310.0 b/metadata/md5-cache/dev-perl/DateTime-Set-0.340.0
similarity index 54%
rename from metadata/md5-cache/dev-perl/DateTime-Set-0.310.0
rename to metadata/md5-cache/dev-perl/DateTime-Set-0.340.0
index 376f23de3177..2367796cae8c 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Set-0.310.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Set-0.340.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/DateTime-0.12 >=dev-perl/Set-Infinite-0.59 dev-perl/Params-Validate virtual/perl-Module-Build dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/DateTime-0.120.0 >=dev-perl/Set-Infinite-0.590.0 dev-perl/Params-Validate virtual/perl-Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Datetime sets and set math
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DateTime-Set/
+IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/DateTime-0.12 >=dev-perl/Set-Infinite-0.59 dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/DateTime-0.120.0 >=dev-perl/Set-Infinite-0.590.0 dev-perl/Params-Validate dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.31.tar.gz
+SRC_URI=mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3400.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=30816fce5eee7dcc506bd25b16565bbe
+_md5_=f3337238cc81b48e9378bf2f5b86f39a
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.600.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.600.0
deleted file mode 100644
index e02ece676430..000000000000
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.600.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Load >=dev-perl/Params-Validate-0.720.0 >=dev-perl/Class-Singleton-1.30.0 >=virtual/perl-ExtUtils-MakeMaker-6.310.0 test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Time zone object base class and factory
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/DateTime-TimeZone/
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Load >=dev-perl/Params-Validate-0.720.0 >=dev-perl/Class-Singleton-1.30.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.60.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=34b6baa8e053f6ae438bf19298b52849
diff --git a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.640.0 b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.880.0
similarity index 51%
rename from metadata/md5-cache/dev-perl/DateTime-TimeZone-1.640.0
rename to metadata/md5-cache/dev-perl/DateTime-TimeZone-1.880.0
index c2f813873f4c..7c2833a931c9 100644
--- a/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.640.0
+++ b/metadata/md5-cache/dev-perl/DateTime-TimeZone-1.880.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Load >=dev-perl/Params-Validate-0.720.0 >=dev-perl/Class-Singleton-1.30.0 >=virtual/perl-ExtUtils-MakeMaker-6.310.0 test? ( >=virtual/perl-Test-Simple-0.920.0 ) dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/List-AllUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Storable dev-perl/Test-Fatal dev-perl/Test-Requires >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Time zone object base class and factory
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DateTime-TimeZone/
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Load >=dev-perl/Params-Validate-0.720.0 >=dev-perl/Class-Singleton-1.30.0 dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/Class-Singleton-1.30.0 virtual/perl-File-Spec dev-perl/List-AllUtils virtual/perl-Scalar-List-Utils dev-perl/Module-Runtime >=dev-perl/Params-Validate-0.720.0 dev-perl/Try-Tiny virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.64.tar.gz
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-1.88.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=96d813b4064332106440a7963e4d3702
+_md5_=bc0a60613a57c28ecd33d7ffde8816e8
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0 b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
index 5c84ca9c4d06..77d65bcd8def 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Config-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper for perl's configuration
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Config/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.30 virtual/perl-Data-Dumper dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.007.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=03667facd9fb7b8cd15c9195d990f4e2
+_md5_=5910572144fb516ad56e39dc7a66df25
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0 b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
index 11180153b661..f0c3b48fcb62 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Various portability utilities for module builders
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-Helpers/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec >=virtual/perl-Text-ParseWords-3.240.0 virtual/perl-Module-Load dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=d0277fa25506248f69cc68e6cd1ecb80
+_md5_=8382baa0f6523d3fd2f94c6304b95c67
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0 b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
index 224ca1964346..7b22b99b14ad 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-InstallPaths-0.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build.PL install path logic made easy
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ExtUtils-InstallPaths/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=>=dev-perl/ExtUtils-Config-0.2.0 virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.010.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=b9e7e6025ae346e4b6fd90a88a7ef07a
+_md5_=da72c481636f403b36a0e07ca9ac3532
diff --git a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0 b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
index 3c8b899aa756..1b5b35c8d6d2 100644
--- a/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
+++ b/metadata/md5-cache/dev-perl/Module-Build-Tiny-0.39.0
@@ -4,10 +4,10 @@ DESCRIPTION=A tiny replacement for Module::Build
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Module-Build-Tiny/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-CPAN-Meta >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-CBuilder >=dev-perl/ExtUtils-Config-0.3.0 >=dev-perl/ExtUtils-Helpers-0.20.0 virtual/perl-ExtUtils-Install >=dev-perl/ExtUtils-InstallPaths-0.2.0 virtual/perl-ExtUtils-ParseXS virtual/perl-File-Path virtual/perl-File-Spec >=virtual/perl-Getopt-Long-2.360.0 >=virtual/perl-JSON-PP-2.0.0 virtual/perl-podlators virtual/perl-Test-Harness dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9c3a34b65ad386c49df9a32309b0d1fc
+_md5_=d8e948ac5db030755212539c16fa98d2
diff --git a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0 b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0
index 00a82de1b712..8747a0e20a3d 100644
--- a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0
+++ b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.630.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/class-returnvalue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
+DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Encapsulate SQL queries and rows in simple perl objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
 IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/class-returnvalue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/DBIx-SearchBuilder-1.63.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=e03730faa65b99fd090ff2731ca41d45
+_md5_=b0d53a4c97fde4550b9df53b30831279
diff --git a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0 b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0
index e24725dc5e7c..731390bf3ebe 100644
--- a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0
+++ b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.650.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/class-returnvalue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
+DEPEND=test? ( dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-perl/DBD-SQLite >=virtual/perl-Test-Simple-0.520.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Encapsulate SQL queries and rows in simple perl objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
 IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/class-returnvalue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 dev-perl/Clone dev-perl/Class-Accessor >=dev-perl/Class-ReturnValue-0.400.0 >=dev-perl/capitalization-0.30.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/DBIx-SearchBuilder-1.65.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=469acac400da5865163bc11afd9101a6
+_md5_=dfd3cf1ae61bdfe9f7b09b69f2a15250
diff --git a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.660.0 b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.660.0
index f138c3ddcaf7..759132f50f73 100644
--- a/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.660.0
+++ b/metadata/md5-cache/dev-perl/dbix-searchbuilder-1.660.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/class-returnvalue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=virtual/perl-Test-Simple-0.520.0 dev-perl/DBD-SQLite virtual/perl-File-Temp ) dev-lang/perl:=[-build(-)]
+DEPEND=test? ( >=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want >=virtual/perl-Test-Simple-0.520.0 dev-perl/DBD-SQLite virtual/perl-File-Temp ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Encapsulate SQL queries and rows in simple Perl objects
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBIx-SearchBuilder/
 IUSE=test
 KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/class-returnvalue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-perl/Cache-Simple-TimedExpiry-0.210.0 >=dev-perl/capitalization-0.30.0 >=dev-perl/Class-ReturnValue-0.400.0 dev-perl/Class-Accessor dev-perl/Clone dev-perl/DBI dev-perl/DBIx-DBSchema dev-perl/Want dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=c3cd8015ed3f90350946393cf08c022e
+_md5_=a9aa27e23176324a3ba953008a38778c
diff --git a/metadata/md5-cache/dev-perl/namespace-clean-0.240.0-r1 b/metadata/md5-cache/dev-perl/namespace-clean-0.240.0-r1
index b2c667173ed6..79408c97f5a4 100644
--- a/metadata/md5-cache/dev-perl/namespace-clean-0.240.0-r1
+++ b/metadata/md5-cache/dev-perl/namespace-clean-0.240.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Keep imports and functions out of your namespace
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/namespace-clean/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Hooks-EndOfScope-0.120.0 >=dev-perl/Package-Stash-0.220.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.24.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=284f0e724f08be837ba7c054a364402a
+_md5_=7c91a9c9d493eed3ef767af73293b006
diff --git a/metadata/md5-cache/dev-python/docker-py-1.1.0 b/metadata/md5-cache/dev-python/docker-py-1.1.0
deleted file mode 100644
index ca5b49c3f6d3..000000000000
--- a/metadata/md5-cache/dev-python/docker-py-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] doc? ( >=dev-python/mkdocs-0.9[python_targets_python2_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/coverage-3.7.1 >=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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python client for Docker.
-EAPI=5
-HOMEPAGE=https://github.com/docker/docker-py
-IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND==dev-python/requests-2.5*[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.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/six-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/websocket-client-0.11.0[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/d/docker-py/docker-py-1.1.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=51b045c6613229fda20484761b2f4267
diff --git a/metadata/md5-cache/dev-python/docker-py-1.2.1 b/metadata/md5-cache/dev-python/docker-py-1.2.1
new file mode 100644
index 000000000000..e21921ecdb4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/docker-py-1.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( >=dev-python/mkdocs-0.9[python_targets_python2_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/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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python client for Docker.
+EAPI=5
+HOMEPAGE=https://github.com/docker/docker-py
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.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/six-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/websocket-client-0.11.0[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/docker/docker-py/archive/1.2.1.tar.gz -> docker-py-1.2.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=6168f799202df789993f3a9c6994e255
diff --git a/metadata/md5-cache/dev-python/livereload-2.3.2 b/metadata/md5-cache/dev-python/livereload-2.3.2
new file mode 100644
index 000000000000..110d145f830c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/livereload-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python LiveReload is an awesome tool for web developers
+EAPI=5
+HOMEPAGE=https://github.com/lepture/python-livereload
+IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=www-servers/tornado[python_targets_python2_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=https://github.com/lepture/python-livereload/archive/v2.3.2.tar.gz -> livereload-2.3.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=fc3e1487698cbd0cd39a36418ad1a20a
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.12.2 b/metadata/md5-cache/dev-python/mkdocs-0.12.2
new file mode 100644
index 000000000000..08b6e34d5991
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-0.12.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_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/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Project documentation with Markdown.
+EAPI=5
+HOMEPAGE=http://www.mkdocs.org
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=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/ghp-import-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/jinja-2.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/livereload-2.3.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/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/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(-)] 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/tomchristie/mkdocs/archive/0.12.2.tar.gz -> mkdocs-0.12.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=543d596cb010996a3afdcab826577035
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.1 b/metadata/md5-cache/dev-python/pyGPG-0.1
index fc18de3c8bec..79a899d5bfd4 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.1
+++ b/metadata/md5-cache/dev-python/pyGPG-0.1
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface wrapper for gnupg's gpg command
 EAPI=5
 HOMEPAGE=https://github.com/dol-sen/pyGPG
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~x86
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=1cfa4fc4b2d46973269f237e0129ddec
+_md5_=e8f1f41fd4ed676f314833e7b653f341
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-0.9.0 b/metadata/md5-cache/dev-python/python-saharaclient-0.9.0
new file mode 100644
index 000000000000..360ff6e9f45c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-saharaclient-0.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare 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(-)] test? ( >=dev-python/hacking-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/hacking-0.11[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/mock-1.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-sphinx-2.5.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-3[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-swiftclient-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-mock-0.6.0[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/tempest-lib-0.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(-)] ) 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=This is a client for the OpenStack Sahara API, aka HADOOP
+EAPI=5
+HOMEPAGE=https://github.com/openstack/python-saharaclient
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/Babel-1.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-i18n-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/python-keystoneclient-1.1.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/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-0.9.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=f90ae3018ece8f1f882caba9cf9e0c4b
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
index 22c964e56942..7feeae351333 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/dbf[ruby_targets_ruby19] dev-ruby/nokogi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=150545797a51f3ef1484049b377dad3f
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3 b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
index 77c2c80d87e3..496e4b556d31 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/dbf[ruby_targets_ruby19] dev-ruby/nokogi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e91b6aa9604d7a1e9e7a0e0a9365502c
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
index 20650edb7fd5..bd31c4709a34 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09dcb3c60f746535ac05a4307df8c34d
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
index 04f2b21bdd76..4b65b834d569 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03143a73aa7d49dc28b9ddc07ec1b6a6
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
index 789607be5c9e..cbc58d6d77d0 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dddf1e140157917f3507133b83812f68
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
index dee22ee359ab..81d1011bd0d6 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=93649999094ff1161d82bba9c9400fea
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
index 7ef431f88df1..74eb63387806 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fd1425c7b01a0625f39cc2988d38764
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
index d04aed385aa0..3bf9819db501 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b731ae0f6f7646b40812ee0087583e3
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index d8d78e4e5dd1..38ca598c7029 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3cff4b3ead8503f0eaa396394ce41d3d
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.2.21 b/metadata/md5-cache/dev-ruby/actionmailer-3.2.21
index 1e05e9330524..e3670bc4c67e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.2.21
+++ b/metadata/md5-cache/dev-ruby/actionmailer-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.21[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc11e8c665a55f64420805929a6cc96d
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.0.12 b/metadata/md5-cache/dev-ruby/actionmailer-4.0.12
index 901bd63a199d..038a1b51563e 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.0.12
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.0.12[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46e37f71da01251a00b0434fb71db7cd
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.0.13 b/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
index 04baa4fc3004..b19a92bda794 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.0.13[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43db1c3d16aaba2819017b54359da531
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.1.10 b/metadata/md5-cache/dev-ruby/actionmailer-4.1.10
index faeea63aacaa..b2ae74d7ad60 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.1.10
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=31b7c3b46ae2a3c3d5ed41df774f8a2e
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.1.8 b/metadata/md5-cache/dev-ruby/actionmailer-4.1.8
index a3cbeff543f6..d33fc0ea93f9 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.1.8
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.1.8[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e7c435002af9d1c15088e41c46f9aa4
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.1.9 b/metadata/md5-cache/dev-ruby/actionmailer-4.1.9
index 31f7f867872a..0eeb84dedab4 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.1.9
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.1.9[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27951948e3a6979b38da7c7662e35374
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.0 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.0
index 6ec955a19507..1402e5560fe4 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.0
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.2.0[ruby_targets_ruby19] ~
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cfe44f49e1fb7d7cdeeb966928985a60
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.1 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.1
index 314f6140bd20..5b7c1cf6057a 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby19] ~
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=16999d9a1a5053ca5700ebdbe5df6c4c
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.2.21 b/metadata/md5-cache/dev-ruby/actionpack-3.2.21
index fee23811eeea..fa32312df3a0 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-3.2.21
+++ b/metadata/md5-cache/dev-ruby/actionpack-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.21[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc9cbc9cc5e7336d9a493728fe75e121
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.0.12 b/metadata/md5-cache/dev-ruby/actionpack-4.0.12
index a4a80ae404b6..4e4faa32a563 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.0.12
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.12[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c03c8c78412cb4486ff48d6e60b9ad80
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.0.13 b/metadata/md5-cache/dev-ruby/actionpack-4.0.13
index 805cb1556c22..f9f964dfc83c 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.0.13
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=016c2a2569871461dc449dac20e9d0c3
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.1.10 b/metadata/md5-cache/dev-ruby/actionpack-4.1.10
index e08fe09a4b97..9212903ab6d7 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.1.10
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48e04bf6feac7a1f1a6b85efa3aeacb0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.1.8 b/metadata/md5-cache/dev-ruby/actionpack-4.1.8
index 0d352feb731d..5aac38483305 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.1.8
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.8[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b63eff6281e3b102ca322d75ccde510
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.1.9 b/metadata/md5-cache/dev-ruby/actionpack-4.1.9
index dc3dfcbed5d5..b89ef616e058 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.1.9
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.9[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=451ae1c220a846982ebc0cf9ca21c29b
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.0 b/metadata/md5-cache/dev-ruby/actionpack-4.2.0
index a061ef2d03db..d801ab6f84aa 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8c402a9e26a7ce23cfa6edcd3d91d25
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.1 b/metadata/md5-cache/dev-ruby/actionpack-4.2.1
index 079b5fbe1eda..8d0227b0d360 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=116437ebb38591ebb1d79f57673a70e5
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.1.10 b/metadata/md5-cache/dev-ruby/actionview-4.1.10
index 9baffbd04f5d..28dc545914be 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.1.10
+++ b/metadata/md5-cache/dev-ruby/actionview-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e61f0b8bb68ee4b89bce7585e66c7ed6
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.1.8 b/metadata/md5-cache/dev-ruby/actionview-4.1.8
index a6270320025c..e7b88030ea88 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.1.8
+++ b/metadata/md5-cache/dev-ruby/actionview-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.8[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f7bd05dfe8c829f7ed8870dc24e485a
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.1.9 b/metadata/md5-cache/dev-ruby/actionview-4.1.9
index 5452235859b0..baa799c89d8a 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.1.9
+++ b/metadata/md5-cache/dev-ruby/actionview-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.9[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55dcf9c2146a18af14154d33f2cafc42
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.0 b/metadata/md5-cache/dev-ruby/actionview-4.2.0
index 806565479e3c..612e0ce52249 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.0
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=71a5af5a186e9c88035b296d4dfd95cc
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.1 b/metadata/md5-cache/dev-ruby/actionview-4.2.1
index 72924612ef32..59b0cb5a96e2 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.1
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12cd12d7bbaf4f6f4116fcd6dcd4a036
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.0 b/metadata/md5-cache/dev-ruby/activejob-4.2.0
index 6aaddd0ff990..655623b5948d 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.0
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e23148a6c3a2f189890f386e603ab53
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.1 b/metadata/md5-cache/dev-ruby/activejob-4.2.1
index 8cd297b535b3..d9be945d74f9 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.1
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6ac67243f2cd7f0eff8cca8783425fd
diff --git a/metadata/md5-cache/dev-ruby/activeldap-3.2.2 b/metadata/md5-cache/dev-ruby/activeldap-3.2.2
index d23228654489..d250cb2e9e24 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-3.2.2
+++ b/metadata/md5-cache/dev-ruby/activeldap-3.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://rubygems/activeldap-3.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9721778fab13ab8f960c7bf34445a3a7
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.4 b/metadata/md5-cache/dev-ruby/activeldap-4.0.4
index ce5ef83ff426..afa9f9d6e73e 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.4
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://rubygems/activeldap-4.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=86ba04e10948a02583eb509ca3198c7e
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.2.21 b/metadata/md5-cache/dev-ruby/activemodel-3.2.21
index 453ee8e330c7..4c6a7e06acde 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-3.2.21
+++ b/metadata/md5-cache/dev-ruby/activemodel-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.21[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=59960179fa77052e5706de388fd4f8ee
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.0.12 b/metadata/md5-cache/dev-ruby/activemodel-4.0.12
index c425434781d6..3b1304c8ba44 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.0.12
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.12[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1287f5db0466d2e2ccd943009b528c06
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.0.13 b/metadata/md5-cache/dev-ruby/activemodel-4.0.13
index fd14851e5ee6..af3231cd8b4e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.0.13
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ecd3bc475f4532ce3184e1b0116eeef5
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.1.10 b/metadata/md5-cache/dev-ruby/activemodel-4.1.10
index 498dc3aa927c..e8c265983745 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.1.10
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66ab73054f60f687068596418d16cb2d
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.1.8 b/metadata/md5-cache/dev-ruby/activemodel-4.1.8
index 3eae6f16d0ae..69379d852a4c 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.1.8
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.8[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=283151c2042f93965e8e8ccc47d3669c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.1.9 b/metadata/md5-cache/dev-ruby/activemodel-4.1.9
index 4ee712ceb10e..d68840f9fc63 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.1.9
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.9[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8244f228f9842c0f05e314970a813f5
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.0 b/metadata/md5-cache/dev-ruby/activemodel-4.2.0
index 55e899ffde8a..0d60a63a89fd 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.0
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da4bfd28316abb6dd899e1a381acaad7
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.1 b/metadata/md5-cache/dev-ruby/activemodel-4.2.1
index db7d7ede034c..7ff388f54aba 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e099c1b529c83d68077390ea7d820c03
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.2.21 b/metadata/md5-cache/dev-ruby/activerecord-3.2.21
index f3921b5b1ba1..0b7d63c58ada 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-3.2.21
+++ b/metadata/md5-cache/dev-ruby/activerecord-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.21[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b21e73852ccbffad926191a56cb1c4f
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.0.12 b/metadata/md5-cache/dev-ruby/activerecord-4.0.12
index fd5d58acc9f4..d8053c056bee 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.0.12
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.12[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15de31e03c8cf6b25e309e89bab7d443
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.0.13 b/metadata/md5-cache/dev-ruby/activerecord-4.0.13
index 02e6d47b3ad6..91e43504836d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.0.13
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f4a1e3d5e88c685a2b4843e44eef9e1
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.1.10 b/metadata/md5-cache/dev-ruby/activerecord-4.1.10
index d2f2893987c5..b179d09d5a6d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.1.10
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f0a111b7ff15b1b455f8d58bee55d8c
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.1.8 b/metadata/md5-cache/dev-ruby/activerecord-4.1.8
index b122163d8127..d65133470c7c 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.1.8
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.8[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80cab384e9dbb408799c5b996221780a
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.1.9 b/metadata/md5-cache/dev-ruby/activerecord-4.1.9
index d8233633f781..77c3ccfe6493 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.1.9
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.9[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79e0cb2e2982a3f3f26945f9da729318
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.0 b/metadata/md5-cache/dev-ruby/activerecord-4.2.0
index 5623d3bdbb21..ca2b06346af4 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.0
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcb66018c1ac9645bdd59ed2dc338402
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.1 b/metadata/md5-cache/dev-ruby/activerecord-4.2.1
index 574c9366d852..782e6138e04e 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e5c7e47375fa2057c9b46c3a1747a8e
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.3 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.3
index 973fddd362af..2a894e61503d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.3
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/activerecord-deprecated_finders-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f2991ce7d7070b86f7881a3b2be34ed4
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index 9ff56aef7bd5..d9c1dfbc869d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df46edf6ffcc3abf39a71835b6d3d400
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.2.21 b/metadata/md5-cache/dev-ruby/activeresource-3.2.21
index 23e4c7c6e899..97bbb6debf6f 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-3.2.21
+++ b/metadata/md5-cache/dev-ruby/activeresource-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.21[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88320d1af5c6235bbc7b0042e25206f2
diff --git a/metadata/md5-cache/dev-ruby/activeresource-4.0.0 b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
index 44ea972b7a40..cfa2c669b257 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-4.0.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activesupport-4*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=http://github.com/rails/activeresource/archive/v4.0.0.tar.gz -> activeresource-4.0.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9c5606024208599e0b5d2f972ab69a2
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.2.21 b/metadata/md5-cache/dev-ruby/activesupport-3.2.21
index 312416673cad..21bd421933d7 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-3.2.21
+++ b/metadata/md5-cache/dev-ruby/activesupport-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd23c0a4b86de311c8e7aa0240a6edaf
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.12 b/metadata/md5-cache/dev-ruby/activesupport-4.0.12
index 57674a82b3ae..41a193ed6b10 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.0.12
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1464f9150ba25e242b153c87ba8ae628
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.13 b/metadata/md5-cache/dev-ruby/activesupport-4.0.13
index 34ff126c2974..825c1884f89c 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.0.13
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7177f7916b538cd0273dff74d4a0551f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.1.10 b/metadata/md5-cache/dev-ruby/activesupport-4.1.10
index 34f6147980ff..27841dc2d967 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.1.10
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc1bb44d294cd714bf79db13704517db
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.1.8 b/metadata/md5-cache/dev-ruby/activesupport-4.1.8
index cea90ac2ecbb..9b97eb051b37 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.1.8
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=085d5f4317bcc59d3127f98f886752a5
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.1.9 b/metadata/md5-cache/dev-ruby/activesupport-4.1.9
index 8672a44913e8..867f039d5d2d 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.1.9
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be92b970da25363ae96550b8a3ac3c67
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.0 b/metadata/md5-cache/dev-ruby/activesupport-4.2.0
index c26bc2389cb4..0bdd56796b8b 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.0
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21d6ac57e29f8b6e5fbdf6ee51e4d864
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.1 b/metadata/md5-cache/dev-ruby/activesupport-4.2.1
index 64df218d734e..1acd4165a7f4 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9bcf93bf160eb8a0e8502f7f3e2de3e
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.4.0 b/metadata/md5-cache/dev-ruby/acts_as_list-0.4.0
deleted file mode 100644
index 73ad64e50867..000000000000
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/activerecord:3.2[ruby_targets_ruby19,sqlite3] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord:3.2[ruby_targets_ruby20,sqlite3] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
-EAPI=5
-HOMEPAGE=http://rake.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=3
-SRC_URI=mirror://rubygems/acts_as_list-0.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=183520d7cca1335bec9e7e544f752880
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0 b/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0
deleted file mode 100644
index fa6317f3e03c..000000000000
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/activerecord:3.2[ruby_targets_ruby19,sqlite3] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord:3.2[ruby_targets_ruby20,sqlite3] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
-EAPI=5
-HOMEPAGE=https://github.com/swanandp/acts_as_list
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~x86 ~x86-macos
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
-SLOT=3
-SRC_URI=mirror://rubygems/acts_as_list-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e54a86cab8044176f10cd7007b012584
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.6.0 b/metadata/md5-cache/dev-ruby/acts_as_list-0.6.0
index e06ddf0edbc6..04a32771ba89 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.6.0
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b70410245edcbf95d2866d586b3d7e9
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.7.0 b/metadata/md5-cache/dev-ruby/acts_as_list-0.7.0
new file mode 100644
index 000000000000..2e1be3811617
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/activerecord:3.2[ruby_targets_ruby19,sqlite3] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord:3.2[ruby_targets_ruby20,sqlite3] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Capabilities for sorting and reordering a number of objects in a list
+EAPI=5
+HOMEPAGE=https://github.com/swanandp/acts_as_list
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
+SLOT=3
+SRC_URI=mirror://rubygems/acts_as_list-0.7.0.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b70498e95e079ba2a5ea442a58fb3d0e
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.3.6 b/metadata/md5-cache/dev-ruby/addressable-2.3.6
index 7739c3acebcb..6d85ef834e04 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.3.6
+++ b/metadata/md5-cache/dev-ruby/addressable-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.3.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55ad40e42ff4be7515f1c2052b3476dd
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.3.7 b/metadata/md5-cache/dev-ruby/addressable-2.3.7
index 3fc081301ea8..6afa37f5d1fb 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.3.7
+++ b/metadata/md5-cache/dev-ruby/addressable-2.3.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.3.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e32fa052bb63211ae65a1114066cc758
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.3.8 b/metadata/md5-cache/dev-ruby/addressable-2.3.8
index a6dbfa0859d1..9b5d0d755ea4 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.3.8
+++ b/metadata/md5-cache/dev-ruby/addressable-2.3.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.3.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=252b1f1880044d3c175d58f159bff84c
diff --git a/metadata/md5-cache/dev-ruby/adhearsion-1.2.6 b/metadata/md5-cache/dev-ruby/adhearsion-1.2.6
index 42208d4e929d..dac15eeca8dd 100644
--- a/metadata/md5-cache/dev-ruby/adhearsion-1.2.6
+++ b/metadata/md5-cache/dev-ruby/adhearsion-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-2.1.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/adhearsion/adhearsion/tarball/1.2.6 -> adhearsion-1.2.6.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dba97d59baa1489a5d3131712b22d6d5
diff --git a/metadata/md5-cache/dev-ruby/adhearsion-loquacious-1.9.3 b/metadata/md5-cache/dev-ruby/adhearsion-loquacious-1.9.3
index 5e18a7b7cb93..e883b0dc0608 100644
--- a/metadata/md5-cache/dev-ruby/adhearsion-loquacious-1.9.3
+++ b/metadata/md5-cache/dev-ruby/adhearsion-loquacious-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/adhearsion-loquacious-1.9.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=01e8b8b2a0b4339c18c24fce6ef60f73
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index 9d956e5484b2..e3c1080be777 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ae-1.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7188382592536e352aab12a43abf04f1
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index ef16de9d7ea4..232083dd6f8b 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/afm-0.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b6ee7865ea9de916588b08ebc8e0045
diff --git a/metadata/md5-cache/dev-ruby/akismet-1.0.2 b/metadata/md5-cache/dev-ruby/akismet-1.0.2
index a1045e1bf9d8..9fa3cbbf29df 100644
--- a/metadata/md5-cache/dev-ruby/akismet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/akismet-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jonahb/akismet/archive/v1.0.2.tar.gz -> akismet-1.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=626868f2de310b7f201df85a97b83f1b
diff --git a/metadata/md5-cache/dev-ruby/akismet-2.0.0 b/metadata/md5-cache/dev-ruby/akismet-2.0.0
index 4b2ce1d449bb..5a1d3193290a 100644
--- a/metadata/md5-cache/dev-ruby/akismet-2.0.0
+++ b/metadata/md5-cache/dev-ruby/akismet-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/jonahb/akismet/archive/v2.0.0.tar.gz -> akismet-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dce7f7312ba3c645aa1a8b52eda772b3
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
index 5a1ff221656b..ca847c45bf17 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e54369b0eda42514096a1c1a518816ba
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 845899e3f65b..99dd807baec4 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c91e3cb20c1a16f5dcf2bd0c4307d27
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.3.0 b/metadata/md5-cache/dev-ruby/amatch-0.3.0
index de7e04182c9a..d30c41a6b4d9 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.3.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/tins-0.3[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d43c2e02bfebe8582f3b2cf7a4334420
diff --git a/metadata/md5-cache/dev-ruby/ammeter-0.2.9 b/metadata/md5-cache/dev-ruby/ammeter-0.2.9
index 707f8a3eb3e9..b3751b4ace58 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-0.2.9
+++ b/metadata/md5-cache/dev-ruby/ammeter-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-0.2.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=021b8122494036be125c224b65f90f5b
diff --git a/metadata/md5-cache/dev-ruby/ammeter-0.2.9-r1 b/metadata/md5-cache/dev-ruby/ammeter-0.2.9-r1
index 9243676060d0..045865a9b5fe 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-0.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/ammeter-0.2.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-0.2.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b8bb8ea24d759171722382351894522
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.2 b/metadata/md5-cache/dev-ruby/ammeter-1.1.2
index fd85cde169fd..d83e0feb9b16 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.2
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=168a6d21a24f4f6287ae733b03cd6592
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
index 2a097da813f4..52fd2390a477 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-client-1.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4b8bb318fd4a98102c8740eac571e7
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2 b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
index 4d076788fdc0..2250b3aaf85b 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-protocol-1.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=065ac33bb4b8c954824c192077284149
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.4.0 b/metadata/md5-cache/dev-ruby/amqp-1.4.0
index 8c99c062ef24..64fe7bc71f10 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.4.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/amqp-1.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6ddfbc8fdd3390180287f2d31ec4e194
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.5.0 b/metadata/md5-cache/dev-ruby/amqp-1.5.0
index 3b036208aa69..c3b79fc3cb1f 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.5.0
+++ b/metadata/md5-cache/dev-ruby/amqp-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/amqp-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b3cdecacf068835e45bd549d0589bd1
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index bb4a10aca78f..e003d6c25278 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/annoy-0.5.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f24de99f81b021b84e3f7ee1fcfa072
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index fa1280fd0bfa..e13ba8b188a3 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ansi-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a31a17358dc3f19d3070c9839eafeaa0
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
index 2e5c8e047239..6551a4cd03e8 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8b300a5b2ae1f58d3a07af7527caa40
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
index 0a37b8a0eeef..3b643b2deec7 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b3d3364803fc902ea89ab5f02766aea0
diff --git a/metadata/md5-cache/dev-ruby/arel-3.0.2-r2 b/metadata/md5-cache/dev-ruby/arel-3.0.2-r2
index b35fbc93b4ce..acd45fd6d80a 100644
--- a/metadata/md5-cache/dev-ruby/arel-3.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/arel-3.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.0
 SRC_URI=mirror://rubygems/arel-3.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=529838512b2b80309d21007be01c6b45
diff --git a/metadata/md5-cache/dev-ruby/arel-4.0.2 b/metadata/md5-cache/dev-ruby/arel-4.0.2
index 64d5c6505f11..7016797856e1 100644
--- a/metadata/md5-cache/dev-ruby/arel-4.0.2
+++ b/metadata/md5-cache/dev-ruby/arel-4.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-5.2:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby19] >=dev-ruby/minitest-5.2:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby20] >=dev-ruby/minitest-5.2:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby21] ) test? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby21] >=dev-ruby/minitest-5.2:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby22] ) test? ( >=dev-ruby/hoe-3.3.1[ruby_targets_ruby22] >=dev-ruby/minitest-5.2:5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Arel is a Relational Algebra for Ruby
 EAPI=5
 HOMEPAGE=http://github.com/rails/arel
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/arel-4.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a5e76ed4537f157e559c7eeb0bab7d7c
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=70322267d781dbb99ef8692e2049e51f
diff --git a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214 b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
index 3032398becbe..2042df36f045 100644
--- a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
+++ b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/arel-5.0.1.20140414130214.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c33c9078394ef58436370504366c5fa0
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.0 b/metadata/md5-cache/dev-ruby/arel-6.0.0
index 9404d3cf225c..c48488957e69 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.0.tar.gz -> arel-6.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=405048d6d3ba112d128aca0fd8958ce0
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2 b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
index 958007ec34bc..223c7b2551b7 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/Ascii85-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=765fbefb0cc0619b0d9e8e6d1fe05a84
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
index 9be2ad0a1755..7d6c678c2977 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-util/cucumber[ruby_targets_ruby19] dev-ruby/coderay[ruby_targets_ruby19] dev-ruby/erubis[ruby_targets_ruby19] dev-ruby/haml[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/slim[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-util/cucumber[ruby_targets_ruby20] dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] dev-ruby/haml[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/slim[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-util/cucumber[ruby_targets_ruby19] dev-ruby/rspec-expectations:*[ruby_targets_ruby19] dev-ruby/coderay[ruby_targets_ruby19] dev-ruby/erubis[ruby_targets_ruby19] dev-ruby/haml[ruby_targets_ruby19] dev-ruby/nokogiri[ruby_targets_ruby19] dev-ruby/slim[ruby_targets_ruby19] dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-util/cucumber[ruby_targets_ruby20] dev-ruby/rspec-expectations:*[ruby_targets_ruby20] dev-ruby/coderay[ruby_targets_ruby20] dev-ruby/erubis[ruby_targets_ruby20] dev-ruby/haml[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] dev-ruby/slim[ruby_targets_ruby20] dev-ruby/tilt[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Processor for converting AsciiDoc source files or strings into HTML 5, DocBook 4.5 and other formats
 EAPI=5
 HOMEPAGE=https://github.com/asciidoctor/asciidoctor
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.2.tar.gz -> asciidoctor-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e8d9442841272cf5a740768929cf092a
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6c4e2fba81e4f1ccaa0d4a0927843235
diff --git a/metadata/md5-cache/dev-ruby/ast-2.0.0 b/metadata/md5-cache/dev-ruby/ast-2.0.0
index 56f4f09a2730..8b95c29bf93f 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.0.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ast-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95e9259f9fcebd9045b12ebf26cacd51
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.0 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
index 99071c657e49..30e9fafb874f 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=667f80b08a9b96d3cf1e9db3d7704e0b
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.1.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.1.0
index ac440bcc55a2..94ab76633a4c 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.1.0
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.1.0.tar.gz -> async_sinatra-1.1.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=108af43a1bb4d49a248d7f6d9d82a8f3
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.16 b/metadata/md5-cache/dev-ruby/atomic-1.1.16
index 0ce603800ee3..37c326287e7c 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.16
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.16
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.16.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c52b057e87ecb59b3492f8b7a8c96aa
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index f9d919d41d8f..838b1cc36cbb 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.99.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a0869a5c18d8200b588c76bdb5ee9c8
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2 b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
index d8ecc92177bb..2f9b08b9564a 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/awesome_print-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=003b02918eb304dc0095800f45af1805
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.6.1 b/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
index f4fda5f94493..a14a9ad2ef72 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/awesome_print-1.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e80492d86f353c6b2bc909c6dc97fcc0
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 14328bafcdbc..8097fb9aaa15 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/aws-s3-0.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14c0a9d5e776b6a0c4075f7ed259273e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-1.8.3.1 b/metadata/md5-cache/dev-ruby/aws-sdk-1.8.3.1
index 70f4a6687b1f..5edd62c09e9d 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-1.8.3.1
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-1.8.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/1.8.3.1.tar.gz -> aws-sdk-ruby-1.8.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08eeadb796706584ac01aceb4298dce1
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-1.8.4 b/metadata/md5-cache/dev-ruby/aws-sdk-1.8.4
index 336f1f9d6689..9b01e5c068da 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-1.8.4
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/1.8.4.tar.gz -> aws-sdk-ruby-1.8.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1597a8b9e8501b5a944404b76f5e6711
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r1 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r1
index 6735e6c2e881..88f8b5b9202d 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08cf025929d92e7ae7c1b482e208892e
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index e2386bc4f2b2..4529e8eeeebe 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce73e194d927f11bf645025f4edb56f7
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.2 b/metadata/md5-cache/dev-ruby/barby-0.6.2
index 5bc9c7f4d80d..feff66047125 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.2
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/891b15594b34229b8bdb267c10ab5b5309c03320.tar.gz -> barby-0.6.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a11ca67f35db0b3df943d1e57a84e4fa
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2
index 6c68fc0c078f..71268363c799 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby19? ( dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=02e93593a7b728107f9412dd78499be9
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
index c6a602ba9768..4a273cf867d2 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A pipe to browser utility for use at the shell and within editors li
 EAPI=5
 HOMEPAGE=http://github.com/rtomayko/bcat
 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
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=31de7617d6b529c828887c424d681f20
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=85d011e97b30278e0c3c3e524cccfe6a
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index bf30560d461e..91e28c2dc4dc 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby19? ( dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8c7a821497c85cf62043243ca049bc2
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
index 7981bf85c251..579df4296c80 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbe57a5665a28f9bd3d10811561c5592
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
index 6ec0a7e14b46..e49c13a2c158 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4eaae239bf5519fec99fb78a4dbe4ae
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-2.1.0 b/metadata/md5-cache/dev-ruby/best_in_place-2.1.0
index 3f17c2d0ac0e..f88d04f27611 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-2.1.0
+++ b/metadata/md5-cache/dev-ruby/best_in_place-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rails-3.1[ruby_targets_ruby19] dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/best_in_place-2.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a26e64978d6b2849e4859f7b3dd5816b
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
index 6f854478714a..bc8f263cb198 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/binding_of_caller-0.7.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7eedd437c94c15cdac792dc05d3f84c9
diff --git a/metadata/md5-cache/dev-ruby/bitescript-0.0.9 b/metadata/md5-cache/dev-ruby/bitescript-0.0.9
index 4cb76db8981c..b9c2b8b4a219 100644
--- a/metadata/md5-cache/dev-ruby/bitescript-0.0.9
+++ b/metadata/md5-cache/dev-ruby/bitescript-0.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bitescript-0.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f1c625a6a7ef9f406d7335a5ded56d7
diff --git a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4 b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
index b0e038789e80..28f67b53760e 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
+++ b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/blankslate-2.1.2.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd8ff68299d2ca2474b70e967d15554e
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.2 b/metadata/md5-cache/dev-ruby/blankslate-3.1.2
index 523a068ffc83..badc55a2eb06 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.2
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df720d630d0f9e3c2b3940f89ef49587
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 5e66e22e96cd..a66988198713 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a480a1e98ba21992ee2d1874b1c7ab7
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
index 40d23570cb3c..6e3019f49f54 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9375ed9cd3f042a5f4e1ce2e4fdd2242
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
index a7a6fc4c5bb5..a54834679da9 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ac6548a4cdd8132b56e1d08ce5316e30
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.1-r1 b/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
index aa82a477d3fb..f05531307597 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e27080bf691b4dfe6e3c71328479e7d
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.3 b/metadata/md5-cache/dev-ruby/bones-3.8.3
index 2c2f49ab3279..8143c0973bfc 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.3
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=832c2441f75301aa7653273011c28d28
diff --git a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1 b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
index f7a9818acfe9..e25848f36268 100644
--- a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
+++ b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bouncy-castle-java-1.5.0146.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27ff2d29d9d731837ed3aeb3fbb3893e
diff --git a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147 b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
index 1ac480de3732..a894d8ab1d67 100644
--- a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
+++ b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bouncy-castle-java-1.5.0147.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd60f7d9ce1d2ee1cd6f0222c26558a4
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
index 1caf6145e9b5..4ba70444c15b 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60a1ba9926f5039ac42c0b509307e4e6
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.6.0 b/metadata/md5-cache/dev-ruby/bourne-1.6.0
index 2c92ab8d2e87..d89cc9479598 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.6.0
+++ b/metadata/md5-cache/dev-ruby/bourne-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=edecaf7fa645c750080f45fdf1408ca0
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index 95b9b2c36253..26523f6582e2 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/brass-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07ff5b9111345c65b6cbc663ce36c12b
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
index 5448bf9d3b1a..5043abfd1563 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65fcb05c52610f205959253bb3b900e1
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
index 0014568c3cbe..14cac77bc133 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ac71839da833fdf58e29cc674a369eec
diff --git a/metadata/md5-cache/dev-ruby/bson-1.12.0 b/metadata/md5-cache/dev-ruby/bson-1.12.0
index ebfd3f5ee073..3f5731e0f65c 100644
--- a/metadata/md5-cache/dev-ruby/bson-1.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be3af327222db730daae5ecb371c55c1
diff --git a/metadata/md5-cache/dev-ruby/bson-1.6.2-r1 b/metadata/md5-cache/dev-ruby/bson-1.6.2-r1
index e762c2b890c8..1579c2ead1ce 100644
--- a/metadata/md5-cache/dev-ruby/bson-1.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/bson-1.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/tarball/1.6.2 -> mongo-ruby-driver-1.6.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=210a175aa6adff016e597dad34e09539
diff --git a/metadata/md5-cache/dev-ruby/bson-2.3.0 b/metadata/md5-cache/dev-ruby/bson-2.3.0
index d76934db1dc9..4de16e78dc24 100644
--- a/metadata/md5-cache/dev-ruby/bson-2.3.0
+++ b/metadata/md5-cache/dev-ruby/bson-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v2.3.0.tar.gz -> bson-2.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a616f0f83ff482e518784730abe78949
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0 b/metadata/md5-cache/dev-ruby/buftok-0.2.0
index 6abd885cad1a..58eb3b95fa26 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb33b86072ae0cbb89e25e192ef7e4db
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index c200035356e0..7dd1ff9fcf06 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c219492cdaddfb2b153096996c8c2b66
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4 b/metadata/md5-cache/dev-ruby/builder-3.0.4
index 5cd898c9972b..5b247eedce28 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a107b929f22ce9fd0df1af7389add807
diff --git a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1 b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
index ce059497ce6c..1bc76a42dbd8 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b0cf48d13f53fd63ddb252e696c92ad0
diff --git a/metadata/md5-cache/dev-ruby/builder-3.1.4 b/metadata/md5-cache/dev-ruby/builder-3.1.4
index e55df7fac3fa..dd67fb188e7d 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.1.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.1
 SRC_URI=mirror://rubygems/builder-3.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b644952480fde274c01789ca6c762d0
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2 b/metadata/md5-cache/dev-ruby/builder-3.2.2
index 89cc2820675d..bb44d8928c7a 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/builder/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~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 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d06f12a93438878fd22ecd832086df19
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=418d799bdc3964da9b5ea7f143c5abdc
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
index 48c809a6332d..11793decd5f8 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9457c96e2742d6a1fa9361c59dbf615d
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.7.13 b/metadata/md5-cache/dev-ruby/bundler-1.7.13
index 75a8ab18d75b..f87b68e3b42c 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.7.13
+++ b/metadata/md5-cache/dev-ruby/bundler-1.7.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.7.13.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2704f5d4896ad5fd7b1e242b8d4ce34a
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.7.3 b/metadata/md5-cache/dev-ruby/bundler-1.7.3
index 93f6fdc85030..a83a906c6332 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.7.3
+++ b/metadata/md5-cache/dev-ruby/bundler-1.7.3
@@ -4,11 +4,11 @@ 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 )
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d8f043a6726ba06691a1567faed78413
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cc7aa477f2c0625b5a71afae06b42bc3
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.7.4 b/metadata/md5-cache/dev-ruby/bundler-1.7.4
index e13bf5e6c9f8..36102db5be82 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.7.4
+++ b/metadata/md5-cache/dev-ruby/bundler-1.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-1.7.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47d0744fdf62a72a6840e1d1191304cd
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.8.7 b/metadata/md5-cache/dev-ruby/bundler-1.8.7
index 3d4417142b49..ab01912d60e4 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.8.7
+++ b/metadata/md5-cache/dev-ruby/bundler-1.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.8.7.tar.gz -> bundler-1.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4aaf397afb70453d3b31cdbeb9895f69
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.5.0 b/metadata/md5-cache/dev-ruby/bunny-1.5.0
index 6938b9f5a82d..f8d3b7a4116f 100644
--- a/metadata/md5-cache/dev-ruby/bunny-1.5.0
+++ b/metadata/md5-cache/dev-ruby/bunny-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-1.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afff7d712ad72c53602b5267c3ef7392
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.5.1 b/metadata/md5-cache/dev-ruby/bunny-1.5.1
index 11787a23bb06..78ff65f033cd 100644
--- a/metadata/md5-cache/dev-ruby/bunny-1.5.1
+++ b/metadata/md5-cache/dev-ruby/bunny-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-1.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=447cf7072591c7aab3b2e644ab39e14d
diff --git a/metadata/md5-cache/dev-ruby/bunny-1.6.3 b/metadata/md5-cache/dev-ruby/bunny-1.6.3
index cac1b0b34c58..b111dcef408c 100644
--- a/metadata/md5-cache/dev-ruby/bunny-1.6.3
+++ b/metadata/md5-cache/dev-ruby/bunny-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-1.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=abd09fda8266309b2c30bcf726964c41
diff --git a/metadata/md5-cache/dev-ruby/calendar_date_select-2.0.0 b/metadata/md5-cache/dev-ruby/calendar_date_select-2.0.0
index 40c61419da9e..4fa44cefe58e 100644
--- a/metadata/md5-cache/dev-ruby/calendar_date_select-2.0.0
+++ b/metadata/md5-cache/dev-ruby/calendar_date_select-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rails-3.1[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/calendar_date_select-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=93406e82721a7358fc1ec7c828134c51
diff --git a/metadata/md5-cache/dev-ruby/camping-2.1.532 b/metadata/md5-cache/dev-ruby/camping-2.1.532
index edcdf2141998..c43d680c9b71 100644
--- a/metadata/md5-cache/dev-ruby/camping-2.1.532
+++ b/metadata/md5-cache/dev-ruby/camping-2.1.532
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby19] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/camping-2.1.532.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68c202083fb205323cb75ca1675d2b5e
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5
index 093fb3e09928..32f842aae0ed 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0128cdb1acf970198a622cecd48fde1e
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
index 0185cf918154..4f0ec98e0ac3 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ade9695b963a78f41f0d86e7b1ac557
diff --git a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2 b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
index 68445e816fe4..63eb25a91a5d 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a45c4b228d01422be958a395d8fa5432
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.3.5 b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
index 7de154f11f88..318ab6c0b3ba 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.3.5
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/capistrano-3.3.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c30b65b5a2cd09335868b347fdcc5be1
diff --git a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1 b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
index 2ebdbc40a887..e2088a9c17f6 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/capistrano-stats-1.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75a9f4bdfa87ebfe601904e9cad2c808
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
index a892780f0d4b..09a18589d286 100644
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ b/metadata/md5-cache/dev-ruby/capybara-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/capybara-1.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=253fd54ccdc682ae57da685c06cf9d03
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.2.1 b/metadata/md5-cache/dev-ruby/capybara-2.2.1
index a83213a82276..c6deeba42374 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.2.1
+++ b/metadata/md5-cache/dev-ruby/capybara-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ec646556f2d6fd0b866f991486525224
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.4.4 b/metadata/md5-cache/dev-ruby/capybara-2.4.4
index 5370b3d5febe..56eb4223889d 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.4.4
+++ b/metadata/md5-cache/dev-ruby/capybara-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.4.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=667867a88277d4e36141136644dc773c
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0
index da7c2818b65b..d93bbae01cd1 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2750dd0f776ada00a34e3d082512a99
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2 b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
index ddcbb58f28bc..55fd32000816 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-io-0.16.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f34a1d3db2bed9b4b4f70886b940937
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
index 40b8549f0e90..a72137ea3650 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu:= sys-libs/zlib ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/charlock_holmes-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00d1b9189e0f41a09a63f4c8c4007a1f
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index 68f0775da1ca..cd9c7cee969f 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f50374a1758b4d67dfc96f3000c7ce89
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.3.9 b/metadata/md5-cache/dev-ruby/childprocess-0.3.9
index 24cdd64c2eae..6d48d6bef205 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.3.9
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.3.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0333e599b549074206b1b87acd1ebdd6
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.3 b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
index d057006a9493..dcee767e7783 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=A simple and reliable solution for controlling external programs run
 EAPI=5
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f23fa8bbeb69392c922b90cbcabddb12
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=18a4131554829a2ad28e9a47b7ead008
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.5 b/metadata/md5-cache/dev-ruby/childprocess-0.5.5
index 58814b58244e..0ef26b66115d 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.5
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5422ecb76a9a38792c23921dd7a4620f
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.6 b/metadata/md5-cache/dev-ruby/childprocess-0.5.6
index 65ea672c4735..b973eb63682a 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.6
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=390733a98b9fe6ce7d9612b3ceb719bb
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 0eff8637f9dc..dd950a3fd8e5 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/chronic-0.10.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c87dcffeaa5bb99449dda644c864b22b
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.3 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.3
index 6528845c392e..d7d4f2753719 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.3
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e20c4e148a3d3de6e52954692f4f07b8
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.4 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.4
index ee13427c2ea1..a3be131b45a8 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.4
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6a9f1ba8eea878b653bd7ac87e04236
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
index 9f9fd7baee45..bdbbf5628354 100644
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ b/metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/classifier-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed945b9aa83f4f1343cdfb7b29518ab7
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
index d46412bc3aac..6ebe4e461506 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.0.3.tar.gz -> classifier-reborn-2.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d79d0588b7cd9b334d681922cea23dbc
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.0.3 b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
index 0266f8fd87df..496ae268e2e4 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.0.3
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2857c9aeed9395f22ef7d4843d483a6d
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 76eee59bf99b..f4ab9d19b94b 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cliver-0.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=817ab76cdb7c4277fae1b74bf9e22aed
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
index 567e5c5b5c8b..312b447123b8 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98381dfb2392b2a81eaa4704395636da
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
index 2e589ccc9d9b..d18c14ea91c6 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e78fd29605baf501aed9de171431dfda
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.5 b/metadata/md5-cache/dev-ruby/cocaine-0.5.5
index b73c5b1a5809..28d65bf302c3 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.5
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb3df16c3035d4fbb7695075be95bfdc
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.7 b/metadata/md5-cache/dev-ruby/cocaine-0.5.7
index dd4b5a50d4c7..025a2452ba77 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.7
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a57aa349336cb0dc9b846bf5851b19d
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
index 923ae9d21ef6..8786cf702ab4 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/tarball/v1.1.0 -> coderay-1.1.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2cc7e0e128b01011a078dc2f772541b
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index ebcdbd18ab32..ceee57416345 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b4925a3f6be06fc50c3c2f9423c3eb6
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2 b/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
index b84aae38efbb..bd49402feb4e 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/coffee-rails-3.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a653828d2ad82305ccf16edaace1479d
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
index 83918abaa38d..60e9e25b399f 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/coffee-rails-4.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0becaf2904341185870a4a0107254d7a
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
index 32836ab81324..057708ebb9f0 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/coffee-rails-4.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ef5218c61332bcb99daf793d87d9bcf
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1 b/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1
index cce72f2f81dc..aa7dccf30afe 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d3c808d108b4ecd10ad3315e3d4f9e0
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r2 b/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r2
index 09dd6fca7bc0..189475dc0141 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4bfe7a7cab5ba4c49135d0218d69680
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.3.0 b/metadata/md5-cache/dev-ruby/coffee-script-2.3.0
index 87487af7a259..51c534547b1a 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.3.0
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=91f27ee14bedefe1b126c64e662378a2
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index 611b07de7ca3..c57f12bf66b2 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=238929bbb919c00df0e11ba251a8089d
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.7.1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.7.1
index 8db57110d866..bd6e11388d42 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.7.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff933a6287e39658a70a0d198c368aa9
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1
index 47907164a0ed..4b6863b4d90a 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15568b1b2c1ed45a3098dd172f42fe23
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1.1 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1.1
index d5ab57fd47eb..7f6e1f074f08 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.9.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7cc79ab7e252d51f4cc8f19e7360744f
diff --git a/metadata/md5-cache/dev-ruby/color-1.7.1 b/metadata/md5-cache/dev-ruby/color-1.7.1
index 3b4e31ee4aa0..5b9b07121170 100644
--- a/metadata/md5-cache/dev-ruby/color-1.7.1
+++ b/metadata/md5-cache/dev-ruby/color-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.7.1.tar.gz -> color-1.7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f95d44a86c59ab8df364ad4b098184d
diff --git a/metadata/md5-cache/dev-ruby/color-1.7.1-r1 b/metadata/md5-cache/dev-ruby/color-1.7.1-r1
index dcecc4b5075f..8851f8972697 100644
--- a/metadata/md5-cache/dev-ruby/color-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/color-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.7.1.tar.gz -> color-1.7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68ac3bdf0ac7027a1e101e292cd2da65
diff --git a/metadata/md5-cache/dev-ruby/colorator-0.1-r1 b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
index 302d8315b0cd..e2d88a6ee962 100644
--- a/metadata/md5-cache/dev-ruby/colorator-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorator-0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f5b2e3c83517747be0059e7b43a2c19
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index ec4afbcf2432..bb6698a25da4 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colored-1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7a1f55d9da73a1e055660aaf822639a
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.5 b/metadata/md5-cache/dev-ruby/colorize-0.7.5
index 59724afd29a7..413be73e08ca 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.7.5
+++ b/metadata/md5-cache/dev-ruby/colorize-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-0.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6303939279a8f19cdb434945fb4f5628
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.7 b/metadata/md5-cache/dev-ruby/colorize-0.7.7
index 7c9d34cb87f9..ecc55190349f 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.7.7
+++ b/metadata/md5-cache/dev-ruby/colorize-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-0.7.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af5ac2779314bc25605d204cd3bfed1e
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.8.9 b/metadata/md5-cache/dev-ruby/columnize-0.8.9
index c59d9ea389f0..63dcce213cb2 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.8.9
+++ b/metadata/md5-cache/dev-ruby/columnize-0.8.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.8.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=abdbdd807f99987f1a02b23ab05b150b
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0 b/metadata/md5-cache/dev-ruby/columnize-0.9.0
index 800cdd049296..2d385d06e06d 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a22e7483d032883afd35f3605f6186a
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.5.3 b/metadata/md5-cache/dev-ruby/combustion-0.5.3
index a604103f001b..dbae1f0c0c29 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.5.3
+++ b/metadata/md5-cache/dev-ruby/combustion-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a1b40aec07e53eca645e6d746253798f
diff --git a/metadata/md5-cache/dev-ruby/commander-4.3.2 b/metadata/md5-cache/dev-ruby/commander-4.3.2
index 4425c079898e..136bb7588ed9 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.3.2
+++ b/metadata/md5-cache/dev-ruby/commander-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.7.1[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf06bdcf91a633df2a32b98b35ab1e2e
diff --git a/metadata/md5-cache/dev-ruby/commander-4.3.3 b/metadata/md5-cache/dev-ruby/commander-4.3.3
index f25302476590..67f7bacf497d 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.3.3
+++ b/metadata/md5-cache/dev-ruby/commander-4.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.7.1[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bbbe95acb7304a8169df98d34dcaf6d8
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.1-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
index 6f55268b1f66..d481c78e3311 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5d6d7e3c59f47818d909d7079c3eb61
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index 6ce7c3f38229..b62c81bd7730 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f9a0aaf612a8cac6256e79d9f19d4c40
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.1
index c9ed41715889..0ee600e6e930 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b9c757a83b1eeb4b0571ff6d2b63ff7a
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index 2b7368a5eba6..16f8562eb82e 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa86c132a4f2ad041de0425851bcb0ab
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index 7f551220bdd7..50a5baf45168 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.2[ruby_targets_ruby19] <dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-import-once-1.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c78bc1fdc9cff5e14c73e333e5642a7
diff --git a/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1 b/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
index 6e81ae95c3cc..055ab2929d07 100644
--- a/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
+++ b/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/configliere-0.4.18.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44b0d95118ca867bbcf4a3fc79cc2099
diff --git a/metadata/md5-cache/dev-ruby/configliere-0.4.22 b/metadata/md5-cache/dev-ruby/configliere-0.4.22
index 0ecca2693f94..04a3474eeb6e 100644
--- a/metadata/md5-cache/dev-ruby/configliere-0.4.22
+++ b/metadata/md5-cache/dev-ruby/configliere-0.4.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=dev-ruby/multi_json-1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby20] >=dev-ruby/multi_json-1.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby21] >=dev-ruby/multi_json-1.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby20] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Settings manager for Ruby scripts
 EAPI=5
 HOMEPAGE=https://github.com/infochimps-labs/configliere
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=dev-ruby/multi_json-1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby20] >=dev-ruby/multi_json-1.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby21] >=dev-ruby/multi_json-1.1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby20] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby21] >=dev-ruby/multi_json-1.10.1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/configliere-0.4.22.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34f879f4b6f9232c90087e4c1607642e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=29c9ae52dce6b92fcf555df693324258
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.1.1 b/metadata/md5-cache/dev-ruby/connection_pool-2.1.1
index bcc96c94cc9c..ed6c55659e34 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.1.1
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9604ce6f8ed4941d8fa8d4c936e5136
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.1.2 b/metadata/md5-cache/dev-ruby/connection_pool-2.1.2
index e2ddaed6f110..2493fd4ce09d 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.1.2
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e714614484f81e6d21ecca2e8a6ff97
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.1.3 b/metadata/md5-cache/dev-ruby/connection_pool-2.1.3
index 78f1d9ec4068..782d926df89b 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.1.3
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f912a26bfe22f166b3c664d074cedbe
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
index 9e685e41e252..2d02e8703201 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ee5ba76913ee070f3897779209c23e0
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.2.1 b/metadata/md5-cache/dev-ruby/coolio-1.2.1
index c6b9524a1bd0..8e89e33159fa 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.2.1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libev ruby_targets_ruby19? ( >=dev-ruby/iobuffer-1[ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd58d743c2c6348fcbfbc81b5fd54f55
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.3.0 b/metadata/md5-cache/dev-ruby/coolio-1.3.0
index 956c32c03231..d6a87d09f075 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.3.0
+++ b/metadata/md5-cache/dev-ruby/coolio-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libev-4.19 test? ( ruby_targets_ruby19? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=>=dev-libs/libev-4.19 test? ( ruby_targets_ruby19? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
 EAPI=5
 HOMEPAGE=http://coolio.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libev-4.19 ruby_targets_ruby19? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=79256b6bb389ea66f0f51b89095ad2ae
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=87adf4afbff0520d493cb22bc264aef8
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index 45f55385a4c3..151f214b0570 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/countdownlatch-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df0b562367d7d297f8a28076f42a083c
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2 b/metadata/md5-cache/dev-ruby/crack-0.4.2
index 832018cba2c9..b4557c08022d 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b739796deadc9dfced6222297366095
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
index 860566275442..729a66846a55 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21a0a443ffcf980234fd9942366cd670
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.1 b/metadata/md5-cache/dev-ruby/crass-1.0.1
index c5ad5ecedb28..ec3405cbc997 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.1
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crass-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ebf8cad0ec40c25caeab59264954195
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.2 b/metadata/md5-cache/dev-ruby/crass-1.0.2
index 41d97097c006..9df15cfcb1f6 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.2
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crass-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5a18d234cdfe7b90d7c8adf87c1217b
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index ccc8d77ba2b7..ff4322e8f0df 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb74aac03ca99d65827be2425c748b0c
diff --git a/metadata/md5-cache/dev-ruby/cri-2.4.1 b/metadata/md5-cache/dev-ruby/cri-2.4.1
index a73e1214bea8..a5c240a5b16e 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.4.1
+++ b/metadata/md5-cache/dev-ruby/cri-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0065fceb795e529f5910ceb54f11800f
diff --git a/metadata/md5-cache/dev-ruby/cri-2.6.1 b/metadata/md5-cache/dev-ruby/cri-2.6.1
index 0786102a6650..0eb86f624f90 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.6.1
+++ b/metadata/md5-cache/dev-ruby/cri-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33d30e9d354ac3d2f528f270035cd156
diff --git a/metadata/md5-cache/dev-ruby/cri-2.7.0 b/metadata/md5-cache/dev-ruby/cri-2.7.0
new file mode 100644
index 000000000000..94ab1242459c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/cri-2.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/colored-1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) test? ( dev-ruby/yard[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) test? ( dev-ruby/yard[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) test? ( dev-ruby/yard[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=Cri is a library for building easy-to-use commandline tools
+EAPI=5
+HOMEPAGE=http://rubygems.org/gems/cri
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/colored-1.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/colored-1.2[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/cri-2.7.0.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=03f71cda92d80dec4a31350efc83db9c
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1 b/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
index bb4e903d352b..455459a3c834 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.3.5.tar.gz -> css_parser-1.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47ee52f8c8ac5959b20be18c4988bd26
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.3.6 b/metadata/md5-cache/dev-ruby/css_parser-1.3.6
index 540a295878ce..6a470b6726ca 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.3.6
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.3.6.tar.gz -> css_parser-1.3.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a6ffaa16adba83e4388b2e563c126a8
diff --git a/metadata/md5-cache/dev-ruby/curb-0.8.6 b/metadata/md5-cache/dev-ruby/curb-0.8.6
index 33bb9c2a5615..b356b5d1f11a 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.8.6
+++ b/metadata/md5-cache/dev-ruby/curb-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl[ssl] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/curb-0.8.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=378d7cf2625ca372c99c776e097ccfe9
diff --git a/metadata/md5-cache/dev-ruby/curb-0.8.8 b/metadata/md5-cache/dev-ruby/curb-0.8.8
index e2e43ca985e4..22d3acace97b 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.8.8
+++ b/metadata/md5-cache/dev-ruby/curb-0.8.8
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl[ssl] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/curb-0.8.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=99cbb160a581f04750ca1e7358b1bcaf
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.2 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.2
index 78d5a80fb036..28fec9e6f48a 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.2
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.1[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cfdff1ea4b51db7173707ece5ecb13e5
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.4 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.4
index 4aa9e57b713b..2347ef69e6a2 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.4
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.1[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8dfb4e875625741c42e268cf3f1b5ac2
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.5 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.5
index 8fe86e3a4695..35a3d4ee6a55 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.5
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.1[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c2bd7aa82235264925e221f5b21223c
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.1.8 b/metadata/md5-cache/dev-ruby/daemon_controller-1.1.8
index 201638d23560..1bd23e25f48c 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.1.8
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cba67fef0b022e4379a1bbfa3de07db5
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0
index 54b819770d19..fba0b3003cb3 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=182623396c3ae777c38a895b7fb0b3ac
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index 40e34a19b082..7b4887585fc6 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7babed5c171cad4c3aa89a10164eddf6
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.1.8 b/metadata/md5-cache/dev-ruby/daemons-1.1.8
index 917bfd0918bd..e693e60f3f6a 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.1.8
+++ b/metadata/md5-cache/dev-ruby/daemons-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c78d9679ce62d3d8f7c13ac81c66fa3c
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1 b/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
index a51a09bf5d89..c74b2b5daf6f 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.1.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.1.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0fda3f132e40834000f5a9ba91a5a7b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.2 b/metadata/md5-cache/dev-ruby/daemons-1.2.2
index ea548bab496f..3a1c4dd44b36 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.2
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e216e8479c7a607cb943b74fa11a542
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.6.4 b/metadata/md5-cache/dev-ruby/dalli-2.6.4
index d568046e2a2c..0e4bee31cf3b 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.6.4
+++ b/metadata/md5-cache/dev-ruby/dalli-2.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/dalli-2.6.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=59778b1e9a4498b907033623fcb21b4a
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.4 b/metadata/md5-cache/dev-ruby/dalli-2.7.4
index ab77a3d228e7..92e1cd31baf8 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.4
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/dalli-2.7.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=396df8d382d12a87fd941465ff199dc7
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.3.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.3.0
index 4be8cd64d9a7..137b8401450c 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.3.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=344040267b11d8aa84c6f1d406e2c59c
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.0 b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.0
index bacba2e253fc..9ef55390dc32 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ee86eaa440e1a684c4380ea4fbe483b
diff --git a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1 b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
index 9da4234afaff..71fb6fc66bdd 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/database_cleaner-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a171742a3aa28c78c380139414e95996
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.7.0 b/metadata/md5-cache/dev-ruby/date_validator-0.7.0
index 61cbd6dfa7d7..01df475f21a0 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.7.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bad12ba230d654ba739a1c292304af9c
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.7.1 b/metadata/md5-cache/dev-ruby/date_validator-0.7.1
index d977f6fde7dc..6e8a3b7dd929 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.7.1
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=583b7e09c438252035d7ee734e934f08
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.8 b/metadata/md5-cache/dev-ruby/dbf-2.0.8
index 2674c2766a52..f803133ff2b5 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.8
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54f10e95dd683cb6ea45e249ad07603c
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.9 b/metadata/md5-cache/dev-ruby/dbf-2.0.9
index 5954e546b910..73a2cc777798 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.9
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4d6c1c8a00f1062e673b29520c735b3
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
index e1f3de3a1dc1..cab6088a15dd 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e897ca7f72b7a05716ad24e766287e3d
diff --git a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0 b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
index b2f10c08c6e4..16daef93a09c 100644
--- a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
+++ b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/debugger-linecache-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a93cefd10bfd0233bbca0f376f64b2d1
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
index 0ab6be9cd7f5..bd114e7feda6 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d42a6809ea18d9ab8a8068903f81b16
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index cb0f701ae4a6..3ab4cc0e1966 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6a4a739b50ff81321373fc8e75276bc
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-0.0.8-r1 b/metadata/md5-cache/dev-ruby/dep_selector-0.0.8-r1
index 03f2b25393d8..fa4b3b29aed0 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-0.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/dep_selector-0.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gecode-3.5.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dep_selector-0.0.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9eef0551e4c04cb734b6ea9c71eb7f53
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1 b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
index 46c8d5f798b4..ecf6362ced26 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
+++ b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gecode-3.5.0 ruby_targets_ruby19? ( dev-ruby/uuidtools[ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/opscode/dep-selector/archive/0.1.1.tar.gz -> dep_selector-0.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=995e4f593f11db51b4739493d305b58d
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
index b0166d83edb5..0a236c7eef7b 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89b50acd6ba8484ba25aba38d36a5d9e
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index b35dc88ec3b3..a9c922a41ecc 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa2a5917b0a50522efe2e794873e7ab1
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index f1f4cb3d2da1..9b0bf7df67e3 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/thread_safe[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/descendants_tracker-0.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c917107d7571f357b4016d73da98526b
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
index 3a7eabe43df8..24e7b808dbb0 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b93bc2bc98292dfd961ad922779194f7
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 34c58874323a..9c87f817d091 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74bf12de3c5095741009df897f7d4637
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.56.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.56.0
index 269501b50944..ea285ee26209 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.56.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.56.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.56.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc6a8a631bd0cd38b34941062dc908a3
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.57.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.57.0
index d3ae50b8de67..64a5c13dfbcd 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.57.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.57.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.57.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a74e886d82ce568713e9a845f5afb9dc
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.58.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
index 403dd599c5b5..55865c0e87e5 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.58.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d65417d75085ae5ebc2127354a8b789a
diff --git a/metadata/md5-cache/dev-ruby/docile-1.1.5 b/metadata/md5-cache/dev-ruby/docile-1.1.5
index d792d772f855..1b24f5a5de25 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.1.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/docile-1.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2941b52cd0a03ca43dfefcc1166decb2
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.22 b/metadata/md5-cache/dev-ruby/domain_name-0.5.22
index ebe730bc8b96..040df662c22f 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.22
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.22.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=072ba41fc9a763a6bad692b4033dc835
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.23 b/metadata/md5-cache/dev-ruby/domain_name-0.5.23
index ce153866ed04..ed35086dcd38 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.23
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.23
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.23.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc616af34abd445988a6a5467c7232d5
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.24 b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
index b81d0e4aede2..b5d1a69d0417 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.24
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.24.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6511339bd9478ff5cce403ef5cfd3a9
diff --git a/metadata/md5-cache/dev-ruby/dotenv-0.11.1 b/metadata/md5-cache/dev-ruby/dotenv-0.11.1
index eafb0b1c0ff1..8dd95aed176f 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-0.11.1
+++ b/metadata/md5-cache/dev-ruby/dotenv-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/dotenv-deployment-0.0.2[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/dotenv-0.11.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b414b2229814a01f48c85fea074eb0a
diff --git a/metadata/md5-cache/dev-ruby/dotenv-1.0.2 b/metadata/md5-cache/dev-ruby/dotenv-1.0.2
index 355f0ef5ef46..b654b9780090 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-1.0.2
+++ b/metadata/md5-cache/dev-ruby/dotenv-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dotenv-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=674627ac0bf93ba907822f69d58051eb
diff --git a/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2 b/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2
index ac772adc15df..f9fdf9800cf6 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2
+++ b/metadata/md5-cache/dev-ruby/dotenv-deployment-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dotenv-deployment-0.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0fb2eb4aee3f5776eaabeef6c2e6cd3
diff --git a/metadata/md5-cache/dev-ruby/duby-0.0.2-r1 b/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
index 94b5a165c9fe..addf1e9cb343 100644
--- a/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-ruby/bitescript[ruby_targets_jruby] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/duby-0.0.2-java.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f7ce68b5ffa95f7b746be5aa9babd5b5
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r1 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
index 018041656d9f..6fbec9dd3cc9 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dust-0.1.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f32c9f9c992eabb4dc348d223a2bd86
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index f69bf3a1af19..43a1460a64c2 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dust-0.1.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c77846b7fb46e389d006e3fa8d1d4f1
diff --git a/metadata/md5-cache/dev-ruby/echoe-4.6.5 b/metadata/md5-cache/dev-ruby/echoe-4.6.5
index 9d90d5cb304d..438c03200291 100644
--- a/metadata/md5-cache/dev-ruby/echoe-4.6.5
+++ b/metadata/md5-cache/dev-ruby/echoe-4.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rubyforge[ruby_targets_ruby19] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/echoe-4.6.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e00a70fd9825f7c99e18709fe839542f
diff --git a/metadata/md5-cache/dev-ruby/echoe-4.6.6 b/metadata/md5-cache/dev-ruby/echoe-4.6.6
index 309c3ac8ce69..0287bdd896c4 100644
--- a/metadata/md5-cache/dev-ruby/echoe-4.6.6
+++ b/metadata/md5-cache/dev-ruby/echoe-4.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rubyforge[ruby_targets_ruby19] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/echoe-4.6.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41c05fdd83b3e3ce69ff1d38a696decf
diff --git a/metadata/md5-cache/dev-ruby/em-http-request-0.2.14 b/metadata/md5-cache/dev-ruby/em-http-request-0.2.14
index 31eacaa4db81..3906010f5a12 100644
--- a/metadata/md5-cache/dev-ruby/em-http-request-0.2.14
+++ b/metadata/md5-cache/dev-ruby/em-http-request-0.2.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.0.0[ruby_targets_ruby19]
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/em-http-request-0.2.14.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6fca258a62e742b8aa76bf11f98c9a69
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index ade42db5ff99..34248b575707 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec0f001d4418f3f00c9835a47dd63ecd
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.9 b/metadata/md5-cache/dev-ruby/equalizer-0.0.9
index 35730a126fc1..c9091fbc09e6 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.9
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4952b6da30997ac2e6999f50854e955
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
index 4b81b7f69924..5667a63240da 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c33f4fc256fefcecc149af8db4a46a9
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index 98fc891b6240..7e28ed9170ca 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ba38aeec6f2e1a5976e312f578045c3
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.7.1 b/metadata/md5-cache/dev-ruby/ethon-0.7.1
index b5346157c81b..20b41f03e806 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.7.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e02ad7f5409ae81daf543ff97cc974c
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.7.3 b/metadata/md5-cache/dev-ruby/ethon-0.7.3
index adb87263c5a2..8248dd421dae 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.7.3
+++ b/metadata/md5-cache/dev-ruby/ethon-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/sinatra[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/sinatra[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/sinatra[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/mime-types[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=Very lightweight libcurl wrapper
 EAPI=5
 HOMEPAGE=https://github.com/typhoeus/ethon
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2aa7332df592fd04b9e328bb6bcdd9e8
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=cc27c88ef859d87c0f99dea9b7fab288
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index 17c4433241c2..771eb72648d1 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/evented-spec-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3501af84ceebb54c1f6fd077389ae869
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-0.12.10-r2 b/metadata/md5-cache/dev-ruby/eventmachine-0.12.10-r2
index fe7da45c19e6..183eb5bf3b6f 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-0.12.10-r2
+++ b/metadata/md5-cache/dev-ruby/eventmachine-0.12.10-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=dev-libs/openssl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-0.12.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d841810a7a4be3f20d4d0b11009c54f5
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
index df87793b2e4f..38cb59c6a3ef 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e50cd594f609727e68d8944dc7ea7a90
diff --git a/metadata/md5-cache/dev-ruby/execjs-1.4.0 b/metadata/md5-cache/dev-ruby/execjs-1.4.0
index ac80535408d8..822fda7b7957 100644
--- a/metadata/md5-cache/dev-ruby/execjs-1.4.0
+++ b/metadata/md5-cache/dev-ruby/execjs-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/sstephenson/execjs/tarball/v1.4.0 -> execjs-1.4.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1682de35d466d6a88ef77d4cfd245528
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.2.2 b/metadata/md5-cache/dev-ruby/execjs-2.2.2
index 3c1d4ab8fb53..28f143039397 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.2.2
+++ b/metadata/md5-cache/dev-ruby/execjs-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/execjs/archive/v2.2.2.tar.gz -> execjs-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82620d7e333a65db76e18b7e963bfd8c
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.2.2-r1 b/metadata/md5-cache/dev-ruby/execjs-2.2.2-r1
index 94323fc27107..d996e82fc8ca 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/execjs/archive/v2.2.2.tar.gz -> execjs-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccd5a07fd9d041c03c2d219d2608ec55
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.3.0 b/metadata/md5-cache/dev-ruby/execjs-2.3.0
index e4a891d00fdc..6e1a86f8f1e9 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.3.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/execjs/archive/v2.3.0.tar.gz -> execjs-2.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5647acd56eaaa1936b01ea8c5be7337a
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.4.0 b/metadata/md5-cache/dev-ruby/execjs-2.4.0
index f9739ce78fbf..807281227d4e 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.4.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/execjs/archive/v2.4.0.tar.gz -> execjs-2.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0354082dfaee9c01726c2e5d2d214f8
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.5.0 b/metadata/md5-cache/dev-ruby/execjs-2.5.0
index 90d4425f3295..5e5c230810db 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.5.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.5.0.tar.gz -> execjs-2.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7c7deabce991f0e117192074d8c9068
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.5.2 b/metadata/md5-cache/dev-ruby/execjs-2.5.2
index 879461851a1b..3e87ad6e6229 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.5.2
+++ b/metadata/md5-cache/dev-ruby/execjs-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.5.2.tar.gz -> execjs-2.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b8100bcedb79a78701187bd05555055
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.0 b/metadata/md5-cache/dev-ruby/exifr-1.2.0
index ba59fd0d5763..a941def63159 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.0
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9587ab888a97080b16ae73aa6d51f614
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.1 b/metadata/md5-cache/dev-ruby/exifr-1.2.1
index 052e340e7bd8..89faf03c41f8 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec3b4be27ec672a84c8ea7adfe5fc0bb
diff --git a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518 b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
index 200147ffe6db..387277acf750 100644
--- a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
+++ b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/expression_parser/archive/6e3c7973423ff0f2cd33db2304fcd4eac3af01ad.tar.gz -> expression_parser-0.9.0_p20130518.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58ae85d8b8ed590f925c53bde1b0b89e
diff --git a/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1 b/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
index 446eb76a3eb5..d117579669e1 100644
--- a/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
+++ b/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/extlib-0.9.16.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d4215d9bbe50698e03c09991ec65cbb
diff --git a/metadata/md5-cache/dev-ruby/facets-2.9.3 b/metadata/md5-cache/dev-ruby/facets-2.9.3
index 4f30a19f9ce1..5ead3fb237ac 100644
--- a/metadata/md5-cache/dev-ruby/facets-2.9.3
+++ b/metadata/md5-cache/dev-ruby/facets-2.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/facets-2.9.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa320eafd6a6646a527a3a8b10338f41
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1 b/metadata/md5-cache/dev-ruby/facter-2.4.1
index 347627bca15c..4f22cfe84a96 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43c3ea62ab6ac3c0da8e61b1f46ce672
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1-r1 b/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
index 22bd2cefa861..93dc897a01af 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e107acc58084c994b1007751132de0aa
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.3 b/metadata/md5-cache/dev-ruby/facter-2.4.3
index 8fd54b64ec82..62264ca33899 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.3
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e520cab13b75fb5c39e583f41a66418e
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.4.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.4.0
index fa4c6bcab08c..96418db00994 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.4.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/factory_girl-4.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47df427e806f3e8bf0cb9dca2f3618ae
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.5.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
index c8614340001f..fe221eb072fd 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/factory_girl-4.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e91ad9f4c7aabfc8f1a4783597716901
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.4.2 b/metadata/md5-cache/dev-ruby/fakefs-0.4.2
index 9ab9bcd79d14..eac3e5d0f331 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.4.2
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afbc111c88a976f5b47724a17d222909
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0
index d69b0d40170a..351d4a75da74 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=404e9c2aa9c513585a532b6203d89fe7
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
index f536fadef171..f8d6d6a35f84 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b6b2d270e97dc34a3d707d78736ac5d
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.5 b/metadata/md5-cache/dev-ruby/fakefs-0.6.5
index 04d1cfab9a5a..f96e01b2532f 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.5
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9bb5e21ea9aa7b970878d91a7e9a3699
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.7 b/metadata/md5-cache/dev-ruby/fakefs-0.6.7
index e019225c214b..46fc48156ae5 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.7
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c749d85d8bf0646fae71fcc99cd665e
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
index d8ab522a03bf..de8c9457a268 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakeweb-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a0d5386a2447bcc4ba2d69670384242
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
index 3a3b4459175e..3f6b0d3824b2 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakeweb-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8b59c8e8a291fbecec9b1cabfc714d3
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.0 b/metadata/md5-cache/dev-ruby/faraday-0.9.0
index c694fac1d1be..a12258848008 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.0
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.0.tar.gz -> faraday-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd82030e16988e078053a0b28ea917bb
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.1 b/metadata/md5-cache/dev-ruby/faraday-0.9.1
index 2e3e219f139a..053a2347294e 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby19] <dev-ruby/multipart-post-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] dev-ruby/sinatra[ruby_targets_ruby19] dev-ruby/net-http-persistent[ruby_targets_ruby19] dev-ruby/patron[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby20] dev-ruby/httpclient[ruby_targets_ruby20] dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/net-http-persistent[ruby_targets_ruby20] dev-ruby/patron[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( sys-process/lsof ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby19] <dev-ruby/multipart-post-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby20] <dev-ruby/multipart-post-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby21] <dev-ruby/multipart-post-3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] dev-ruby/sinatra[ruby_targets_ruby19] dev-ruby/net-http-persistent[ruby_targets_ruby19] dev-ruby/patron[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby20] dev-ruby/httpclient[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/sinatra[ruby_targets_ruby20] dev-ruby/net-http-persistent[ruby_targets_ruby20] dev-ruby/patron[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/sinatra[ruby_targets_ruby21] dev-ruby/net-http-persistent[ruby_targets_ruby21] dev-ruby/patron[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=HTTP/REST API client library with pluggable components
 EAPI=5
 HOMEPAGE=http://github.com/lostisland/faraday
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.1.tar.gz -> faraday-0.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d4015701c57fd9896affffc8ef0e6136
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=36fd15a77ad4770d71a42e1bc832dbb9
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index bb4b6c29386d..38c9c73ad2ca 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast-stemmer-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1887b1643b2d06a239a098e3c0882778
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-0.9.0 b/metadata/md5-cache/dev-ruby/fast_gettext-0.9.0
index 7b0ab0a404cb..50429b8bc12a 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-0.9.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v0.9.0.tar.gz -> fast_gettext-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e69589dd0f410b114e456a32c8ee77d
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-0.9.2 b/metadata/md5-cache/dev-ruby/fast_gettext-0.9.2
index c4039df07cb8..ae096ddc80b8 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-0.9.2
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v0.9.2.tar.gz -> fast_gettext-0.9.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=036969f4e8c4a0100487eb3ca403040c
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
index d7bff40d11bd..bdefb7b527d7 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e1f16c1241f93c427500fc93e66ff0b
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index d0ba3604b1a1..b394f9af75af 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5e9486e3f32ae3fd90f52fe1e5e6d36
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.2.2 b/metadata/md5-cache/dev-ruby/fattr-2.2.2
index 458bfeb5d4df..a629637e6384 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.2.2
+++ b/metadata/md5-cache/dev-ruby/fattr-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fattr-2.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e418d146bde708d0b48ee31990dc680f
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
index 17948d3a82bd..999c7bb1e6af 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/fcgi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=847fe225df4713f07cfca59f60007768
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index 2d1dce02edb6..17fc2f9f824e 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/fcgi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b1f2193197d6aa4fa5f06c08c2a6992
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
index 29a7dcb9bd41..831e2e4c5fc5 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=683324bc0ad7cda49f601f04de521e63
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
index 5921b0025259..67882335c1c6 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=844d5379527f9d9f0eb166f46a67e16d
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=90f351fdda820f1a55d4e76d9b7805f6
diff --git a/metadata/md5-cache/dev-ruby/ffaker-1.30.0 b/metadata/md5-cache/dev-ruby/ffaker-1.30.0
index 36c62069f812..01eab9c409d2 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-1.30.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-1.30.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-1.30.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4fb42fa35d19fc53331d37127ddbd1f
diff --git a/metadata/md5-cache/dev-ruby/ffaker-1.31.0 b/metadata/md5-cache/dev-ruby/ffaker-1.31.0
index 69a89bd56c92..3c502d6b5396 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-1.31.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-1.31.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-1.31.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4bc68d802bcef0f552d58dd898df4f05
diff --git a/metadata/md5-cache/dev-ruby/ffaker-1.32.1 b/metadata/md5-cache/dev-ruby/ffaker-1.32.1
index dff362e7e493..a9b573a83c56 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-1.32.1
+++ b/metadata/md5-cache/dev-ruby/ffaker-1.32.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-1.32.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ef403ee109f4ebbfb5142f2297837d6
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
index 0c3c902fbec0..53d3c3d3b354 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c4063bf8db33f921f66ed3bcbc15528
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
index 80a5cd2508d7..2fa612ff23fb 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2b270886ef3519147b7c68098fc8e294
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.8 b/metadata/md5-cache/dev-ruby/ffi-1.9.8
index fc2ea722eb98..cae5a5e359f7 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.8
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.8
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.8.tar.gz -> ffi-git-1.9.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c71c9073456d959d96309739a496b0cd
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.1.0 b/metadata/md5-cache/dev-ruby/file-tail-1.1.0
index a852df7fa7f9..f5566ce3d2c5 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.1.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/tins-1*[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5184d8dcb8e91e8d60ea1c78866aea9c
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.1 b/metadata/md5-cache/dev-ruby/fivemat-1.3.1
index dc7c5e2064ff..7980e583383e 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.1
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a5fab70bf490c5388229eff4b72b818
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
index b95a29e5aa5d..ca4dc062b5cb 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=655bf0ecbdb7e2a5547b7f2b40178d05
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
index e2532a0c10f4..f07e00d558ad 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0de47312d9be446497698a9721327a67
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.8 b/metadata/md5-cache/dev-ruby/flickraw-0.9.8
index eb267394f56f..e7eba2ca2127 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.8
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/flickraw-0.9.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d954007accdda0df91923312638fbbd4
diff --git a/metadata/md5-cache/dev-ruby/flog-4.3.2 b/metadata/md5-cache/dev-ruby/flog-4.3.2
index 12205b833808..891d02bc05c1 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.3.2
+++ b/metadata/md5-cache/dev-ruby/flog-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3f9a43631cac7fdaebb6f3f8e5ee40e
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.6.0 b/metadata/md5-cache/dev-ruby/forgery-0.6.0
index 50ddd065edf7..8d0c5744eb9b 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.6.0
+++ b/metadata/md5-cache/dev-ruby/forgery-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sevenwire/forgery/archive/v0.6.0.tar.gz -> forgery-0.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ebb350bc6124ada765765905961e5fd4
diff --git a/metadata/md5-cache/dev-ruby/fssm-0.2.10 b/metadata/md5-cache/dev-ruby/fssm-0.2.10
index 75dc60ff7d13..7a6bf2bacd7a 100644
--- a/metadata/md5-cache/dev-ruby/fssm-0.2.10
+++ b/metadata/md5-cache/dev-ruby/fssm-0.2.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rb-inotify[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fssm-0.2.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e4a902cf1f0fd592b6fdc25546854cd7
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.0.0 b/metadata/md5-cache/dev-ruby/fuubar-2.0.0
index c091fda2fd64..74bb1ed4454b 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.0.0
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rspec:3[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/fuubar-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=190e31bd513812c6cbc99f6959678023
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.25 b/metadata/md5-cache/dev-ruby/fxruby-1.6.25
index 8e2ab27bf3a3..a9a6a23beddf 100644
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.25
+++ b/metadata/md5-cache/dev-ruby/fxruby-1.6.25
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby19? ( d
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/fxruby-1.6.25.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6550d35b3ea4e2433696843558a2c667
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.29 b/metadata/md5-cache/dev-ruby/fxruby-1.6.29
index bf1f9657ab71..d569a3d55b89 100644
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.29
+++ b/metadata/md5-cache/dev-ruby/fxruby-1.6.29
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby19? ( d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/fxruby-1.6.29.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f0972c672a23079806af31d5aaa84670
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.0.5 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.0.5
index 8606f190f3aa..ddabadd056d7 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.0.5
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.4.8[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.0.5.tar.gz -> gettext_i18n_rails-1.0.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9109b2871416b14a0f7c31508505134
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.1.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.1.0
index 89cd31686c9d..8dcfd6713bac 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.1.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.1.0.tar.gz -> gettext_i18n_rails-1.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=329b5457da8084630c34ea06cc367b8b
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.0
index b86b89b55a57..2b4d65adfb77 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.2.0.tar.gz -> gettext_i18n_rails-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee610c57135c860ecd46ebd3524cd95d
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.2 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.2
index 8a2f1c1a4947..57205d2d9c99 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.2
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.2.2.tar.gz -> gettext_i18n_rails-1.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a8232059f2429ceb5e206192252cbdb
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.3 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.3
index b1a89c47d7db..a4dd8508b73e 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.3
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.2.3.tar.gz -> gettext_i18n_rails-1.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b8bd31b2bf31eecfba48ef5700ed19d1
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.11.6 b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
index 4061a84f6019..7c02de8033a7 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.11.6
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.11.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.7.6[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.11.6.tar.gz -> gherkin-2.11.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2428675b3e12562a909b9025ebcd9dd8
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
index 29be07224832..5fdb6c39e653 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=28a8a3b7433c0b985a8143a27cfdef9f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e2b2139ba9d1f08a03d5b0d2bdb60d1b
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index 6aea2914ac5b..e6669844078b 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8a5d22bc3642c3455afd6a2d8389d80
diff --git a/metadata/md5-cache/dev-ruby/git-1.2.9.1 b/metadata/md5-cache/dev-ruby/git-1.2.9.1
index 7b7fd2f44a39..9bde49b028cf 100644
--- a/metadata/md5-cache/dev-ruby/git-1.2.9.1
+++ b/metadata/md5-cache/dev-ruby/git-1.2.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.2.9.1.tar.gz -> git-1.2.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cce61234484cb555d0b2002b50e7b3b2
diff --git a/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1 b/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
index 3b7d51225d96..3fd791664de6 100644
--- a/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
+++ b/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.2.9.1.tar.gz -> git-1.2.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f5ec8b51290683094d5bb1539a01395
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.10.2 b/metadata/md5-cache/dev-ruby/github_api-0.10.2
index b18e60538c75..571d29ad82f5 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.10.2
+++ b/metadata/md5-cache/dev-ruby/github_api-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/github_api-0.10.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=de44cb2073cd62dcb63e157f54495ab8
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.11.3 b/metadata/md5-cache/dev-ruby/github_api-0.11.3
index a6eafa749b4a..78ff30128bbf 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.11.3
+++ b/metadata/md5-cache/dev-ruby/github_api-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/github_api-0.11.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f5b6f7644281eb67b5c9b4edc73bbef
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.3 b/metadata/md5-cache/dev-ruby/globalid-0.3.3
index 04d4b4989a97..5a2aa34959dc 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.3
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-4.1.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.3.tar.gz -> globalid-0.3.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c58a815007ae7c64f9e3f0effafaddd
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.5 b/metadata/md5-cache/dev-ruby/globalid-0.3.5
index c1d0c7c91851..71fb63860cd0 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.5
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.5.tar.gz -> globalid-0.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff939607badf40c764035d6150569827
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index 5541bcc0ee9d..7561be44c0ae 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=sci-visualization/gnuplot ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gnuplot-2.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=134635b703c5d63e969a3b8a816890ac
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.8 b/metadata/md5-cache/dev-ruby/gpgme-2.0.8
index e882a5703570..b7bd2536f831 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.8
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gpgme-2.0.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=045fb70e51b24bdb39dca4d7e16fafe1
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.5.1 b/metadata/md5-cache/dev-ruby/gruff-0.5.1
index 41a90fe9c7f1..619ad5af0153 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.5.1
+++ b/metadata/md5-cache/dev-ruby/gruff-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65eb60ae158a7436815ea5684146e4f7
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.5.1-r1 b/metadata/md5-cache/dev-ruby/gruff-0.5.1-r1
index cc94a74075cb..d652c6201cb9 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.5.1-r1
+++ b/metadata/md5-cache/dev-ruby/gruff-0.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=053cabf3ccdda54730902269a444d83b
diff --git a/metadata/md5-cache/dev-ruby/haml-3.1.8-r2 b/metadata/md5-cache/dev-ruby/haml-3.1.8-r2
index 1bb1ba86933e..c164d2843dc5 100644
--- a/metadata/md5-cache/dev-ruby/haml-3.1.8-r2
+++ b/metadata/md5-cache/dev-ruby/haml-3.1.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/sass[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/haml-3.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76cedb7f1257cc8ed14dd5bb851a754e
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.3 b/metadata/md5-cache/dev-ruby/haml-4.0.3
index e2fad9b99a82..5d719153b382 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.3
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8abdd97eb93d02e5c73d6729a9d4c7fb
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.5 b/metadata/md5-cache/dev-ruby/haml-4.0.5
index 1ea18e27db28..298b1d33c2ab 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.5
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6ce5d5db7f931a5dbdd4cf6e14847b23
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.6 b/metadata/md5-cache/dev-ruby/haml-4.0.6
index f71018cd72b9..e6e4e40df24f 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.6
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.6
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af075fb0a8e57b87ce589daefb6a6f65
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.1 b/metadata/md5-cache/dev-ruby/hashery-2.1.1
index ea0d6cde114c..54903808e02f 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.1
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/lemon[ruby_targets_ruby19] dev-ruby/qed[ruby_targets_ruby19] dev-ruby/rubytest[ruby_targets_ruby19] dev-ruby/rubytest-cli[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/lemon[ruby_targets_ruby20] dev-ruby/qed[ruby_targets_ruby20] dev-ruby/rubytest[ruby_targets_ruby20] dev-ruby/rubytest-cli[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/lemon[ruby_targets_ruby21] dev-ruby/qed[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] dev-ruby/rubytest-cli[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/lemon[ruby_targets_ruby19] dev-ruby/qed[ruby_targets_ruby19] dev-ruby/rubytest[ruby_targets_ruby19] dev-ruby/rubytest-cli[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/lemon[ruby_targets_ruby20] dev-ruby/qed[ruby_targets_ruby20] dev-ruby/rubytest[ruby_targets_ruby20] dev-ruby/rubytest-cli[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/lemon[ruby_targets_ruby21] dev-ruby/qed[ruby_targets_ruby21] dev-ruby/rubytest[ruby_targets_ruby21] dev-ruby/rubytest-cli[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/lemon[ruby_targets_ruby22] dev-ruby/qed[ruby_targets_ruby22] dev-ruby/rubytest[ruby_targets_ruby22] dev-ruby/rubytest-cli[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=The Hashery is a tight collection of Hash-like classes
 EAPI=5
 HOMEPAGE=http://rubyworks.github.com/hashery
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashery-2.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8003b965a9f124e0e95346334ee2cda7
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e61b02a1fceadd9b6b0667faa906c64c
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2 b/metadata/md5-cache/dev-ruby/hashie-2.1.2
index 935aea349d95..a61510395ead 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dd10fb78c94412675bab2c455da2288
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index a7051d77dadb..b936a54845ff 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cc97cc45c8d901e489f3d2fc4d12fd0
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.3.2 b/metadata/md5-cache/dev-ruby/hashie-3.3.2
index c1004dc8912b..78c79804e688 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.3.2
+++ b/metadata/md5-cache/dev-ruby/hashie-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=545823a83f2f53d954495b9508261441
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.1 b/metadata/md5-cache/dev-ruby/hashie-3.4.1
index 6625aa0712fd..71618c319f08 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.1
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d71a3a50713ba5257e649555f7380e4b
diff --git a/metadata/md5-cache/dev-ruby/hashr-0.0.22 b/metadata/md5-cache/dev-ruby/hashr-0.0.22
index 2b60b6c8a7b7..0b965b6a23c7 100644
--- a/metadata/md5-cache/dev-ruby/hashr-0.0.22
+++ b/metadata/md5-cache/dev-ruby/hashr-0.0.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-0.0.22.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd9a9a21d4b001849b00e937768cfaee
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3
index d1e773cc6d24..9536e25a65af 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba14f81eb5550f34af9db56a90e890a8
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r4 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r4
index 83aaa4fc6086..1a4289367d61 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r4
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.1.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2396cefae438a1b433212bb22f89a43a
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 85c46c6f1f6d..caa19c7b2c4c 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff04664f0ae7e32f0e555d3d6288288f
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4 b/metadata/md5-cache/dev-ruby/hiera-1.3.4
index 35ff4e958d12..741c724a39c5 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89ca7bc606d13b5cf84edd4a870f7ead
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1 b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
index f75fc9b67dde..724fa525d28c 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62237be0a04228e4abc07c4d0e7d0695
diff --git a/metadata/md5-cache/dev-ruby/hiera-2.0.0 b/metadata/md5-cache/dev-ruby/hiera-2.0.0
index bf7c60a21866..81947a23ec53 100644
--- a/metadata/md5-cache/dev-ruby/hiera-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hiera-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e4134e7d37d207fbc7081c2fd75c3b8
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
index 1fb01bafeea1..7e74fe63f1d3 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/highline[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-2.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07b886150c88820eab1d62e3455e0f01
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
index 9086082196dc..d2da4574f9ca 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.0.7.tar.gz -> hiera-eyaml-2.0.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a73859612382e51a8d8eb19736834db6
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
index adb40bc4960a..9a639f43c3e2 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.0.8.tar.gz -> hiera-eyaml-2.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b428ee7e3dcc9cdb7b8f66ff9bac0574
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
index 8d97d5042d17..8ac3eabc45ff 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cff416b89bb3aedcef325365bd38bbb9
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5 b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
index 08753c81689f..487f73aa019b 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=001d9fdca8444d7c03a1c0a9dc446e9d
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
index 82b938f21e63..e97cf2765e2f 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6aa1eda18513b380c5c102edc44d4753
diff --git a/metadata/md5-cache/dev-ruby/highline-1.6.21 b/metadata/md5-cache/dev-ruby/highline-1.6.21
index 844bebd8b096..13fbc467e416 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.6.21
+++ b/metadata/md5-cache/dev-ruby/highline-1.6.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.6.21.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a2f542ef364a37db5c824291bc6b5ff5
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.1 b/metadata/md5-cache/dev-ruby/highline-1.7.1
index cfeaf6a173b2..a3b3eff811cd 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.1
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=42d9b86c8cf8eb681a6ea1180dabb788
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.2 b/metadata/md5-cache/dev-ruby/highline-1.7.2
index 5214a9fab41b..f16c8f7fc0ac 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.2
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=40c39fc4e31c1943229ab5a94b1656cb
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3 b/metadata/md5-cache/dev-ruby/hike-1.2.3
index 0aca327d4b1d..807fb14750d8 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19d43842be00e267bbbb99b696ee5edd
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index 765fe1e43b26..e95b1d5b5d9f 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f937889db1c5014ddad6bc885a2c94b
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index e5355a09f804..ddd1c567733d 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3bde3c6306e3becc95b90a30e8dbb109
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.4.0 b/metadata/md5-cache/dev-ruby/hipchat-1.4.0
index c9a6be3b0bfa..4ceb15e399b9 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.4.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.4.0.tar.gz -> hipchat-1.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e8521c90344b41ef6ca635420ce9b4f
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.5.1 b/metadata/md5-cache/dev-ruby/hipchat-1.5.1
index 1df5ba934526..41ef89b3a45b 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.5.1
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] dev-ruby/m
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.5.1.tar.gz -> hipchat-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e789b9036e55f4ecca1043833e44a877
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.2 b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
index 3511efd3a248..e4327f4c671a 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.2
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hitimes-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b9e9c07861a446cb97c01af075d985b9
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0 b/metadata/md5-cache/dev-ruby/hoe-3.13.0
index d636491dead0..42e219ffa4a2 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d0d11ba04175bb497fde5a77912565a
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
index 1eea91837439..a388a1f9a078 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7632b39ceb7196fcd2c40c33a3369db0
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.1 b/metadata/md5-cache/dev-ruby/hoe-3.13.1
index 566ec6dff43f..9d847efe3c28 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=747f4cb444cb31605ed302427a076431
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
index d9c2cae77675..863b8c76e3ad 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f3db892cb1b909caa89b2411dae57f6
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
index ce8441da1625..ddfa1590ad83 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1fdc910fdabb973c7e8bdfe8075eebc4
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
index 7dc455f79c6d..2030766d07d9 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=889d19e19f3da19b5140bc128b0d5707
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
index 8abaa01152d3..b413db6ecd8a 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/fast_xs[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ae127ea34afd1b0a256aed34a1dd0b1
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
index 433bc183f7ef..f7f5eae27349 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/fast_xs[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f161d74185b0ca113a5be05fad4ba3b0
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.1-r1 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.1-r1
index 8a221b8bdc3b..d2be96c05878 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c95e5daea6eecaed0157fc616fc402ba
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.2 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.2
index 3ca9f3b5da72..b8e838286724 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.2
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60710fefa30d7e0491098aeeba3214b1
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.3 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.3
index 8ba21f5720c2..dbc3047f2891 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.3
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=40243fe04b16587e0fe01f58f2d8d387
diff --git a/metadata/md5-cache/dev-ruby/http-0.5.0 b/metadata/md5-cache/dev-ruby/http-0.5.0
index 9970860f8da3..b57ee97be415 100644
--- a/metadata/md5-cache/dev-ruby/http-0.5.0
+++ b/metadata/md5-cache/dev-ruby/http-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=mirror://rubygems/http-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d477fe8b41002b411e7fa13c5c1e2cdd
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3 b/metadata/md5-cache/dev-ruby/http-0.6.3
index 7b40cee8dfd9..2e3b651e6d68 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b5ac3cd00df48c111421aa1cfbeab2ef
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3-r1 b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
index d10b29c6b5b1..5c2312457a7a 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68f19c67ce918225df5fa5002d9559b2
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
index 1181df4cffce..dcd3133fdfa7 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25012ac37866e182a1aa8d4f92e14e6c
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
index 7ec3635a8f3c..33e59d9e3c79 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f5718ddaaee67308a44f609ff1a488e
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
index 170799a5460f..344619b3ec19 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0da4fce3456aa8d8e23d2417272fa05
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 9fdfe6edfd50..ef138d914e55 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1df00151f460c729e8cfc7f0fcd7840
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.1 b/metadata/md5-cache/dev-ruby/httparty-0.13.1
index 0619302624da..589bb4ed0573 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.13.1
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.13.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82b07a50539b70c10da7bffa003117cb
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.3 b/metadata/md5-cache/dev-ruby/httparty-0.13.3
index 2d72d867ab39..f969cff31669 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.13.3
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/multi_json-1*[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.13.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b20ca52ba9427462e328534672b6cee9
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index d8181c01d322..7a7ce053688c 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9229500e8d1b853f1092d10f3f8f36e1
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.5.3.2 b/metadata/md5-cache/dev-ruby/httpclient-2.5.3.2
index d447e50fd605..a18f81f3fffc 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.5.3.2
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.5.3.2
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.5.3.2.tar.gz -> httpclient-2.5.3.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0c8de072ab11aaa7d0e77d2cdf46dd7
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.5.3.3 b/metadata/md5-cache/dev-ruby/httpclient-2.5.3.3
index 3184bdeb7547..24f10434bb0a 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.5.3.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.5.3.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.5.3.3.tar.gz -> httpclient-2.5.3.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0c7a0ad3da2b81a270da08fd4aae8dc
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1 b/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
index e8176c8af5c3..1f90a67c6ce1 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.6.0.1.tar.gz -> httpclient-2.6.0.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79bfa5f389c227cf2a777955e54c9b25
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.11 b/metadata/md5-cache/dev-ruby/i18n-0.6.11
index 23fe20e15f0b..cba2a9135f55 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.11
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff40c4f8c8d31fd2596e18b410e3a978
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1 b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
index b188c2a9688f..5d42e0f93f10 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9ee95fd86f8c16629f48dcb6ffacbd2
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0 b/metadata/md5-cache/dev-ruby/i18n-0.7.0
index 91f856d8ed08..1c7e9bce65fa 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.7
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.7.0.tar.gz -> i18n-0.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c405475dd4917dfaf8d2c0164b04604f
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
index 6f180e93e289..5078b01c9425 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3988232ebe2fa35cdcc6a509957027be
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 5358a76adf52..af2bdb58683a 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a9e95116eb4c7a90fa252db7c7fcf41
diff --git a/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1 b/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
index 20cf777f9b9b..b889f191b228 100644
--- a/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-2.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fe76005b1b2b064cdb79f31ca4cd6657
diff --git a/metadata/md5-cache/dev-ruby/inifile-3.0.0 b/metadata/md5-cache/dev-ruby/inifile-3.0.0
index 7c814c3ff7d6..3cc90e1c0c07 100644
--- a/metadata/md5-cache/dev-ruby/inifile-3.0.0
+++ b/metadata/md5-cache/dev-ruby/inifile-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-3.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f78b0e671e0c2bec1ac9b63816e1cf7
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.6 b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
index 6d691233a0c9..763d5e9c9493 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.6
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/blankslate[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e74e16e63c586d43b48c2c6695a2587
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.3 b/metadata/md5-cache/dev-ruby/introspection-0.0.3
index c53675b4884c..25ddd78db106 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.3
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9384070dcc73b5c8358c5fc4c1b0e0fa
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index fcc6527f183b..98e43da2f65b 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4740c30fc6ea4847b6efacf9caf55549
diff --git a/metadata/md5-cache/dev-ruby/ipaddress-0.8.0 b/metadata/md5-cache/dev-ruby/ipaddress-0.8.0
index 8b3113abc6b8..4d56c0e9b32b 100644
--- a/metadata/md5-cache/dev-ruby/ipaddress-0.8.0
+++ b/metadata/md5-cache/dev-ruby/ipaddress-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ipaddress-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5814988631699533f17fd17094a460f1
diff --git a/metadata/md5-cache/dev-ruby/jeweler-1.8.4 b/metadata/md5-cache/dev-ruby/jeweler-1.8.4
index 43b8d5baf683..b3a55d3c16a3 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-1.8.4
+++ b/metadata/md5-cache/dev-ruby/jeweler-1.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/bundler[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/jeweler-1.8.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74b929ad86ba1c6f5f10f1868cbc540f
diff --git a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r1 b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r1
index ed8a9df0eb54..33356bfdfa7b 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] >=dev-ruby/git
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/jeweler-2.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25615a89a3f2b858bd7c36dc4786dd7b
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
index 5b4294df1488..067a175d291f 100644
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/journey-1.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dede849223338c4d79aa4df20a09678a
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-2.3.0 b/metadata/md5-cache/dev-ruby/jquery-rails-2.3.0
index 5d7fef2f1fc4..363ae8973859 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-2.3.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/jquery-rails-2.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e10a70e19f9403357348e266c701ea14
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.2 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.2
index 657d54728ec2..4ce39a22709c 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.2
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-rails-3.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=139d20f67fecb152a96fa6f65b462a33
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3 b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3
index 3405520ffb4a..9e840a33e6be 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c29978eafd6f89c806edf5600fcdf51
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
index 6051c961cc31..db59acebab93 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.1[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-ui-rails-3.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f0a40cb6556f80bac191251fdda207e
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
index 0927aa1121fa..12bc748d2304 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-ui-rails-4.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f3f416962be0afb76d73957f981defb
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
index 9e13dd90ffa2..b2f4966abd1d 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56e76a5a39d2834a1328bb5b2590ae0a
diff --git a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7 b/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
index 85834f9b3c72..05a02a610130 100644
--- a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
+++ b/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jruby-1.5.6 ruby_targets_jruby? ( >=dev-ruby/bouncy-castle-ja
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/jruby-openssl-0.7.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcea2cc2ae93e75286139421554b3a93
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.0 b/metadata/md5-cache/dev-ruby/json-1.8.0
index 72b60f3cc7b3..ae5d141dfc95 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.0
+++ b/metadata/md5-cache/dev-ruby/json-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7dcacfff0839ccef545edcef647fd32
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2 b/metadata/md5-cache/dev-ruby/json-1.8.2
index 5591ec6857ba..b4123ea2099e 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.2
+++ b/metadata/md5-cache/dev-ruby/json-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7239ebe322bc5f087cc5a1987ef086f7
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2-r1 b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
index 8fe83daebb6f..209d86da12f1 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca3b54d2b742d08cf078aaadd85c543e
diff --git a/metadata/md5-cache/dev-ruby/json_pure-1.8.1 b/metadata/md5-cache/dev-ruby/json_pure-1.8.1
index dddc1b9a766c..a0240114459e 100644
--- a/metadata/md5-cache/dev-ruby/json_pure-1.8.1
+++ b/metadata/md5-cache/dev-ruby/json_pure-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/json_pure-1.8.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad66b4bb1bbb62f581b3d67526dee8be
diff --git a/metadata/md5-cache/dev-ruby/json_pure-1.8.2 b/metadata/md5-cache/dev-ruby/json_pure-1.8.2
index 51dd9f57997b..f33c6e6290c1 100644
--- a/metadata/md5-cache/dev-ruby/json_pure-1.8.2
+++ b/metadata/md5-cache/dev-ruby/json_pure-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/json_pure-1.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e697e5515c46258eb25453aff3d56d5a
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.2.0 b/metadata/md5-cache/dev-ruby/jwt-1.2.0
index 90f992cbb521..c55df2e2ac63 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.2.0
+++ b/metadata/md5-cache/dev-ruby/jwt-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/jwt-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fcbebe343d85985c580e7380025b11a7
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.2.1 b/metadata/md5-cache/dev-ruby/jwt-1.2.1
index 4910d98d9883..89c14cfd29ac 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.2.1
+++ b/metadata/md5-cache/dev-ruby/jwt-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/jwt-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=121854ce07acffa667020a31012baf3d
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.4.1 b/metadata/md5-cache/dev-ruby/jwt-1.4.1
index 305adf206042..3fc312fdcabe 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.4.1
+++ b/metadata/md5-cache/dev-ruby/jwt-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/jwt-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85a0ab2a2cf90caad98757b3d30360b3
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
index 7ab32a7f34a1..f7713234e18d 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afd036ca889590c68dbf60671907106a
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 0c511901886a..f1bb8b035535 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=913fcf00953d9e636fff0a226a5c0091
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1 b/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
index 2dec1bfdb735..3fd8f4fc88e3 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d81687b20a366657a2f1b3e61b6e8cb
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 8dc985153a4a..72cabe764f87 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=787367fa67331312584ad19b01ec09b9
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.4.1 b/metadata/md5-cache/dev-ruby/kramdown-1.4.1
index 99ab52e994d6..ba2586eb3dd3 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.4.1
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbab75257277940e17dfb8f2178d56a4
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.4.2 b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
index 265c267b7ffd..f3d8198bfdac 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.4.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49ffbd66874deea307c4e113c81dfc91
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3 b/metadata/md5-cache/dev-ruby/launchy-2.4.3
index cf3a6391596a..e843e8698e22 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] !
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbc9deda16d8700df902bdae6c23bd9c
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index a667910929e5..8cd4123c19ad 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ae[ruby_targets_ruby19] >=dev-ruby/ansi-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lemon-0.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4dd148bd8f557bea3514454e9dd23271
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.2.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.2.0
index 89f5da6224b4..c2eb6c935af7 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.2.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/launchy[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.2.0.tar.gz -> letter_opener-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f761c9015729f7dd0b7bf4aa783fa53b
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.3.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.3.0
index 32033bcf81f8..584b37df8eb4 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.3.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/launchy[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.3.0.tar.gz -> letter_opener-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70239ad4fb0759079282a3dc38bf308e
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
index e45cd915c05a..581077448e4b 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fde1d46e09186cd7ba7bac2436659b81
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index d8f833d44ec0..9eeb92cd651b 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d69cff637f7e259548a1d346df6da8d
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0 b/metadata/md5-cache/dev-ruby/libxml-2.8.0
index fd47f9502a49..5757bcfef9aa 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df9cf597e7163c7af65798315026f514
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
index c4594e8165f7..03c5e5475187 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33608a8b2a16fbe73ea62661f1c21c4c
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.1-r1 b/metadata/md5-cache/dev-ruby/liquid-2.6.1-r1
index c4b089d0fb01..298ecbf75cee 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-2.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad4092bbfe1345dca058bbf975c71b60
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.2 b/metadata/md5-cache/dev-ruby/liquid-2.6.2
index bb9be55d82c7..ddb6050f7810 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.2
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-2.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46f66bfe634204e1d5351b6c39b7f51f
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.1 b/metadata/md5-cache/dev-ruby/liquid-3.0.1
index f04808d5b2ed..55d04a0b32cc 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.1
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/Shopify/liquid/archive/v3.0.1.tar.gz -> liquid-3.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6b09da91a918128339c4ac06931a9aa
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
index f6d4cd22b1d5..98b2be018129 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-c-3.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a03f34a8eb8dbf26b232d60ce2a7fbd6
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
index d91a076c64d1..e03fc9511601 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ceaa43b0ad3724127051d36bf9a3fe9
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
index d5237677f05c..d1c94434923f 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd3690ce5c75fffc867b232948084df7
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
index d6cbc86a4337..9159f8570174 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a34846c56ffd3854524e1d29f0a9dbfa
diff --git a/metadata/md5-cache/dev-ruby/listen-2.8.5 b/metadata/md5-cache/dev-ruby/listen-2.8.5
index 49c524dff0e4..11d1ebf9f6b1 100644
--- a/metadata/md5-cache/dev-ruby/listen-2.8.5
+++ b/metadata/md5-cache/dev-ruby/listen-2.8.5
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 ruby_targets_ruby19? ( >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/guard/listen/archive/v2.8.5.tar.gz -> listen-2.8.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a067bc7c8d2ec69bfa6fd8895002797
diff --git a/metadata/md5-cache/dev-ruby/listen-2.8.6 b/metadata/md5-cache/dev-ruby/listen-2.8.6
index d9ab8a42b377..b00346350819 100644
--- a/metadata/md5-cache/dev-ruby/listen-2.8.6
+++ b/metadata/md5-cache/dev-ruby/listen-2.8.6
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 ruby_targets_ruby19? ( >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/guard/listen/archive/v2.8.6.tar.gz -> listen-2.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=352188520e1a4e169d85a272d476ef52
diff --git a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1 b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
index 4bbfdf285ae8..57703d5c625e 100644
--- a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/litc-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28af28869f1db67bda2c9cbe10a562ce
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
index 53841a9ce02e..affc44029551 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/little-plugger-1.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87a488f771a2ad24855fc1d709c593c2
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
index c71443b2c02b..cc800881d071 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=820f6ade595186473ce4f9ec008c9554
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index 53432db0f981..36922bb54965 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10c43309ccd358732b5743082f19f235
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index 779fd09c3d6a..383ab7ca78ad 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lockfile-2.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1fb0ef500c10d09955df0af6b56347bc
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
index 966a9cc915ae..5a82965fd5f5 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8f504f7010dad63aa57fc8c70286e4f
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index d1eb2786d12e..f38b802c1da2 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95b94219029ce182c4ab85ba58f68722
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index 27143047d0ea..bc5876053334 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/log_buddy-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab6c1f27762a75e274b9e1906cc6799c
diff --git a/metadata/md5-cache/dev-ruby/logging-1.8.2 b/metadata/md5-cache/dev-ruby/logging-1.8.2
index 4e989ba1c4cb..d7c6f5e06bf1 100644
--- a/metadata/md5-cache/dev-ruby/logging-1.8.2
+++ b/metadata/md5-cache/dev-ruby/logging-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-1.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c7e45ec77182421d62b3979de830af0
diff --git a/metadata/md5-cache/dev-ruby/logging-2.0.0 b/metadata/md5-cache/dev-ruby/logging-2.0.0
index 779f63c54bc5..392b9826fa69 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.0.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5040e5892f686cae6260b52752d67f4
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.1 b/metadata/md5-cache/dev-ruby/logue-1.0.1
index eb1a011f3ed3..19682f468d0f 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.1
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.1.tar.gz -> logue-git-1.0.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=942072912669e4ddfe74e3f76022e164
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1 b/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
index 02044518db15..43bb4953663c 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/logue/archive/v1.0.2.tar.gz -> logue-git-1.0.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fb713250293221cb2c9d3f8f8442227
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.0.1 b/metadata/md5-cache/dev-ruby/loofah-2.0.1
index 9098456247bc..abd8b8e30598 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.0.1
+++ b/metadata/md5-cache/dev-ruby/loofah-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/loofah-2.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55e023347c2b01bcce52de70a663927d
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
index 95b906bf7385..c5e16d99e302 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/loquacious-1.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=13d411320bc790a8acad6c5b26b9dc13
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.9 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
index f7394bcfb483..fc347e02befb 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e40b2ef882e10871695e010cfa49709
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
index f0072a5e88bd..5fafa0fa80e0 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mab-0.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8d7dd4e7f6c28bdb8b8406f0b756e61
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.8-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.8-r1
index 8a044eed0b88..bc18909ecd8e 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.8-r1
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.8.tar.gz -> magic-0.2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=439d36875bb6564ac6e65a3066d07ce1
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9 b/metadata/md5-cache/dev-ruby/magic-0.2.9
index 499bd971d65b..633bf055c261 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=53ec70d9a043efd94b63c57bdd0ea279
diff --git a/metadata/md5-cache/dev-ruby/mail-2.5.4 b/metadata/md5-cache/dev-ruby/mail-2.5.4
index 1d633770323e..02b58602da19 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.5.4
+++ b/metadata/md5-cache/dev-ruby/mail-2.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.5
 SRC_URI=https://github.com/mikel/mail/archive/2.5.4.tar.gz -> mail-2.5.4-git.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=52b2aa181cd827bce506c128eedaacee
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.2 b/metadata/md5-cache/dev-ruby/mail-2.6.2
index 495109be9d7f..9fc7b6a8c5b2 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.2.tar.gz -> mail-2.6.2-git.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e768bd6b67d15e2ade3d3cab7938c09
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.3 b/metadata/md5-cache/dev-ruby/mail-2.6.3
index 4bdfdddb2a95..096550bd1b86 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.3
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.3.tar.gz -> mail-2.6.3-git.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=de66b5ed7b8ed0db2c3df3e85cb376c7
diff --git a/metadata/md5-cache/dev-ruby/map-6.5.4 b/metadata/md5-cache/dev-ruby/map-6.5.4
index a0c190b3f01b..f9b0c47f2d38 100644
--- a/metadata/md5-cache/dev-ruby/map-6.5.4
+++ b/metadata/md5-cache/dev-ruby/map-6.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/map-6.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1312636add5255fa7f1d15e37c76b84a
diff --git a/metadata/md5-cache/dev-ruby/map-6.5.5 b/metadata/md5-cache/dev-ruby/map-6.5.5
index 386d767b7012..5622e9b2b661 100644
--- a/metadata/md5-cache/dev-ruby/map-6.5.5
+++ b/metadata/md5-cache/dev-ruby/map-6.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/map-6.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=993f1359bfeb881bd7d0d166f3e6740f
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.6.1 b/metadata/md5-cache/dev-ruby/maruku-0.6.1
index 4bcd12950ab0..82486c397635 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.6.1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/syntax[ruby_targets_ruby19] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5f24a98e1f8f6cf027b42891ce439d1
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.0 b/metadata/md5-cache/dev-ruby/maruku-0.7.0
index 4a10ac7d14c4..a883a71b9dac 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.0
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2a2ffac497ad29f0e023f407e081617
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2 b/metadata/md5-cache/dev-ruby/maruku-0.7.2
index 38d99ef03021..83fc374e2157 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64e754be8cd63d1da647e21f2c46d8bc
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
index b8e101e5757f..8a9e19f5e8f2 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e5e74b944415cace79162895db02797
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index e13c158bc634..e68048b62215 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mash-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3140dc9f413af0047e27f10a0356ea4c
diff --git a/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1 b/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
index 89945b88a0ef..60f8ec51e1d8 100644
--- a/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mcmire-matchy-0.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9334f620c37df651c6c304a3bfa79f50
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
index 8894e6016f6d..da4f56ea6467 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6df45269d5771fc9dfc82811488ccd4
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.6.0 b/metadata/md5-cache/dev-ruby/mechanize-2.6.0
index 8a8a5ce0affc..e59773a6aacc 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.6.0
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94fa366d80a12c5c506f0d4e55332913
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3
index cec8e0586236..c3a8316691a7 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c69a237c66572ac5e78ad3a01285762
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
index 012dcadab696..f3d0c529a63d 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby19] test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby20] test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby19] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby19] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby19] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby19] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby19] >=dev-ruby/mime-types-2.0[ruby_targets_ruby19] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby19? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby19] test? ( dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby20] test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby19] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby19] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby19] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby19] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby19] >=dev-ruby/mime-types-2.0[ruby_targets_ruby19] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Ruby library used for automating interaction with websites
 EAPI=5
 HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby19] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby19] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby19] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby19] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby19] >=dev-ruby/mime-types-2.0[ruby_targets_ruby19] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby19] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby19] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby19] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby19] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby19] >=dev-ruby/mime-types-2.0[ruby_targets_ruby19] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=82bd162c9d3088308b2237ef8e871207
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=50eff242a1fb2f5ba5053adfbf7f3023
diff --git a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1 b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
index b33e84fa5e68..bbe8f7b8e3d4 100644
--- a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
+++ b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/memcache-client-1.8.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=610e1956e21439cb7122326cd42ede06
diff --git a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2 b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
index a3018b8be565..866e568ceaa1 100644
--- a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/memcache-client-1.8.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4e9c9aafd2f79b192de4fe888f39746
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index 393b462cf218..8f9e1121002b 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoizable-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b664d5fc9cb11290c06f2a8a2fc0e044
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index 45542c65806a..1280c4750611 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoize-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c684989765fc4d6866788cd1c342eec
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.5 b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
index 288d7e029f4f..779de416de9a 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.3.5
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mercenary-0.3.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=686d8a9135e25e8e32f2bfcd0b551b7b
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
index bfca2a2ed20c..4627e80e7019 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaclass-0.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e213a27b2afdc2f4c3a1b555f3192bb
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index e23a722ba7da..0905d69cb2df 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4dfb3e1583e19117af32779735089863
diff --git a/metadata/md5-cache/dev-ruby/metaid-1.0-r3 b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
index 47440773f551..db8e616805c7 100644
--- a/metadata/md5-cache/dev-ruby/metaid-1.0-r3
+++ b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaid-1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1e770c5a3c483c411707ca3497a19d6
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-0.17.0 b/metadata/md5-cache/dev-ruby/metasploit_data_models-0.17.0
index 3fbb8b536f88..bde3f8574d58 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-0.17.0
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-0.17.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.2.10[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rapid7/metasploit_data_models/archive/v0.17.0.tar.gz -> metasploit_data_models-0.17.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f6d9ce2b3164e6c75bac14e5a8b30b6a
diff --git a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.10 b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.10
index 153ac7429c60..b522d07c2ea5 100644
--- a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.10
+++ b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/meterpreter_bins-0.0.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=557db8db7304c424556fa17fcf93c6e2
diff --git a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.6 b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.6
index b0ce9039646d..8f9251017f5b 100644
--- a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.6
+++ b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/meterpreter_bins-0.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0a2aef6aed4560dde01fd30afa85fca3
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r2 b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r2
index 7e713e49f472..1e41496ddf7b 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r2
+++ b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50d77c45e21d61822b3d8fc872cb05c4
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3 b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
index 5df5afb81572..9af071f9f146 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
+++ b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6066eb59fbedeb74f5c7c3518765b559
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.23 b/metadata/md5-cache/dev-ruby/mime-types-1.23
index 1ec58e899e79..a852290ea4c0 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.23
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.23
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mime-types-1.23.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=844038c931c279f61830c397b5a1b86c
diff --git a/metadata/md5-cache/dev-ruby/mime-types-1.25.1 b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
index 7b8cca9ec60d..d86b43e6d6b4 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mime-types-1.25.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0111bf3fe1cb9f23d664306f9b907cff
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.4.3 b/metadata/md5-cache/dev-ruby/mime-types-2.4.3
index f78889b07cb2..53a38f69e069 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.4.3
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.4.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=83cdbc199376c117942dd51229423542
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.4.3-r1 b/metadata/md5-cache/dev-ruby/mime-types-2.4.3-r1
index 92c9c9e805f2..e0e778c11be7 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.4.3-r1
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.4.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7288a1b5c30e9f1a5aa702fc17481aa
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.0 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
index e97850576367..4c05a306dc54 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c1c25964bb7ed3f34a13bf439e51f74
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-3.8.1-r1 b/metadata/md5-cache/dev-ruby/mini_magick-3.8.1-r1
index b9993bc2241b..512dcb1f1e8e 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-3.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-3.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby19? ( >=dev-ruby/subexec-0.2.1[ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v3.8.1.tar.gz -> mini_magick-3.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66511e52c8fee693ac313de1f101942f
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.2.1 b/metadata/md5-cache/dev-ruby/mini_magick-4.2.1
index 102f798a980f..f2f7467666d1 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.2.1
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.2.1.tar.gz -> mini_magick-4.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7d56f29a56cf1c8f99b6bdabdc14a377
diff --git a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1 b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
index b83cf81e91fe..c026ba65875c 100644
--- a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >dev-ruby/minitest-2.1.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/mini_shoulda-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=933f868c29aee8bac698760f2db8fb71
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5 b/metadata/md5-cache/dev-ruby/minitest-4.7.5
index da83020412f9..845cea2b0b38 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=abfae968d35bc480359534bf5056af18
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
index 2a2850277b00..5cf2208e2d90 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2f0faf0cb91a060a05d968534c7bdce
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3 b/metadata/md5-cache/dev-ruby/minitest-5.3.3
index 7162a317c7ca..a9306bf74eb9 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=461f613a46e1bd8617bc16890e6ff48d
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1 b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
index 71626f96beb9..4a4018c815ab 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=96aa5372b9c1fd4ed07b90f0c478163f
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.4.3 b/metadata/md5-cache/dev-ruby/minitest-5.4.3
index dae2e3f94e31..c23a81721b44 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.4.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.4.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46a599b87d769b84b92c5c8603433e35
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.5.0 b/metadata/md5-cache/dev-ruby/minitest-5.5.0
index 2efbfb0db52c..4c4f44c24e23 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-5.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cdfb92f7cd7cd476e0e8e50054229db7
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.5.1 b/metadata/md5-cache/dev-ruby/minitest-5.5.1
index d35fd6c37dac..8e35c8586cad 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.5.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f7754242eed541aaa4d53e65836ae36
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1 b/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
index f06ae364cc95..17c2e8cd3e74 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/1.6.1.tar.gz -> mixlib-shellout-1.6.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76fec85aca418efb91891fdde8b6cb5f
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
index e34d35f79ff3..12d0c0648bb2 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.0.1.tar.gz -> mixlib-shellout-2.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c10a1e328eb62abc391000adca909e21
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
index 75948aa1ae22..a8299ebe3006 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=318e531bb368f27eef8df3501f474c06
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index e72099b44724..f61daa2ef066 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f6f14a104b8441700605631ea719e0e9
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4 b/metadata/md5-cache/dev-ruby/mocha-0.11.4
index 9dc372c4b2cb..6ebd1daca30a 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=beea0c05be48dd4f5d5decbf2f360724
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index 2fd7d392c633..d97b1d2471bb 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d69f4b61ca44e4695bf5bd721c56fee5
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10 b/metadata/md5-cache/dev-ruby/mocha-0.12.10
index 127aded80d29..41e7fc3bd401 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39deb02847825cf360e43d4f34339d6f
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1 b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
index fd81c2602c5f..24a61cafe17c 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4854752a7456e6fdce3b2685a086c9d3
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.7 b/metadata/md5-cache/dev-ruby/mocha-0.12.7
index c53c65af2ed5..5c0c893afb91 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.7
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7fd1955c2d5bad99ee87c993504746b7
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3 b/metadata/md5-cache/dev-ruby/mocha-0.13.3
index 4140c6ce1a79..5d8e38e2de9e 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1d6f999c341103fb72fd65a1d8e35e9
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
index 333d7876bd7f..8229d53087e1 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eea0fd4ddeebbf7a3ac84470221c5a44
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
index 94b6540564fc..20ab3290ffbb 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=576814da9219cff8cf0a7d660d25a18e
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 1e3d462d0a3e..98db47cf81e6 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.14
 SRC_URI=mirror://rubygems/mocha-0.14.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa0dd017e52d4c0975a7ec834529d003
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.1.0 b/metadata/md5-cache/dev-ruby/mocha-1.1.0
index 047cd12c3022..0a0595d936d2 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/introspection[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b5447134fb56515370909cbcbc989244
diff --git a/metadata/md5-cache/dev-ruby/modernizr-2.6.2 b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
index cb28bff8d141..1c7dc2f81fcc 100644
--- a/metadata/md5-cache/dev-ruby/modernizr-2.6.2
+++ b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/modernizr-2.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=418eeebd59bec563faec71e7ea5529f8
diff --git a/metadata/md5-cache/dev-ruby/moneta-0.6.0-r1 b/metadata/md5-cache/dev-ruby/moneta-0.6.0-r1
index 9c60f26b2640..7491b6ab0283 100644
--- a/metadata/md5-cache/dev-ruby/moneta-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/moneta-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://github.com/wycats/moneta/tarball/0.6.0 -> moneta-0.6.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d6c4f80235c29be34136aa2bb466bef
diff --git a/metadata/md5-cache/dev-ruby/moneta-0.7.20 b/metadata/md5-cache/dev-ruby/moneta-0.7.20
index a63070a20388..74831b9c1b1b 100644
--- a/metadata/md5-cache/dev-ruby/moneta-0.7.20
+++ b/metadata/md5-cache/dev-ruby/moneta-0.7.20
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/minad/moneta/tarball/v0.7.20 -> moneta-0.7.20.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d5138a37ac51aa5b9210104198f9018
diff --git a/metadata/md5-cache/dev-ruby/mongo-1.12.0 b/metadata/md5-cache/dev-ruby/mongo-1.12.0
index d1929e98a23e..ffff1d6fcb25 100644
--- a/metadata/md5-cache/dev-ruby/mongo-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mongo-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/bson-1.12.0[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aab48d4c1ba79d1078ba35a07c597978
diff --git a/metadata/md5-cache/dev-ruby/mongo-1.6.2 b/metadata/md5-cache/dev-ruby/mongo-1.6.2
index 9fc790181bab..ec0595aa2c70 100644
--- a/metadata/md5-cache/dev-ruby/mongo-1.6.2
+++ b/metadata/md5-cache/dev-ruby/mongo-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/bson-1.6.2[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/tarball/1.6.2 -> mongo-ruby-driver-1.6.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db611a53d513d87ce4166781f11bd0b5
diff --git a/metadata/md5-cache/dev-ruby/mongoid-2.4.10 b/metadata/md5-cache/dev-ruby/mongoid-2.4.10
index dbcf260b4c09..47118855af5f 100644
--- a/metadata/md5-cache/dev-ruby/mongoid-2.4.10
+++ b/metadata/md5-cache/dev-ruby/mongoid-2.4.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.1[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/mongoid/tarball/v2.4.10 -> mongoid-2.4.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b67a5da08ed7a5fe9afe2d48bc08f33
diff --git a/metadata/md5-cache/dev-ruby/mongoid-2.4.9 b/metadata/md5-cache/dev-ruby/mongoid-2.4.9
index 4f14eceaf3f6..53d2e610a8f9 100644
--- a/metadata/md5-cache/dev-ruby/mongoid-2.4.9
+++ b/metadata/md5-cache/dev-ruby/mongoid-2.4.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.1[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/mongoid/tarball/v2.4.9 -> mongoid-2.4.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75a67341f83a72f294cbee1af0eaa018
diff --git a/metadata/md5-cache/dev-ruby/mongoid-2.8.1 b/metadata/md5-cache/dev-ruby/mongoid-2.8.1
index b115e7402a32..53fe6e7459e3 100644
--- a/metadata/md5-cache/dev-ruby/mongoid-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mongoid-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.1[ruby_targets_ruby20] =
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/mongoid/archive/v2.8.1.tar.gz -> mongoid-2.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48b641ed634b326f3f78e3bc7f8b4205
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.5.10 b/metadata/md5-cache/dev-ruby/msgpack-0.5.10
index e07d96f4ff34..547029b785d6 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.5.10
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.5.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-0.5.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b874e2223b5dc916e5c6933b89b5abe9
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.5.11 b/metadata/md5-cache/dev-ruby/msgpack-0.5.11
index 7d1f744a89f1..71506398a378 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.5.11
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.5.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-0.5.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=951cbb83355a7a2d55dff162cfdd678b
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.10.1 b/metadata/md5-cache/dev-ruby/multi_json-1.10.1
index 70bf9f224d3f..2400ab75170d 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.10.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.10.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f652e12f49bce8cee8d40a78bc15c16
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.0 b/metadata/md5-cache/dev-ruby/multi_json-1.11.0
index c8e88905dc0d..042d47f1e5d1 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.0.tar.gz -> multi_json-1.11.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a990a77b2a7ce57888afcb21c88ea25e
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
index 3ac9ed8adaa4..842e112234f3 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.9.3
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -4,11 +4,11 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=5
 HOMEPAGE=http://github.com/intridea/multi_json
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby20] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby20] =dev-ruby/activesupport-3*[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.9.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=00580d3826443029f0765a0042c504e9
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=36e8e549050b998c149a44940b7f007a
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.1
index 547ff4e1ae2e..83d07a254b1a 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.1
@@ -4,12 +4,12 @@ DESCRIPTION=A uniform interface for Ruby testing libraries
 EAPI=5
 HOMEPAGE=http://cukes.info/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e57f83183d6814db2965d90d71e91035
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fc3fb13500754765946db7a1edc22979
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index b35211bdd5d1..3d5e5643d84f 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51e47755cbbf1c3ac60fca25b9c0e63e
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
index 6795183b59e9..d8cf7073e301 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ab8f128a969b433ca2c3eac7694d6ee
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
index d12ca91644ac..1329bf3c3b15 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87ba4dd98727517d6dec1103e3eac287
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-1.2.0 b/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
index fb59472f2cfe..d2c10b3547dc 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c909eb61b1120c3bdd1673e7820918e
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
index d138d5254d84..cf52cc836074 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=26c001a618d043ed108ace17ef3fa98c
diff --git a/metadata/md5-cache/dev-ruby/mustache-0.99.5 b/metadata/md5-cache/dev-ruby/mustache-0.99.5
index d8bb8d0e3a6d..e296371faf8e 100644
--- a/metadata/md5-cache/dev-ruby/mustache-0.99.5
+++ b/metadata/md5-cache/dev-ruby/mustache-0.99.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-0.99.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11a0d987d00c2109ad3b496fda7d7e44
diff --git a/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1 b/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
index f398bbe97e5b..cf35209b5d49 100644
--- a/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
+++ b/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-0.99.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e910627cc44401ea72814c770ab3a975
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.1 b/metadata/md5-cache/dev-ruby/mustache-1.0.1
index 46b9bf46123b..37bc479d0b2f 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a9b0162f269a7f54bd76bdfe4ac1ca3
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.17 b/metadata/md5-cache/dev-ruby/mysql2-0.3.17
index f802b8d81126..cdb7698f759e 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.17
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.17
@@ -10,5 +10,5 @@ RDEPEND=virtual/mysql[-static] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.17.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a5c05cfbbc69c50da7801490a3efdab
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.18 b/metadata/md5-cache/dev-ruby/mysql2-0.3.18
index 0e63f95f17f8..f4fc3cbce3b6 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.18
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.18
@@ -10,5 +10,5 @@ RDEPEND=virtual/mysql:=[-static] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.18.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d34e7bd95912ba92d8698253e5da27c
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index 7fdf2b544075..299c0fc88977 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios-0.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65a008ff9a0dbfbaa9aa426c9be77edf
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 4b7fefdf9954..d19e8b5aa567 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios_analyzer-0.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d29aacc3c2e261228d8ccc498d8f7e7
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1 b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
index f54b2333ab20..69101d8b862c 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.0.8.tar.gz -> narray-0.6.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d0b18060dbf68f1d4cfe1384405601d
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2 b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
index 53f5f1370f1c..d040c4d76c50 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.0.8.tar.gz -> narray-0.6.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=22240284fc455ec9ea50c97641e8556b
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.9 b/metadata/md5-cache/dev-ruby/narray-0.6.0.9
index 2c8ec6dfc472..6891ca97cdf7 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.9
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.0.9.tar.gz -> narray-0.6.0.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87edb0ba702316c252517f11b3c13c7c
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
index bc24e0009d0a..874995abf3ff 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.1.tar.gz -> narray-0.6.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5c2a1df2b83a4ea26443e23ddec256d
diff --git a/metadata/md5-cache/dev-ruby/naught-1.0.0 b/metadata/md5-cache/dev-ruby/naught-1.0.0
index 85e68f0fa6d4..5455583e2dc9 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.0.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/naught-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=592e1e70e8189b71b9a31f1c1464b538
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
index 67d8302d08cd..cee1cd1f1b32 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e591ae523d9a6d5b94a956cf9c01f45
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
index c135a51d2b26..b95b59c71565 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4c016debf56c8c4a59981799eed2e60
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
index 0cab1b6883ed..f660a6664bcb 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae687c270a9bbbfa82a19358b32ef58a
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1
index ea42ba3c60ec..11fee4a3377d 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbf0608710512180120b55a851d48065
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1 b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
index b45efe44643d..e8f3e0028e42 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4558cd14adb48eb60961995e25adb0fd
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
index 7becaa5ff19f..7919eb7b4d55 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=becd4c90d73e9abd046267b1e31602cd
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
index b99182773f68..8ecce2a0c420 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a358c6a6c2032689e982d96eb9760e43
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
index 3fad570fbabe..3657d8dee395 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76d63d5cbfc8a26774eb10a190b9f135
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.8.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
index 13d8fcf899c4..4a9a9b5ffa36 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.8.0.tar.gz -> net-ssh-git-2.8.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=04ae07105b8a8ca3fc79a7cb8345cc99
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.9.2 b/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
index 9f45e5a201c4..e323d2e9d61c 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.9.2.tar.gz -> net-ssh-git-2.9.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c4b6b90bf8c0432d5b1b0586c2ba49c7
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
index 77e46b44fcc5..0160529ce568 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df79229c66b8ec29bf59a398b69618b7
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
index 670b10e142d5..dc98bda9c52e 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5c8b7cad99353d6af6ae4e07fddacae
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
index 6877d3b4aee6..d89a29e6f794 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.0.tar.gz -> net-ssh-multi-1.2.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f72643ab3f063c9a0624742cdf41e3bc
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
index fddddc468ae5..36ac4e8269b9 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.1.tar.gz -> net-ssh-multi-1.2.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcd682791fbab3539ead0f489c068608
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.10.2 b/metadata/md5-cache/dev-ruby/netrc-0.10.2
index b4ed380df02f..94ee5e3d6610 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.10.2
+++ b/metadata/md5-cache/dev-ruby/netrc-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.10.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4e11f7ab6ca916268e65b4200e6a21e
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.10.3 b/metadata/md5-cache/dev-ruby/netrc-0.10.3
index 999f854fbf2b..50cb83623b1a 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.10.3
+++ b/metadata/md5-cache/dev-ruby/netrc-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.10.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a271ed7e5ba96b7b2895a83afc40fda
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.9.0 b/metadata/md5-cache/dev-ruby/netrc-0.9.0
index fe84d2232e62..3391b2cb3ac1 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.9.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=308427dcc8ee2b241c6fc8f8a781baa1
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
index 4b87a09bbfa6..976f924dc9c9 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/network_interface-0.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=340a8e3306b4d8b70c65014cbd516897
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index 361df40a4881..6d1d5cb8e46d 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/niceogiri-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78318eaaa0f329970cbc0221f45f6b91
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.0.1 b/metadata/md5-cache/dev-ruby/nio4r-1.0.1
index a0999554092a..2aac6788c2bd 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.0.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9482350bd256b75df0ab8b67e6c9c9f8
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.1.0 b/metadata/md5-cache/dev-ruby/nio4r-1.1.0
index 50a4bc323193..4787878a1087 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.1.0
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d927940ef38ee6d625680f80551e674d
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.5.10 b/metadata/md5-cache/dev-ruby/nokogiri-1.5.10
index 3c7e2684b5f2..87ad39a5c5d1 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.5.10
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.5.10
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.5.10.tar.gz -> nokogiri-1.5.10-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6696ea9144770dcb593dc1c329c762c8
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
index e4d6b1da01fc..df9c11de417d 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.4.1.tar.gz -> nokogiri-1.6.4.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d7b9b95a58afd49450e57605af4c5da
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.5 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.5
index 158a678ab292..d79ceab6a069 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.5
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.5.tar.gz -> nokogiri-1.6.5-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49646e14d79ab496ff312ffa2a62d449
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.5-r1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.5-r1
index 5ee706859be4..1356d40b27ab 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.5-r1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.5.tar.gz -> nokogiri-1.6.5-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=556dfb2826c242381e7a423c444d256a
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
index 001b298be92a..e1b1e1f41673 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.6.2.tar.gz -> nokogiri-1.6.6.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4122b477fedffc8404307845ed197481
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
index e9e1384ca8ab..8ac5c65eea52 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ca7e120677ccdb502a0cedabe561e1f
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.2.0 b/metadata/md5-cache/dev-ruby/nokogumbo-1.2.0
index 8d35335ddefd..709d21e6c48c 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.2.0
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gumbo ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0485dce1c780a5401bf58a0d1af793df
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.3.0 b/metadata/md5-cache/dev-ruby/nokogumbo-1.3.0
index 6cae2ae18f36..9a84a94fd88b 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.3.0
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gumbo ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.6.5-r1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b265479b0ab7ca5a16c2f70f452bdbd
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index 6c415492fd58..ecaa5a599556 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libnotify ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/notify-0.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bfa4cbb5d1f1b187b9704c5bde99c1fd
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
index fadbe828e2e8..d92e889e9e6f 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0948b13db141183f6110f1b0b2d68a1
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index 006995af07d7..f93a09ded8c6 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44ae8924f5bbd47bac25c8603d73f12f
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
index b3b9a40f3474..faf13c5ce94c 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e01fbfc598a36f93f70a18b2ecc87c1
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.0.0 b/metadata/md5-cache/dev-ruby/oauth2-1.0.0
index 5e60ebbb89bd..ed1c0c139da9 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.0.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth2-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27601209bc49fb60dfb2550e7871a3b8
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.2.1 b/metadata/md5-cache/dev-ruby/omniauth-1.2.1
index 19e16878ba53..4dd77643b0ca 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.2.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] dev-ruby/hashi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/omniauth-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e056fa8fdd8f3b807dbc9aef3cb2a14
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.2.2 b/metadata/md5-cache/dev-ruby/omniauth-1.2.2
index fe108c78af81..4aa8bb372d21 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.2.2
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] dev-ruby/hashi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/omniauth-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55f4611b8f6dd0f801d7255a29079f21
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.3 b/metadata/md5-cache/dev-ruby/open4-1.3.3
index 29d7a781af81..fa8bc8a8616b 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.3
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b10973be22272a32778ade98a7b5bf5d
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index b5f75d463a61..2beadfb05ec6 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1776bbf60ca09746489db3aa491a479e
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.9 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
index d9f0135899d1..58d9938f7bf4 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.9.tar.gz -> org-ruby-0.9.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f38b1acd7bdfa5328f1abf57f7d4dd8
diff --git a/metadata/md5-cache/dev-ruby/origin-1.1.0 b/metadata/md5-cache/dev-ruby/origin-1.1.0
index 26298301233d..4a47070a75e8 100644
--- a/metadata/md5-cache/dev-ruby/origin-1.1.0
+++ b/metadata/md5-cache/dev-ruby/origin-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v1.1.0.tar.gz -> origin-1.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e80a27d18447d89e173b204d84fc2c2
diff --git a/metadata/md5-cache/dev-ruby/origin-2.1.1 b/metadata/md5-cache/dev-ruby/origin-2.1.1
index 16d016eb69ff..7cf4fb7f3e04 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.1.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.1.1.tar.gz -> origin-2.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b19d63eb6d99c5accc1e7d1fd01eb0ff
diff --git a/metadata/md5-cache/dev-ruby/ox-2.1.7 b/metadata/md5-cache/dev-ruby/ox-2.1.7
index 49c614708e1d..c9394baa3b0b 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.1.7
+++ b/metadata/md5-cache/dev-ruby/ox-2.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.1.7.tar.gz -> ox-2.1.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4232c72faee7cce279e8e0aeb272fdb
diff --git a/metadata/md5-cache/dev-ruby/ox-2.1.8 b/metadata/md5-cache/dev-ruby/ox-2.1.8
index afb0a85d655e..7e70f14551cc 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.1.8
+++ b/metadata/md5-cache/dev-ruby/ox-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.1.8.tar.gz -> ox-2.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98c90d4d08d1ad41652a15248a57f944
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.0 b/metadata/md5-cache/dev-ruby/ox-2.2.0
index 30488172907b..b77b8c803723 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ox-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.2.0.tar.gz -> ox-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f3927f357d445e5ea23d48392fdab7a2
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.10 b/metadata/md5-cache/dev-ruby/packetfu-1.1.10
index 309e4d19f98b..7d0256414294 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.10
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pcaprub-0.9.2[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/packetfu-1.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c857fb86412c6bdbca22ab2a1e381e03
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r1 b/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r1
index bd4b6eba5372..b2c8096d442a 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r1
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pcaprub-0.9.2[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/packetfu-1.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d827f02ee5ec507483d3081db8bbd00
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.9 b/metadata/md5-cache/dev-ruby/packetfu-1.1.9
index f1159c8a358c..889d42a0dd59 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.9
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pcaprub-0.9.2[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/packetfu-1.1.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=02dceedca3cedd650d7829b45b686fb1
diff --git a/metadata/md5-cache/dev-ruby/paint-0.9.0 b/metadata/md5-cache/dev-ruby/paint-0.9.0
index 54d0161a1bfc..b2ff3c0077f2 100644
--- a/metadata/md5-cache/dev-ruby/paint-0.9.0
+++ b/metadata/md5-cache/dev-ruby/paint-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/paint-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72c4aa2603a70c1781a8cb5eebe6b5bd
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.0 b/metadata/md5-cache/dev-ruby/paint-1.0.0
index 99408a9224c1..2e103b874282 100644
--- a/metadata/md5-cache/dev-ruby/paint-1.0.0
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v1.0.0.tar.gz -> paint-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2bd20ec509d53883d0e6baeec78369a
diff --git a/metadata/md5-cache/dev-ruby/parser-2.2.0.3 b/metadata/md5-cache/dev-ruby/parser-2.2.0.3
index 4338e949a6d9..71b935b3bd14 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.2.0.3
+++ b/metadata/md5-cache/dev-ruby/parser-2.2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ast[ruby_targets_ruby19] dev-ruby/slop:3
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.2.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8bcdcdb8135a73729a737d6eeee59271
diff --git a/metadata/md5-cache/dev-ruby/parser-2.2.2.1 b/metadata/md5-cache/dev-ruby/parser-2.2.2.1
index 846940e84ddd..0ada1071fe8f 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.2.2.1
+++ b/metadata/md5-cache/dev-ruby/parser-2.2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ast[ruby_targets_ruby19] dev-ruby/slop:3
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=716f85613ed3d70f40819442582db46a
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.6.1 b/metadata/md5-cache/dev-ruby/parslet-1.6.1
index 3dc6e37fedb6..fc11d9c95ab2 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.6.1
+++ b/metadata/md5-cache/dev-ruby/parslet-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/blankslate:2[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.6.1.tar.gz -> parslet-1.6.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b8a9fd2fa3ae09e541d46cab1602c890
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.6.2 b/metadata/md5-cache/dev-ruby/parslet-1.6.2
index c9845528af86..9fdc2e5d076d 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.6.2
+++ b/metadata/md5-cache/dev-ruby/parslet-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/blankslate-2[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.6.2.tar.gz -> parslet-1.6.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=441b93b467b11510a1d21801b25e759c
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.7.0 b/metadata/md5-cache/dev-ruby/parslet-1.7.0
index bcc57b2460c2..8f5332241d24 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.7.0
+++ b/metadata/md5-cache/dev-ruby/parslet-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/blankslate-2[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.7.0.tar.gz -> parslet-1.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=31cd43efcad60ef3aeb1a212c329c39e
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r1 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
index 0ec9458ac353..758afd0d47e1 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d139e4cfe13012b9bfb6fec47c0155f
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
index 3828e44f61ed..2bf66c1510cf 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5e96963f3258ab92c15dd63faf583eb
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.20 b/metadata/md5-cache/dev-ruby/patron-0.4.20
index 8c03e48be13d..7512bcc9c55f 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.20
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.20
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.20.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=baa02eeccc845bcda9ec5756fc87ebc6
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r1 b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r1
index e71192050410..d45c16222134 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/pcaprub-0.11.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5df14d8b56788fc5e13bd062d55eeda
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.5.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.5.0
index 9be3dcc1a0da..e265db77803a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.5.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11450ee6ce93cb4858fe7236f62a1cf3
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.5.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.5.1
index 7d376399cbd3..d71f187c27bd 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.5.1
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95b0d6f488d31aa2ece3c5a51c76445e
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
index 22ef58314c5b..03cb477a58ed 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df0751bb481197a26a2505ce6d3bf84a
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
index 1f70bc3cb4a9..291dc4b324b7 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21ac4a4e8abd77d055772afb8fbbfa8a
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.1.1-r1 b/metadata/md5-cache/dev-ruby/pdf-reader-1.1.1-r1
index 5986403e6070..ec2acadb1453 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ascii85[ruby_targets_ruby19] dev-ruby/ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/yob/pdf-reader/tarball/v1.1.1 -> pdf-reader-git-1.1.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=199b6c1a8ac672f7563c1489c2295e02
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3 b/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
index b3d2cea3bd27..df1eca2b3d00 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/afm[ruby_targets_ruby19] dev-ruby/ascii8
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://github.com/yob/pdf-reader/tarball/v1.3.3 -> pdf-reader-git-1.3.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41da90f925589338e0ebc49bf95b8ab9
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index f0c07fe87f95..c94d5b8f89ff 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/permutation-0.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8234955e5023ac239ff7203dffbf36ea
diff --git a/metadata/md5-cache/dev-ruby/pg-0.14.1 b/metadata/md5-cache/dev-ruby/pg-0.14.1
index 989d5addc659..1dd1f946e085 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.14.1
+++ b/metadata/md5-cache/dev-ruby/pg-0.14.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.14.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=522eaf8cd2b9870375618200c310014d
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1 b/metadata/md5-cache/dev-ruby/pg-0.17.1
index 7bbe978bdd09..db5bd48eb693 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07fc3cec3504d385657940bf24bfbfc6
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1 b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
index c943260fde70..ab68db64accc 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72a201563f7de7771b272207f5b671b7
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5
index c744d6788c57..94abfe09efd6 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14def2b6e028686d7caf9ac4c94dfe86
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1
index 7b1228c3879a..245891f18a35 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2327ed85c639df2945f18795c374e581
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
index 71fe422be561..b8683ba66ca7 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0e492d844d8302e3baa0932a8c7aa48
diff --git a/metadata/md5-cache/dev-ruby/plist-3.1.0-r1 b/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
index db1cf99a81cd..1e59b438f981 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/plist-3.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5dfaca36f47a245e72630b9bca34407b
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.0-r2 b/metadata/md5-cache/dev-ruby/png-1.2.0-r2
index 13d7a6f78f16..2fb657054f49 100644
--- a/metadata/md5-cache/dev-ruby/png-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/png-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/png-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2193b801fa6c81c3e449f8ac02b35db6
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index a869fdcf147a..7140b3076961 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ruby-mp3info[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/podcast-0.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c1711061f3e013af52f8b46b2bde12d
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.4 b/metadata/md5-cache/dev-ruby/polyglot-0.3.4
index 615f41b7480d..646beeb8d7a3 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.4
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_rbx )
 SLOT=0
 SRC_URI=mirror://rubygems/polyglot-0.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4aae4e310cd1cbc01e71524888626bea
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index 4467d56ba779..f7ec88cff390 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/polyglot-0.3.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e9dee3a23e28970d616e46ddc0e7221
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
index 2e745fdd31a9..292b55917acd 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8103871292c8292d5c1434aadd7a0b76
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
index bf4f9e334aa7..1d6137250e82 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1346ab405bedcceea77b24be7712d9f6
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.2.2 b/metadata/md5-cache/dev-ruby/power_assert-0.2.2
index fc04a8e1cd05..2e37a8e4d6e8 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.2.2
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e36aff42ced4f8c0dfea6020b1f63df
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.2.3 b/metadata/md5-cache/dev-ruby/power_assert-0.2.3
index 96bc34553312..e245e360acf9 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.2.3
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eec800e0e46e6441b59807950bb51c8c
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2 b/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
index d1b91353e327..8306ea097fa9 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/pdf-core[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/prawnpdf/prawn/archive/1.2.1.tar.gz -> prawn-1.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=090550f56b494dee671ac28fef47f476
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.3.0 b/metadata/md5-cache/dev-ruby/prawn-1.3.0
index a61c2d10f563..e23300d04af0 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.3.0
+++ b/metadata/md5-cache/dev-ruby/prawn-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/prawnpdf/prawn/archive/1.3.0.tar.gz -> prawn-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c58119c5b2017ffe2a2cc75f1e8b6e08
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.0.1 b/metadata/md5-cache/dev-ruby/prawn-2.0.1
index bd71b171502a..63f04ae9f400 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.0.1
+++ b/metadata/md5-cache/dev-ruby/prawn-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.5.1[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.0.1.tar.gz -> prawn-2.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c41a7ae3616553667913b657184e286
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
index 78f9a44887cf..393a2c0a9d70 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2406f0eb832b817c4d3d6ff738350f64
diff --git a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2 b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
index ff10d917155e..d556bacaf26c 100644
--- a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
+++ b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/PriorityQueue-0.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f17c9bc4c55a739dbc97244541ec4a9e
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.0.8 b/metadata/md5-cache/dev-ruby/protected_attributes-1.0.8
index c731fe28e961..6805226ee03b 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.0.8
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activemodel-4*[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.0.8.tar.gz -> protected_attributes-1.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f21d9c14e99f4fb43159915d31def110
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.0.9 b/metadata/md5-cache/dev-ruby/protected_attributes-1.0.9
index 31655e17faae..61668166800e 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.0.9
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activemodel-4*[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.0.9.tar.gz -> protected_attributes-1.0.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=481c08e47c2c17c16809688ebaa39cf5
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.1 b/metadata/md5-cache/dev-ruby/pry-0.10.1
index a6e9f7a06a7a..d1585639c05a 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.1.tar.gz -> pry-0.10.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=313f575a1f3f95e4da28ea09304c526b
diff --git a/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1 b/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
index 8f11f4121445..ef87594c4d05 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
+++ b/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.0.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=ruby19
 SRC_URI=mirror://rubygems/pry-0.9.12.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c21eed724f0612a7159b42eb46ac4d6
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.11 b/metadata/md5-cache/dev-ruby/psych-2.0.11
index 7f3787a59bfa..aa84b0075058 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.11
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd825d4c7352246e76fd9f9577b9879e
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.12 b/metadata/md5-cache/dev-ruby/psych-2.0.12
index f7ba9bb8516c..8248926c2898 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.12
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.12.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=589e2768e2c641bf64e747c28411d83f
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.13 b/metadata/md5-cache/dev-ruby/psych-2.0.13
index 59eedd6d6c9d..a5a41b285b7d 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.13
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.13.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c8902ee373c275368b19cfee72fe02b
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
index 0bb4074d0be9..4c7b7059986c 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_j
 REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e310bd7b95fbe0912a30cf016062db16
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.1 b/metadata/md5-cache/dev-ruby/qed-2.9.1
index 0449a6395364..77df569cdab7 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.1
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] dev-ruby/brass
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c79539592c10f4043a155b61393175ef
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index 09372c5a97a3..e4aa220a4b03 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] dev-ruby/brass
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d46f1f8bad7098faf70015dea9f77325
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index b90fd5a90f8f..72afdacf6a5b 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd5e388e890f88c61c1e26eb7815d981
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.12 b/metadata/md5-cache/dev-ruby/racc-1.4.12
index f870ef0ec8c2..f96692b6aef3 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.12
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.12.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=880e21b20eeb2264f75fb7c481e9e573
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.9 b/metadata/md5-cache/dev-ruby/racc-1.4.9
index 581b598ec6a7..b883635c6ccb 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.9
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e23c5689f1e10fbb9da64f00f7989ff
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.5-r1 b/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
index e993dff0208f..02d70e69f04d 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) !<dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=1.4
 SRC_URI=mirror://rubyforge/rack/rack-1.4.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0d1913254391162855dfd7711162712
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.5-r2 b/metadata/md5-cache/dev-ruby/rack-1.4.5-r2
index 31782f5ed189..2e11e3bad155 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.5-r2
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1.4
 SRC_URI=mirror://rubyforge/rack/rack-1.4.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c89c35617c9ce82cc7d78523d77721be
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.5-r3 b/metadata/md5-cache/dev-ruby/rack-1.4.5-r3
index 90e2fb29d712..72f073487877 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.5-r3
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.5-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/rack-1.4.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f83cd10d2508b560ee206b77e552697
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.2-r1 b/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
index b8ecef86c034..65cc07c99752 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1.5
 SRC_URI=mirror://rubyforge/rack/rack-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b9c947abdc1590bff82363ea99e8df9
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.2-r2 b/metadata/md5-cache/dev-ruby/rack-1.5.2-r2
index 641d8e6b4eb9..2eb0dc0f2230 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.2-r2
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.5
 SRC_URI=mirror://rubyforge/rack/rack-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f6aeb7fe7c0a801f9fbd7fb532d1b11f
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.2-r3 b/metadata/md5-cache/dev-ruby/rack-1.5.2-r3
index dd5624c255bf..5746897ccf30 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.2-r3
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f305fdb7081e94d74ca04b3d689d95f
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.2-r4 b/metadata/md5-cache/dev-ruby/rack-1.5.2-r4
index 8b7db43feae3..8bc0f10929d5 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.2-r4
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f4109bd65f1c6507fe6a1f6caa5469f
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.0 b/metadata/md5-cache/dev-ruby/rack-1.6.0
index f935b2679504..ec8ad550afd3 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc56bfa99a7dfbde52d2e7ae15e83c81
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.2.0 b/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
index d2c91ac7511c..679edef93d39 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-attack-4.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09e54e6e01f4e74e75f2aa68e4699b00
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.2-r1 b/metadata/md5-cache/dev-ruby/rack-cache-1.2-r1
index d0614f779c77..ca29518a0921 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=mirror://rubygems/rack-cache-1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=926443b136ba8e8058ee573af8c4036f
diff --git a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2 b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
index 40cc82c5ffb4..52ca90c59643 100644
--- a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=https://github.com/josh/rack-mount/tarball/v0.8.3 -> rack-mount-0.8.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=723b41bcc2ac3345974a0e83558ca2a5
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.3.1 b/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
index dd574ca105d1..6efb2a891b07 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-openid-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=792db08960b41533d0affcc5c12b1345
diff --git a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2 b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
index 5a3b008f405a..32d90571a8df 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/rack-openid/archive/v1.4.2.tar.gz -> rack-openid-1.4.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e1f9f135931f1dc6a749450e2e378518
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3 b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
index 024a8942d818..04e253dae66a 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba3f46e0ce646751ddaa9a4a35a141b3
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4 b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
index 0fda4f470450..4affe84ca780 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.3
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.3.4.tar.gz -> rack-ssl-1.3.4-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=915806b567ab455789c07ff6eae3789b
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 79f64c6b6bfd..9b4a07262742 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8646e40450022e94ebe8fa607a5b5c4d
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1 b/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
index a01c7061d682..5d2b4caaebd8 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=16c6d6b0dd2defa6fc87189f6123e653
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.3 b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
index fd8c22a14179..c134a9dba308 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e53ff493baef9563b733fd4c06a27544
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.4-r1 b/metadata/md5-cache/dev-ruby/radius-0.7.4-r1
index 064b87a44251..ab974af1522e 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.4-r1
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/radius-0.7.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=45ef26ddc8b99c9fdd2879ac13542f5f
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.4-r2 b/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
index a7fddb885b0c..3dc7976fb2ae 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/radius-0.7.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f50881f5aaebebee6bcaed0e31571f15
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1 b/metadata/md5-cache/dev-ruby/ragol-1.0.1
index db3ebc6c4370..58e8d44f126a 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=485490cea3e549357cb15a67c033b3a7
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
index 25c98ea5cb3e..c1055753b0d0 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/ragol/archive/v1.0.1.tar.gz -> ragol-git-1.0.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c5cfbc9ec8deb14a790e8e1c0d7855c3
diff --git a/metadata/md5-cache/dev-ruby/rails-3.2.21 b/metadata/md5-cache/dev-ruby/rails-3.2.21
index db0260b17790..0541cff0b010 100644
--- a/metadata/md5-cache/dev-ruby/rails-3.2.21
+++ b/metadata/md5-cache/dev-ruby/rails-3.2.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.21[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/rails-3.2.21.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f77ddf2c26e4b5ff94c60417dc0440a
diff --git a/metadata/md5-cache/dev-ruby/rails-4.0.12 b/metadata/md5-cache/dev-ruby/rails-4.0.12
index 4bab0bae0511..034afc18ec12 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.0.12
+++ b/metadata/md5-cache/dev-ruby/rails-4.0.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.0.12[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/rails-4.0.12.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c00db6f614cdf1ca4c217049678ecb9
diff --git a/metadata/md5-cache/dev-ruby/rails-4.0.13 b/metadata/md5-cache/dev-ruby/rails-4.0.13
index be8172892245..9e8600d3e895 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.0.13
+++ b/metadata/md5-cache/dev-ruby/rails-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.0.13[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/rails-4.0.13.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f31b43be0b1d53d8c17b1fa83b22f0e4
diff --git a/metadata/md5-cache/dev-ruby/rails-4.1.10 b/metadata/md5-cache/dev-ruby/rails-4.1.10
index 53f1a760fcc7..db72cf27668e 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.1.10
+++ b/metadata/md5-cache/dev-ruby/rails-4.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.1.10[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/rails-4.1.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=de5fa3c541626afbb1d83e6885c7b2a7
diff --git a/metadata/md5-cache/dev-ruby/rails-4.1.8 b/metadata/md5-cache/dev-ruby/rails-4.1.8
index 4fc862817895..fa113fd83e41 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.1.8
+++ b/metadata/md5-cache/dev-ruby/rails-4.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/rails-4.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b305afddfe99243d14a59b56ef185ee9
diff --git a/metadata/md5-cache/dev-ruby/rails-4.1.9 b/metadata/md5-cache/dev-ruby/rails-4.1.9
index ce3d4ef58f5d..a4f7f60c7901 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.1.9
+++ b/metadata/md5-cache/dev-ruby/rails-4.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.1.9[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/rails-4.1.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=32ae73af4f81a35d992fa66696dc89d2
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.0 b/metadata/md5-cache/dev-ruby/rails-4.2.0
index da9c39218de6..64d028f82ab4 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.2.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4bda9cc8f14d4719f6031875aafb2be8
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.1 b/metadata/md5-cache/dev-ruby/rails-4.2.1
index 04fe5b755672..78c240690c9f 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.2.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=434653b62788a1ff20f33f3e96fd7861
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
index 1dd5afd16934..fc81c815107e 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df000b5842f15c3714c95bb738d517e9
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.5 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.5
index d2bf5e4479f2..41c4de95cabe 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.5
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f652bc586191731ab8934a08cec148c
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.6 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.6
index 11607c2df5c0..9a0e716d50a7 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.6
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3445e3770ac336761cf64a3d3a787456
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.1
index 9d8967257c89..b524eac76758 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/loofah:0[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a71cc35976843cdc27abfb5031503d80
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.2 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.2
index 1cc7b822c9a0..825ed55c9e6a 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.2
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/loofah:0[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ca839900d2f1d817b254ef77e865b2e
diff --git a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2 b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
index f91fc7558cd6..a0e9e966e7cc 100644
--- a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activemodel-4*[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.1
 SRC_URI=https://github.com/rails/rails-observers/archive/v0.1.2.tar.gz -> rails-observers-0.1.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d24c1f8671fb17491910f9d67462ab83
diff --git a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6 b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
index 7fb896d0c534..21dc1e0521f9 100644
--- a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
+++ b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rails-3.1[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails_autolink-1.1.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d32c685b96bcd27771a42bbb1ddf3da7
diff --git a/metadata/md5-cache/dev-ruby/railties-3.2.21 b/metadata/md5-cache/dev-ruby/railties-3.2.21
index 5086a413e683..4db5f86302a3 100644
--- a/metadata/md5-cache/dev-ruby/railties-3.2.21
+++ b/metadata/md5-cache/dev-ruby/railties-3.2.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=http://github.com/rails/rails/archive/v3.2.21.tar.gz -> rails-3.2.21.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a91bd283c309260ffbdf090297239b1
diff --git a/metadata/md5-cache/dev-ruby/railties-4.0.12 b/metadata/md5-cache/dev-ruby/railties-4.0.12
index 1ebe2183c6fc..266848845968 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.0.12
+++ b/metadata/md5-cache/dev-ruby/railties-4.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.12.tar.gz -> rails-4.0.12.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b358fb8043d129b1b280470680dbdd5
diff --git a/metadata/md5-cache/dev-ruby/railties-4.0.13 b/metadata/md5-cache/dev-ruby/railties-4.0.13
index 3e0f25cc8f8d..dbb488f9b686 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.0.13
+++ b/metadata/md5-cache/dev-ruby/railties-4.0.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=http://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a04a561475af9bac54d5469e9f3ebfcc
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.10 b/metadata/md5-cache/dev-ruby/railties-4.1.10
index 90c728363c3e..0a2e6138abde 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.10
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03c4d90eeeb513680edd267442bef395
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.8 b/metadata/md5-cache/dev-ruby/railties-4.1.8
index 3ad58033a403..5c9ea3efe829 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.8
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.8.tar.gz -> rails-4.1.8.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1ef4e933bd4f34d3af1a20654a01be4e
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.9 b/metadata/md5-cache/dev-ruby/railties-4.1.9
index d9cae7911739..77e6508066bd 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.9
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.9.tar.gz -> rails-4.1.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d623958076a01a9550568a1ea2279f2b
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.0 b/metadata/md5-cache/dev-ruby/railties-4.2.0
index f4d8925c999c..98bea33e1917 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.0
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.0.tar.gz -> rails-4.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0a1574d9b00272338ae14ef24baa7938
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.1 b/metadata/md5-cache/dev-ruby/railties-4.2.1
index 6bdc1caffe5c..3e79f7993e74 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.1
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51ff1a54650ff993f5bc1b4d8ffca02a
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
index b9f68486c323..93bf71306357 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=467c61c95df46bb511a1603c62c4f816
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
index ee5026e10ed8..091426158514 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=97462bd57b72b75d1e277f4235fa367e
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.0.0 b/metadata/md5-cache/dev-ruby/rainbow-2.0.0
index a63ae42c84ab..dc02c32198a2 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.0.0.tar.gz -> rainbow-git-2.0.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=809bdda057d6daed9b6adf38e233ca63
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6 b/metadata/md5-cache/dev-ruby/rake-0.9.6
index 4df4d0d71495..d4e6a9568c81 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.gem
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24faaa9fd986b17930bb882046800691
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1 b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
index b90b21085183..fdfdf471c481 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.gem
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=106a524a2ca135f1828465c621f05468
diff --git a/metadata/md5-cache/dev-ruby/rake-10.3.2 b/metadata/md5-cache/dev-ruby/rake-10.3.2
index 44c5cc3302ec..e5e1bafe2643 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.3.2
+++ b/metadata/md5-cache/dev-ruby/rake-10.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.3.2.gem
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8fe33aea6e636ead6dd0d2916dd1d8e8
diff --git a/metadata/md5-cache/dev-ruby/rake-10.4.0 b/metadata/md5-cache/dev-ruby/rake-10.4.0
index 439624c45f20..a6e6ec6a86ae 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.4.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.4.0.gem
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c00ac6b8cec5f508fe4e1879aa204f3
diff --git a/metadata/md5-cache/dev-ruby/rake-10.4.2 b/metadata/md5-cache/dev-ruby/rake-10.4.2
index f5d48ba20b31..140578235916 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.4.2
+++ b/metadata/md5-cache/dev-ruby/rake-10.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.4.2.gem
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c4a7d06cd67dc06dbd753496aa389c1
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
index 82991f3da3da..9281a42e4768 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/luislavena/rake-compiler/tarball/v0.9.2 -> rake-compiler-0.9.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e26acc1ce368eb2ecbda67639b9659c0
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
index 2366ff5903fa..31b3662c0954 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v0.9.5.tar.gz -> rake-compiler-0.9.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f86fc756b792b2b6455af6d949562fa6
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.1-r1 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.1-r1
index 5f6eda81fed9..98fb34543223 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/open4-1.0[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c29ecf746dd033bc41c6675a2c9154e
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.2 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.2
index 5965b162a87f..7a5d430e696c 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/open4-1.0[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=053838b24c6b998dc26ffc9ae05138f6
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r1 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
index e00ff814c837..41a7a95eb3a1 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash-0.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e366ce901b6cea20bff892ec519364ea
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.15.3.1 b/metadata/md5-cache/dev-ruby/rb-gsl-1.15.3.1
index dd59e5aa24f2..53e5f691f10c 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.15.3.1
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.15.3.1
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-gsl-1.15.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54353530d8d07dd7c603a628c240fb0e
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.3 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.3
index ab3c408f4aa3..158e68e2dcef 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.3
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.3
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl ruby_targets_ruby19? ( dev-ruby/narray[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-gsl-1.16.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dfe2e07f400141ddf2f660d53f0e174d
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.4 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.4
index cbbdd486f417..f96c4c9f5855 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.4
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.4
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl ruby_targets_ruby19? ( dev-ruby/narray[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-gsl-1.16.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef5eb790773355a41e69889d770d7967
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
index 763a7125b109..5b08275fb1b2 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05db7db835a1b993c0c9dafc25d0adcd
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
index e515ce2f75cf..1f79d9e3b7af 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdc2cc8fde423d64566361bae0b770dd
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.1 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
index 2f47d70b9c68..660bd552077b 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e3018966b1cdfd8b1a15c027b7ebaed5
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.2 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
index 1c2e82eab1ea..536e6a1a3ee9 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e36178b04e467e8ab7dd4a379a7b90e0
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.18.5 b/metadata/md5-cache/dev-ruby/rbpdf-1.18.5
index e0ccd3a0c375..a9595fcf57a6 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.18.5
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.18.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.18.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6646bd3996f9c50102ccef29b0263396
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.2 b/metadata/md5-cache/dev-ruby/rbtree-0.4.2
index 4b5eeb4e3c0d..70652ac5f35f 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.2
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbtree-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a98a5f2e9b3c6dfe33d5ba9ba5921482
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.10.2-r1 b/metadata/md5-cache/dev-ruby/rcairo-1.10.2-r1
index e96513d42469..0a2726f70322 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.10.2-r1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.10.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.10.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ad75eac0c1157a98b9bf1dd21871c52
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.12.9 b/metadata/md5-cache/dev-ruby/rcairo-1.12.9
index 57ffca3bb406..d52493b355b7 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.12.9
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.12.9
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.12.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec479c6f2de847c5c9821087ec169d5b
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.0 b/metadata/md5-cache/dev-ruby/rcairo-1.14.0
index c500f325516b..b8a941b796fb 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.0
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9004e87e9878ebaabb9cbaf2fdc4c17e
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.1 b/metadata/md5-cache/dev-ruby/rcairo-1.14.1
index 877ea2394da5..78d1b47c8c59 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43a22585e29194d118769f0ed5cd291f
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2 b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
index b323404cfdb9..a729b5ffff0f 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-1.6.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d16b0d350b0ff473638b5811511d0e47
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3 b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
index 8a332ad45e99..595a16a73ae6 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-1.6.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b5c8f4606ee9455c231cd73884826ab
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.7 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.7
index a08c243eb9d1..a09a92d61bc2 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.7
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.1.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b0fe833c5e994860019d533370d6bbed
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.7.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.7.1
index 85589b3813dd..1a08d75acf49 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.7.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.1.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7bc1e62e607583fa60ef62cb1d5452cf
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
index f20f4daf2158..425a42f11fa7 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.1.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36ff337c436a2982c4a26cb241a78ed9
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1 b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
index e3ec4fc6f835..5109b6ee3570 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e257761cc95891dc0b12584c594d8529
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2 b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
index 231d2f70888e..384bfea57705 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=526247a58acc457fff8b9698aa2e75ab
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.1.2 b/metadata/md5-cache/dev-ruby/rdoc-4.1.2
index 38506aa5e2c9..11c9746165d5 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.1.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c13dcfca5cc53534d09d97652365a20
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.1.2-r1 b/metadata/md5-cache/dev-ruby/rdoc-4.1.2-r1
index 79d42edc1983..bcd081ce76e3 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6080ab99bbe61488281b21e2e72c61a1
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38
index 3e9df090091d..de9e43d086db 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4785405192edf69d1df4f01e5c46eb70
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
index 35fcf8b60582..f64dd5a7c597 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b0bac54e88ce6b959aebd058d391fe04
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3 b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
index e6fbf451403a..b68596970143 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.2.3.tar.gz -> redcarpet-3.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8348da756f0ce6231f111afd3c1b3b6a
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
index 0262e1e027bd..64458ad68099 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e30f62878361be999b7c7814591c34ae
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
index 3de71a790f90..e057186f25dd 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f332b912d1e2fb2527ee39da181e2ee
diff --git a/metadata/md5-cache/dev-ruby/redis-3.0.5 b/metadata/md5-cache/dev-ruby/redis-3.0.5
index 272652cf0240..277bc59be384 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.0.5
+++ b/metadata/md5-cache/dev-ruby/redis-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.0.5.tar.gz -> redis-rb-3.0.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c5c30b38cb94482af11abc636972864
diff --git a/metadata/md5-cache/dev-ruby/redis-3.0.6 b/metadata/md5-cache/dev-ruby/redis-3.0.6
index 5736b3c80198..831bb0170d37 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.0.6
+++ b/metadata/md5-cache/dev-ruby/redis-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.0.6.tar.gz -> redis-rb-3.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62594e4244a2a015ce19e608da092156
diff --git a/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1 b/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
index ab053dfd531f..36a20a7cd1f9 100644
--- a/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/require_relative-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ace27418410715964f25a7f145a30213
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0
index 74ce846f6e13..d52b52a04acd 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55b6421148a5769e06f6055f566a3fb7
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
index 2863dd989d26..42d0c4664b93 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a77131731c4ab6f98e59b8aef2f4524
diff --git a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1 b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
index aa3cbc15625e..0e9ce52ad382 100644
--- a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rev-0.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f9cd612ffd9a3ed18d3bcb74f82081f
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
index c945d4124c5c..a3df74f5d40c 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=!!app-admin/rex ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d500ededda111d4de6e684394dbba3a
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
index fb2271d2c6d1..8685a48b75ce 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=!!app-admin/rex ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b806557cafb787ced8169c194bc802d1
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.6.6 b/metadata/md5-cache/dev-ruby/rgen-0.6.6
index f2a4762a863c..ea5595d74460 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.6.6
+++ b/metadata/md5-cache/dev-ruby/rgen-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.6.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2016da80a9a582863ec398e5764183e
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.6.6-r1 b/metadata/md5-cache/dev-ruby/rgen-0.6.6-r1
index c44c73ed731c..72319e8f72f7 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.6.6-r1
+++ b/metadata/md5-cache/dev-ruby/rgen-0.6.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.6.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e92f56f1364f9d54d0a82fdec50daf57
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.6.6-r2 b/metadata/md5-cache/dev-ruby/rgen-0.6.6-r2
index b4c52e4ca336..3acb1e43f103 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.6.6-r2
+++ b/metadata/md5-cache/dev-ruby/rgen-0.6.6-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.6.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5894160740e28a61f8dc37ffe265d96b
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.7.0 b/metadata/md5-cache/dev-ruby/rgen-0.7.0
index a89331fa12d8..0e8aa462037b 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rgen-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07cd29b40864963e3804d1b0a76c111c
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0 b/metadata/md5-cache/dev-ruby/riel-1.2.0
index bbaff0b45dd8..a7da2bc172ec 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4:0[ruby_targets_ruby19] d
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03a57c0f3272fbaf11a03e31dba5ff28
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
index 5423eda38cb6..c6fa0cac1eeb 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/riel/archive/v1.2.0.tar.gz -> riel-git-1.2.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18144a77d9b9b97e5783905f4eebbf28
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
index da2adfb71e1f..0850e47d827c 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=384ee62d0422265eb462e4cf44541aae
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
index 7e2e9968d1b6..c00b27be1a83 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0616b73993d68178a9ebfd2a6043a24a
diff --git a/metadata/md5-cache/dev-ruby/rinku-1.7.3 b/metadata/md5-cache/dev-ruby/rinku-1.7.3
index adc43e25626b..75cbfe4918f5 100644
--- a/metadata/md5-cache/dev-ruby/rinku-1.7.3
+++ b/metadata/md5-cache/dev-ruby/rinku-1.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-1.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6156a4701cb3236294a4bdb35188fe47
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.4.9 b/metadata/md5-cache/dev-ruby/rjb-1.4.9
index 4924809f62a5..bf9f2210f666 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.4.9
+++ b/metadata/md5-cache/dev-ruby/rjb-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.1.9-r1 ruby_targets_ruby19? ( dev-l
 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.4.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f65f47b24a273f6cac47705c051398a
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
index 45cf3e888fd0..468ceb97155f 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=22f2dcf27c506ad6eb083a0cf374e652
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 21321034485a..47cf9518113e 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=335495347ca03e290519717d7c115940
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.2-r1 b/metadata/md5-cache/dev-ruby/rmagick-2.13.2-r1
index 253672d3b69b..0cedf8625ce4 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.2-r1
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby19? ( dev-lang/r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubyforge/rmagick/RMagick-2.13.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=585ccad20cef2803a3afc5e017431a29
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.4 b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
index da848047c455..40311620a741 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby19? ( dev-lang/r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.13.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=067e5af9af60e5b758a27b0576922a66
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index c5c4f82a3187..7f0e9dcc548a 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/robots-0.10.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8cd080f81fb8c0a98a0788ac2ec2598
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.7.7 b/metadata/md5-cache/dev-ruby/rouge-1.7.7
index d27442eba9c8..a8d05e008501 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.7.7
+++ b/metadata/md5-cache/dev-ruby/rouge-1.7.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.7.7.tar.gz -> rouge-1.7.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f7c266ac4ddc0f419cd87572e74e246
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.8.0 b/metadata/md5-cache/dev-ruby/rouge-1.8.0
index 7e36efa358aa..233f5ac0cc00 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rouge-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.8.0.tar.gz -> rouge-1.8.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4335bc70f490a535283dfdbafc170f8
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.4.2-r1 b/metadata/md5-cache/dev-ruby/rqrcode-0.4.2-r1
index 80cb51159229..32f6da54e5f5 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=adb568a87b171a6eeb060ffaf2263bec
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2 b/metadata/md5-cache/dev-ruby/rr-1.1.2
index 9f7dac808b71..466609e038b4 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75f7057baa960da8e6d4d1f93d10e178
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1 b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
index cadc8c55ccac..93c294db9c34 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62d044e19389bda8349c0c372b0e791d
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
index ead7ec1204c4..b4fc99d907b0 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=81513d4c6291a9a2980c81257fd4050c
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
index 5bf9af2cd2f9..e98adb626634 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8-r2
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.4.8[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ada8a6b5f913702793916cbe809e36b6
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
index fd593d6ee3e8..ccbed452ba48 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.4.9[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=575a39b89aed1e49b5494ae22033fed3
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.2
index 4a7e0d000ccd..3710d53cb75a 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.5.2[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fbb3b7c2cf55532195384b3556dfd82d
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2 b/metadata/md5-cache/dev-ruby/rspec-1.3.2
index 3f6bcf550b67..e31d4ee58329 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2651d3e213e1466b36d7e0e41d5cc54
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
index d6c56b4795b5..7a0f491ab547 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=926c9fb41bdee1c813e0496ea30063f1
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
index 63e95e06157e..7d6e76639019 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3771534af4befd18c5ec1911ef85d84
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1
index 17739ae4ed31..e6a247fb563f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50042f8d6575bbacf4946aabde9240f4
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index 06407e4a0307..736cb09a5d70 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f3905430286ee9728f9b3a610196113
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 4f2fde52929c..db997cd67131 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e243aaa6326397239b9d0f3924a2d5f3
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.1.0 b/metadata/md5-cache/dev-ruby/rspec-3.1.0
index cb01839d67cc..b288a32413ad 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.1*[ruby_targets_ruby19] =d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b9bd6f917f6943571e81317e345deab1
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-3.2.0
index c29b2d20be7a..7cd558ee7d35 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.2*[ruby_targets_ruby19] =d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14d7c4de5b02d8fd4bd033e4ac8147ab
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
index 83883889a1d2..4541e87c5f31 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f346940387040d604c1b75ceec7ec6a
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
index bcd0c76fe5f1..889764700a48 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9c31d2d51daa6d08708e61d5daaeede
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4 b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
index dd24ada7d7d3..83315be045d0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.14.8-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.14.8.tar.gz -> rspec-core-2.14.8-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e97a8e6a6e74c0d4b818a200709a4eee
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
index efb80b8e6a51..e05dbba18017 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a79bf2d045893738239bf358cb214c51
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.1.7 b/metadata/md5-cache/dev-ruby/rspec-core-3.1.7
index 69fcee99bb2a..e838937515d4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.1.7
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.1*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.1.7.tar.gz -> rspec-core-3.1.7-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c4836f2a5a38e40b52864091250b6e9
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.2.0
index 3a38f9d6a98b..0e9fb7597c86 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.2.0.tar.gz -> rspec-core-3.2.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=34b5f3e7d0f6e91a022e57f7e0d03b07
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.2.1
index 96fb07a268a0..88b0ba91c439 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.2.1.tar.gz -> rspec-core-3.2.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e56dd08554db210a8d931ea3023a9a14
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.2.3
index 457bd865589c..941daa120b08 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.2.3.tar.gz -> rspec-core-3.2.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef9790d98caa9e0a8375326cad0dd24e
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
index d58e3ddf9925..1972e11ea932 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7cb723e70adfaf24958bfb4ee184a40e
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 8b35fd2a2911..1ff54afaad09 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=38e6fa49e67817bb00b49110f220f727
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index a44b036e0bf5..cfc28ff79609 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06c7c6ac5c997e75028a51ccf2027929
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.1.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.1.2
index 3ea4b8675a80..8ec19511a31d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.1.2.tar.gz -> rspec-expectations-3.1.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8a9a0eabc08458d035d6289316a6bfc
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.0
index b9899a2e659e..9131a5448af9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.2.0.tar.gz -> rspec-expectations-3.2.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95f4e2d56031d0fe0a084821009a19f8
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
index 668c903ac2ad..9b52ad064a32 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.2.1.tar.gz -> rspec-expectations-3.2.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9db47ac6938284a9a90d94a1cfa89069
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.1.0 b/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
index 5e2eb31730bc..90cd918efd00 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=758c4e5a30af5b9f35f576a09a1285fe
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
index da2869a11045..ede45126d2a3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d470a43ff5490fa8a77afdfd8968d3e8
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
index 1f4fa8773d22..7ceaf73aa99b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb39e7169557b7742e89f1ccc4166611
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index 2fd655ab74ee..0719cadb51cf 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cdeed00cdb29d03e4f908370e3c7f20c
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 82633b6d9d5b..646d5b416181 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f2294c7e7e7204c9e4f5692fd2d30727
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.1.3 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.1.3
index ee929f1842be..00c891f211f3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.1.3
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.1*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.1.3.tar.gz -> rspec-mocks-3.1.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f926adf61b101558e394bd3d827d5be
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.0
index 9fca39df6cd9..b7e3aa320007 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.2.0.tar.gz -> rspec-mocks-3.2.0-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d17242eaa0e84031c1b0a4dfd354d190
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
index 5725c47ba27b..7f9e82f0fd12 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.2.1.tar.gz -> rspec-mocks-3.2.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=81579715c42fa0c176c1e10aa632d528
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2 b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
index c058125b3e5c..f7f865e2153a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.14.2.tar.gz -> rspec-rails-2.14.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68a113039eeb8c14f2fa82ea03fe1ef8
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
index 0409b72aabb8..1e8d252d7be0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v2.99.0.tar.gz -> rspec-rails-2.99.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c98bed4283097fc9765dab38b1beda2b
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.1.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.1.0
index 5bfd5472fe62..e73fb8649634 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.1.0.tar.gz -> rspec-rails-3.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c99d8376a513f6fef8a8ea9e73cbe69
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.0
index 97db8ce81fb8..aeb11d1e6439 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.2.0.tar.gz -> rspec-rails-3.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ae7dd5c009434e24ae2a1a0bd1e6f02
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.1
index f15f0e9c00f2..d46f6fc910e0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.2.1.tar.gz -> rspec-rails-3.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d29193f7704a21c44a09bf3e2080db50
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.1.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.1.2
index e8c1f020151e..b6b1f69c1eba 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.1.2.tar.gz -> rspec-support-3.1.2-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a58d41e6d0aa8401e29ad6220c86899c
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
index cb17ae057c6b..6c77ffb90c8e 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.2.1.tar.gz -> rspec-support-3.2.1-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fa5faeb4b575138cedc39a36277a6c4
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.61.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.61.0
index 60221d17f492..76902ce80434 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.61.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.61.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby19] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.61.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=882a24ba8e41048004d6698faf9402ba
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.62.1 b/metadata/md5-cache/dev-ruby/rspectacular-0.62.1
index c1f3bbea9f7c..b28db737c527 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.62.1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.62.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby19] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.62.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66345bc0398680e25f6e16c54769d6ca
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-atk-1.1.8
index 151a9269326c..8471aeba1cde 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.1.8[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f807e28cb94b3878ab01ce6103b7274c
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-atk-1.2.6
index 02647f0e39cb..a1458ce1fd3c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.2.6[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24e5711aa2031b1f4fee34c75bfdfb29
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-atk-2.0.2
index eb6ef8dee0db..5b48fa3eb92a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e0c53fe69a7524a8ffe08c0d8775548
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-atk-2.1.0
index 4fcc9b29208b..a3dc2cd174fa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3ef43192aa2a737cb6a4a4d60930e7b
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.0
index 46bfa1aeaf1c..e3bc4cd68941 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f99ef8f97389d0a22ddecb22e231a3e5
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.2
index 8c666fd7c70b..9afdefdd5522 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.2[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f22f0a0be0414ddca029a35f4fbb3d6b
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
index ba62472a4160..c561a707b35f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2733b1707f7fa9f4945c2f526401247f
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0
index deab4ae7b9c9..ab3d24b397e6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6a9546ce9eab6113efb81ded2b72f32
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
index bfbeb4ee15b6..771371ba4f9c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9983f7643ccaff3e51fa40af8730f57b
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 6d0c4c9aa420..21c493f578e3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ff89a81906e49c55efe7c170c4f5d17
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2
index 5748ddf55b2a..cb8ace44014c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.92.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec8bc2e6e9f36d0f5b8ab808d6c744dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
index 9a2957c26395..755807536952 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.93.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d36adb64811bc05ffd259461ef8ca06
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-1.2.6
index d26d42cbba06..9ad34f5d6f57 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5d120d3e56a9057deaa071a9e479cd0
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.0.2
index b2a4271f9a81..05017e8b20f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdd21fb7829609b4391d4f1bfab9446d
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.1.0
index 8159c9eccbcb..735026369ac3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d71d769a31e7b5e25ab2c47dcf580df5
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.0
index 06e3a8b3f2c5..b58559ff528d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82228bf9741fc75fbedc9b7430be0c6e
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
index b372d84d7ed1..8eda66c8917c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=23ce48e8e971921d646c53170f7c1d4e
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-1.2.6
index 4379fcf7b9a0..f1a3fd82b14d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-1.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c9ad626a9137c0d6a3cca5791ec0059
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.0.2
index d6cf2bae841b..8abf0bd4091c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=454098faa4f4531c1cbd19553cd4fbdc
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.1.0
index e56e2996af07..e457f866ed0f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc7c9314bbb0af1a72268667509baa40
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.0
index 49cef8836280..9d5f240a55d0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=939815dfd5206050ad5213991e7028bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
index 938dbd2d9b1d..47a4057a79f4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5db5a08751883073b10d31192ec0d858
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.0.2
index 957629c00e15..6bb84ccd013a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b3757877556575455d1025dbd46c9e47
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.1.0
index 7cce901b4cfd..3bc1c01f30d4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd57ad9920c476704277bd0e9f12a3ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.0
index b74506d2f4a2..c428280edde3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7735103a9d971dd242f4e2f37ce380aa
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
index 1f5d21c9b0cc..c259b53a0d0b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f5b074971cdb77d2c82c760ff883fb6
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-1.2.6
index 54b687420b90..9a0c2da9710c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-1.
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e3634eebdc998da060cef2dd10a86d8
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.0.2
index a535cc2d99cb..b1f2f9da118c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69d4977510ac91469f27be4462f3ca92
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.1.0
index 7679fe37ffd3..e8eb16693d95 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fac8f761aa41957b116d14a69441e2ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.0
index 7135667ab677..c9fc769afc2a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94eb1098e08b36e3cb558ca17904e99a
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
index f0c2f92ac815..8a8b8a71a930 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ddb66e2af5a8592f57b82737ae7010b
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
index 3bb4e31717c3..46de356465c7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f02fac65fd19a10d3a683ec043396007
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
index a87a8e720c76..eef1e6c04315 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2af23ee711f0a2758c69d82fd5b50cdd
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index 0cdf09e43c2f..33781286dbca 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=virtual/man ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1d0e25dadcf8287a6efe9dfa9758de6
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-9999 b/metadata/md5-cache/dev-ruby/ruby-elf-9999
index 5aad598b6117..d33f9824ce6a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-9999
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/man ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb00c67563beccae41609587ae5f858c
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
index 79f4cbebf0e6..638c2b3ae80c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/magic[ruby_targets_ruby19] ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://github.com/feed2imap/ruby-feedparser/archive/ruby_feedparser_0.9.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3f603f2670a758dd796c25baf4bd53a
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.6.3 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.6.3
index 65f9a36ab025..5a40562f9059 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.6.3
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-filemagic-0.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=14846e00c663b69733d96455ab6e6d34
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gdk3-1.2.6
index d155c3835338..c05a669084b9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.2.6[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5612631455944e01286ca1f92bbb90d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.0.2
index 0f9cd54075fb..275128f6f6d6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.0.2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21eb80191a1f85eac91dd2e1dc7c9db2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.1.0
index 08644e3ce53d..a926f3eec7fe 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.1.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcda86fdfe67f3eee174bd086d317423
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.0
index 0a8ccb7c8de3..2cf721bee9e9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e40153dd4259fc1485472b2709110575
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
index dc333ea24155..efdb5a52eb47 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88080b9ac0f912c2b265d93d18a0359b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.1.8
index 216f04e8c929..ad55fee3d106 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.1.8[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=99b11284039b27d42f925cf0623fa70c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.2.6
index 4fc6b6081e21..3fb71ba4e4e0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.2.6[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc364f522c8990170313a8ff6da0b397
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.0.2
index f6f02df0f15e..0a83c0e97a3a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbeae4b3e49519e377e360dc0c710281
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.1.0
index 0195dde68a8e..a3ebd8063f7e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a95df0b12e580b048b104d5320a1c39
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.0
index 547c9ca70fdc..50c14360e270 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3805a5b9def218e2b75898622e807850
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.2
index b3ac1d25a085..fcb8b6ddc89f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.2[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=376e3780bca63bcc422c7f7a500d5bef
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
index 25b05c9b8d02..b1ab77b00a17 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fc8b7b53784b45651be425da367ec66
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
index 89b7bf82235c..6e231e566c31 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e39d690247eea49284dc60784e16a99b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
index a8c2780c10ce..dbc969f1621b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e91ab9feccf222dd30202907b3cc6d6b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.4 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.4
index 1c03fcdc04e5..ebdab0e2d32d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.4
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=906f41bf91c66c62bfab7913290e409c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.5 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.5
index 177c2b9d81b2..28521a1e61b7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab2ea3801263f62fdea1869325d798ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
index 641da0f54f21..5075033e434a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7105a3f00923e5447ef643a2075b5438
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gio2-1.1.8
index c6bed4f53183..c25dfe25ab9c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d184ab14d3cf0591cb788cfe9305c3e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gio2-1.2.6
index 6a7bdffeeabf..7ac6e83c0292 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.2.6[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b10d9bb9450c5710b9e23415a8814c86
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.0.2
index 7bc3b1b27078..0734c2588b80 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.0.2[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c601cc402a30346f9a5ff76873612972
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.1.0
index eeff7118cc60..fea3649fb3b7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.1.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f379b1909fd8f6c68854b541dc35dbc0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.0
index 88551542158c..50c67024ff58 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b3c09dea727959307bb615f4624db46
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
index 861ff8257f68..98057ff6b1ff 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=013ee5476eb937990b3a9b294c6ed84f
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
index 34c8557f7c65..a6e11fa803f4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06d1653091d20cb68efc419167f70294
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-glib2-1.2.6
index 6ae091ed372d..597b1c5f8c18 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07e72c9b20c52c128e3c776986b55000
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.0.2
index 27ad185f4c7a..42224839d54f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bfa5d8a8fc2e5e492d10f3e92f07a1c
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.1.0
index a6c61c13010a..3533be553e89 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df15042cad3b5f78c15870c4cfbb0313
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.0
index 83d8ab45e45f..c540233c3381 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6efb81f3823c0ec9466b90a51a9327c3
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.2
index b8d5e0da12cf..df14188c247d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=00c42e2544162ba0620be462093b10f4
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
index 6844a6692d61..7a441d675af8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18614faf9006b51462550d52eb222a74
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gnome2-1.1.8
index 71c0aec995aa..b5d8044c8109 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-1.1.8
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-gio2-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-goocanvas-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-1.1.8[ruby_targets_ruby19] >=dev-ruby/ruby-vte-1.1.8[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03b98894bb3400da1a18ef6880594cbb
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gnome2-1.2.6
index 4bcfe5a690c9..621f0a4dace4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-1.2.6
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-cairo-gobject-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gobject-introspection-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-goocanvas-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-vte-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-1.2.6[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-1.2.6[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=752a658cc216478a7070cf77d56ae58c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.0.2
index fc78c36222c2..4ede22ac6d1f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.0.2
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-goocanvas-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.0.2[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.0.2[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-goocanvas-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.0.2[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e067bb3dd43cec207c063494fb6eed4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.1.0
index ef4f218b9ccd..7848183e9b0d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.1.0
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-goocanvas-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.1.0[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-goocanvas-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.1.0[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.1.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f20d94fb8bf65350eb27160ba2bed0f
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.0
index bc8f1de58b5d..0ad4e49df9de 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.0
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-goocanvas-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.2.0[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-goocanvas-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.2.0[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.2.0[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb043dec3638e7d77db6f6f1da755c9d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
index 7f5f710e2c1a..ed5d9192f559 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=96e29da8a3217c10aa1302312a3da291
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-1.2.6
index a0c133c92722..95583f4056bd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6fc2e411bfef2c4506f899552d1d765
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.0.2
index ea3823fceea1..ac12033ea351 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce06e4be6efcea848c5052b214b720e1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.1.0
index 2ea3489008d5..f5032f5503c5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e2ef37fc0ef78970a9a12a1d0921695
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.0
index a38bc34458e6..5db0e29d5b25 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85d760041a5fd25aaf48da0edb79aaa4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.2
index 61c50979ede9..8437451b4ff4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee914c33c3a2dc94aa8039b10cf16e5b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
index 7c00a92009c4..381e80622d55 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd40de5e4aa5fff618f5603c1ec175a7
diff --git a/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.1.8
index f89174ad022e..1eca1cede3a3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/goocanvas:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.1.8[r
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20a06902abca26f690c0104eaea1e58a
diff --git a/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.2.6
index 5203eba3e366..b674583db377 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-goocanvas-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/goocanvas:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.2.6[r
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7b821e680cfe8e4b266b79b1fff193b
diff --git a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.0.2
index cd53134e956b..67ad359633d4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/goocanvas:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.0.2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0b50f914b08585b7ac487376375766d
diff --git a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.1.0
index 59fc1a0e6192..e57765caa8f6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/goocanvas:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.1.0
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b9bd567f0aafab79d4ee5f8ea0b9e3f
diff --git a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.2.0
index b8eb2783138e..218f3f0f9848 100644
--- a/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-goocanvas-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/goocanvas:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.0
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d673f8997fbb74eff04ecb7171e960ad
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-1.1.8
index c85ade28719f..6f9c4b5afcda 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa211ea58d320b32655d21835f36cf31
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
index d8a60cc1c875..61e062accf9d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b197d984189a6ac8746e7ac6d13763d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
index d054b8621294..42dfad750a1c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8c98afcd723e6d55b3562b97282607c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8
index eb40b05c77fd..0bb2bb0a3dc5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.1.8[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ab73115dfa901e116b4ad563956dc8b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gtk2-1.2.6
index 6458c6dddc03..398451204b1b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.2.6[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e3c56632b25298b41509ace54d4e42df
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.0.2
index c64aaf07b1d4..f39c3943e874 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.0.2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1c08793d971a47fa6b26326ccbcf633
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.1.0
index 98fe955493b9..98df81ebcfd6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.1.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ff00bc3130af56e3be01711e2bc8b3
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.0
index 70e1789b19b9..afb922087799 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef4c0d515fe8831f62f9aa5c7c208c60
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
index d1e32eb38f74..b9445a2454df 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=231f2f44d74d792ef04338229f59ad95
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gtk3-1.2.6
index b2819dff10ae..455aa8ce7c47 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-1.2.6[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=776a6c5a56885785a483860d0e408d51
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.0.2
index 3ac72f9052ad..6177042e19d1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.0.2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2aec3125e1769dbc2ad66fd1e8e45d91
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.1.0
index 2d1b0dee93a2..b2771530af44 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.1.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=602d1666dca99574dc2f877f433e1f6b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.0
index 1e16c3ace89b..672e9dd7b0a8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.0[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24da9f12d64a27ccd9c7a3cb5248bfa8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
index d2ca9732771a..0562703eac67 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72b02b9269bfef75b12e6b282b6adfde
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.1.8
index 37d8d7ce98a8..49661f67c500 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=411d764f11fbc3c89f2ebf42efb2e769
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.2.6
index 1f6243eab185..23afaa139f8e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1112bf258448a0ee5f0fd88700bb37b2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.0.2
index 1edfdffa5fdf..0913f75095fd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc8f4cf0a2f8216b0a5eb2e6b15ec33c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.1.0
index bcd31a6187bc..55afeb61118c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef7dd2157f03daa952718925d7686ae6
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.0
index b8576c7c574e..700b797b8d8b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8bfbd0182b43a6e138ae664d0129205
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
index 88ee8f20b64c..566b30cd6d82 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89cad22d7bcb2faee90a546762e553b0
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-1.2.6
index 7cb1e366b558..15deee12614a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-1
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48e2eea51d72aba2a7c0bf3fc98f8226
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.0.2
index a20213fd554f..07861d84ff9f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff1b76d4a78423e491f8c112eadb7009
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.1.0
index c859dc92284a..f70425e90544 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c81863031d0b0d36865af71bc43d7dbf
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.0
index f659d8b1c184..c2627c62c79a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e47acf835adfcc871c6ef6ab1d2519a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
index 4e915ed65139..2a30b27ce398 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c1d293ca9b609c274b6f43a3f36e3ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index 1b7e3d4ceba4..d1f015d70407 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-hmac-0.4.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a72eac5e19329dd4cd6c5d2d9eb398f8
diff --git a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2 b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
index dbe76c2a0071..b7feb3b6df62 100644
--- a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://gregoire.lejeune.free.fr/ruby-inifile_2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=164ab81524b7caa80f4ab3853ec660de
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
index 66f6cc2de396..638a3a6f060e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.16.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5fa2c5df4790e9e480fc1987b05f7a40
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r2 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r2
index c75c3f4d8d38..46a7f1a9d33e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.16.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bec82da41715cee9403c4100fbfe9625
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
index 64b2e7252432..53b3fa1eebb7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.17.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=91c20014581001a63f8ee9b6ec1bd1d2
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.4 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.4
index b1e2e5c7d6db..40303001d0a8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.4
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.4.tar.gz -> ruby-mp3info-0.8.4-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=86bfed5bef56f946a101ec1218b2a283
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.5 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.5
index d266446b554b..bed3bb496fa9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.5
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.5.tar.gz -> ruby-mp3info-0.8.5-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=281224f2b0dddb90dd4b8370c4fa514f
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.6 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.6
index 26444dd037f5..e4abffa202c6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.6
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.6.tar.gz -> ruby-mp3info-0.8.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ae92be1a5337264d854230c766a3b6d
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.11 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.11
index c78716882353..70926df12491 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.11
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.11.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=380b32abf272f84ad4c8d0544d6d24aa
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.7.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.7.0
index a6cb16d123f6..9194531b8025 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7389c95415575105bd33422082fc0d8
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.8.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.8.0
index 7959e6f46806..32ac3183e359 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.8.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b3459f4460e64e6c13664ac7ce64ff0
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
index de510f567e3a..c16459f8b6d0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28120e28f28a139369ceb105d25bfecb
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
index cfb7bd710ba4..f71d73e886e5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=93883aec424dab82633cd98a8e6b0a21
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995
index 3f086e29aaa5..8198b4299107 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99995.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8226733f5314e75055b126c1801d6677
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995-r1
index 134c081e1de9..194e335ce0db 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99995-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99995.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4239f4257cf75b0d8297861e946fc1a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
index a712b1187002..8a61da240bc2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.11.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=219c7ce4b2536c12e9ccebe019d41cc9
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
index 2f4871a67368..9c89d174e50b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19fb1cc7272b6e74998c132b5a748156
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
index 7757a1cc23d4..2ad6c02730e6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=245f05b871bf1764d5f3150ce48e60be
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
index 38e07e715b21..2e08c47c4111 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-openid-2.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d82e292aaf09842733395c9981a83b27
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.5.0
index f19c2173603c..ea8bfb2bb8fd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.5.0.tar.gz -> ruby-openid-2.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ad5485c9ac9ac811e57c826481993b9
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
index 63eb9a5f80a0..ae83710ed9f0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.6.0.tar.gz -> ruby-openid-2.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0206692fb2fd806f881e4f2e7455905
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
index 5df7f3bf600b..a8538e35ab33 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.7.0.tar.gz -> ruby-openid-2.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aec008b7e797b0df59ec85088c699d3c
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-pango-1.1.8
index f14168f902e9..6ee106eb5df6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby19? ( >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c3d2dec5472b471b95d4d16a2c77ef0
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-pango-1.2.6
index e65856d5222b..3f749cf6235a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.2.0 ruby_targets_ruby19? ( >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08378bcc48f98f468acb4216c2ff85e6
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
index a172b9814660..13cfe71ee1cc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65636f435c15469c5df8eb3d408367cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
index 2344467f68db..3e5be0232677 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67df006f778170204af2d07776e93f3b
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
index 8be402bd2bc5..b43c860ecf0f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 >=dev-ruby/rcairo-1.12.0 ruby_targets_ruby19? ( >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49e39a93ff7c9a0f996b5131a94aafc6
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.2
index 80fbe9cdb74b..db3659b4ee4b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=84066a50c6f3413f421488594d4e9206
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
index 27a1e27327ef..0e0d4bdf0992 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ceaefab071ec3ae7049f288e425a232
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-poppler-1.1.8
index 2883131866e9..6dca1e438e92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2dc93059715b38ada06b81e1d6901322
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-poppler-1.2.6
index df956135f9b5..3dd11348224a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=071fde2336a1c0651ebf55ab62d6677e
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.0.2
index 28e4a7a75dc0..0db49bedfcf0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=667f74f0552addf529138bdf35aabf57
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.1.0
index bb3d9ea13f3e..83aa68592ac7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b8c5be3cc23ed7933c1a1d832199aad
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.0
index ed0315051db0..680230f94afb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c86c5c64c1407463720248ce4d22d9a6
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
index 9c442b0515f8..7b958f2fce48 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea0df01a93a628754908480ca7c35e75
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.1 b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.1
index a410645308c8..864656354093 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.1
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.15.1.tar.gz -> ruby-prof-0.15.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2c970140a1282b99467e1cef23b6082
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
index c8221887bf42..d41b8368a789 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89e5a17f8bd107393c9886a0bd4b1255
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
index 5cfa545d539f..9a850a4db754 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=423ef4cde7b6e54572d311bbe01e2dff
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index 4be0d18c7bb4..4aa443caa871 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d7c1c610fed17e2bc63fa3a0c09832e
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
index b760f8a1b383..1ddb58f1c8f2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78e0e63d967a9dfe2daeef04b7c191b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index 28627884a3c4..51ee5c4000cd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e18d1da9c137f9e4a75a78b769ed44b
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r4 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r4
index 3e06ea8b32ef..f2ed6134d05f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d67ce1833ee56a3cd7e8cc34407e1df
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
index 34d19b005c3c..991b89c9693d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=38a21dc4129b4b13b47e27bbbf92d763
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-rsvg-1.1.8
index 79d7ea73ebea..f26f610ca4f3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccb7e99b567a3f90ce5dd27fbc2b79f6
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-rsvg-1.2.6
index 393f98e28cb8..05a1571e085f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-1.
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29e5256746890295b46d8d7a82b4514e
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.0.2
index a960b1b911f8..a4139bde07fc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b1e81a8e364cd9e27eed63e0c62af8e
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.1.0
index b09f4ac38854..65f1e02d3033 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6844731c2c58e49d0626e26e1789fe88
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.0
index 19d1371cdec9..5faf2375aa69 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=34383a7e28eafc86605e50090d4a02bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
index b46ecba3721e..60a8953084f4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33854b8cb635d9c1eb2d731d4ffc71a3
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
index e880736eaafb..e7683e29f35e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubyforge/rubysdl/rubysdl-2.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5fc4d170d57a6befc71c68138b205485
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
index 1fe1b52ea77f..c94976852b4e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5ffa9bdc0b5b78377a76529b84923d4
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4
index 6195c36c81a6..b16f0253be2b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=685ec52861434413ac6add7610f8d11b
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
index 38b7b8a64f29..1f4ec2fa00ad 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5332c2d574561425cc3c4fa8cb39ad8a
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
index 901183165228..cb1f58065f2d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e99101f30be51df6df24fff14f59902d
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
index 9c7bec916a6a..edbc2c702b4d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a58c87c72087b7643cc40f0282863691
diff --git a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2 b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
index 62ee5307c7bc..f924ab1e0904 100644
--- a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libident sys-apps/tcp-wrappers ruby_targets_ruby19? ( dev-lang/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://shugo.net/archive/ruby-tcpwrap/ruby-tcpwrap-0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7446e3a8ec829498d10ec55f643e9318
diff --git a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3 b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
index 4dbd4f1057cb..117c87d8b22e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libident sys-apps/tcp-wrappers ruby_targets_ruby19? ( dev-lang/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://shugo.net/archive/ruby-tcpwrap/ruby-tcpwrap-0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9212b42a751dba1089d242d18b3c545f
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
index 248b9aafa98d..2fb7df1046f5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7012dc85149f6d2735276e8fb101b2fb
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-1.1.8 b/metadata/md5-cache/dev-ruby/ruby-vte-1.1.8
index f29d9115cfcc..fa85a7be58a3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-1.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-1.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.1.
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d89294d25319b9f4842b5077e6f78f0f
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-vte-1.2.6
index f2204a1f3d4e..3059827473b7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-1.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b06365bae8648f6cb118168afdcecb0f
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-vte-2.0.2
index d72eeb2e32ec..f7f5c87199bd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.0.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a2eb727775c974219906b9e3110d1b3
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-vte-2.1.0
index 09671cda9844..99c78fd77d79 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.1.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1497595b5f25e0ea0df461a17906f4cb
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.0
index a8e3cf7b23fb..c96a7deedd22 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=32796afeeffb4ddd8ff67fb346c25b88
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
index 97541a5104e2..f584972b643e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce84f950f2003640529ec30145ea72f7
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-vte3-1.2.6
index d53c524cfce6..608ab2a4c4da 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-1.2.6[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58c8cc16279cd76eace79e9ed1558952
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.0.2
index 81581a64b992..47dd32e12f9a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.0.2[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e8b9e2cddb70d4d94d04b10c7986137
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.1.0
index 160d339ed07b..07eb0596a32c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.1.0[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c71a8c1d8667db2b6a71e94d1b44e47
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.0
index 1aff329cf8fa..27c35c984b3f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.0[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d24d656b6dc22d60e5e4b8d09dfd1b8
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
index c95802b93d31..ec667e97449e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1de34de3ba6b62bcaa5b31b1161f5d1
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-1.2.6
index f5d4f063acee..bb8057dce44b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba1e76329f8bf24f168177fe56af30ea
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.0.2
index 47d6bef8f1d5..746ad4a73f53 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3eb09f8da4a64bfd8f5b7dd6d8a143dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.1.0
index 590b8f28252f..354e99984430 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49dd62c0a92789b1b444dc4c9b406e3b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.0
index df41eed12370..f277913e689c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ea2e15fc63f9291be54e4cbc8a3ab79
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
index 171db471c0f1..884a75d318ab 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6ef804d88bdf03fb828f8f1a2df2fb81
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-1.2.6 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-1.2.6
index c09f22fb2fcb..e0034b2e64f3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-1.2.6
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-1.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7328bd2efa22055659ac0e9bd5bfc9fa
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.0.2 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.0.2
index ad36feed8a63..28cb93c7ea12 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.0.2
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff0a37ae7b53529887c4cbff6826c04e
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.1.0 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.1.0
index 877b9612ed9c..28981cfc1069 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44c4c86ef7cb1a9dc691e7ddb0dd9f7e
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.0
index 5ad9ca299488..3b7d261a2e30 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=92c3b617dff2e03cce600d1971467e0b
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
index e24db8041730..ee12aa021271 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bab1f7ef1ccd802cb44919b03d271a6
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
index 87b47e12e2c3..e7a60c59233e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d7874fbdd7454239f3eb3ec47078474
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
index 79c9ef8ce7bc..747f7bca315d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c7a2cec416ca0007f9b389a2b1a0a695
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index e7ab66080687..4ec5b52a3f1a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-yadis-0.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad75920bb0d74f77e20727055f7b4e53
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
index 313eed59bf89..70ab11169aa1 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] de
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f3b81893b32d7481675407f20bc2af24
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.3 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.3
index 52dd75d16926..1af5d022ef05 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.3
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bafa54c9fcc7fb9cdd1cd725f9527c62
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
index 8c918ea0e1b9..1053c810c2e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8f94c9c8c20ab8c6c5dd4ffaca28403
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index 813f054fd90a..0e81e994f547 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby_gntp-0.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=573c99916982d53302bb44a1e902c166
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
index 953dc1e5f964..499cf0b0bba2 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80fe812f52e05d8366d2fbf89b89a01d
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.4 b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.4
index 74eee4fcf53a..f60efabd8644 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.4
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.6.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=803024f2eed34770c3f8a3104a27d688
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.5 b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.5
index 63f70702e947..4df7a0ec1d92 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.5
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.6.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f27237e8bc2522a9f4ce0ddac7497fbe
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6 b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
index f8a3862fa997..1a2ff058746a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.6.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fd723562aa1ee27c442b5a38453ffb9
diff --git a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3 b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
index 1469621b364c..5e0e473cfa2c 100644
--- a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyforge-2.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=149a4d2b3a3b84dab469dd441f0dae2e
diff --git a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r4 b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r4
index dfedab209840..77de858be40e 100644
--- a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r4
+++ b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyforge-2.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf6fab3b704ceeaa7a55d2749b3c2ee1
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.2 b/metadata/md5-cache/dev-ruby/rubygems-2.2.2
index 9ed3f2e47eee..b1445f068482 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.2
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=575461695090c4e145fc1338cb4d7bce
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.4.6 b/metadata/md5-cache/dev-ruby/rubygems-2.4.6
index 81ba8f18ee3e..0e4f9f0ca297 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.4.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.4.6
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.4.6.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c05c0c0db8a6518ba8cc384af2302eb6
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
index cd70d13c3eac..709a00b9913e 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a94160af37a03b6d78cb1bb5c3857848
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
index 38ef5d937d9b..1543a3c69e23 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88136d917379920109d30d13d2c8e597
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.7.0 b/metadata/md5-cache/dev-ruby/rubytest-0.7.0
index 79559b63f8b0..58bb40cf97b5 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-0.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b554514b8e746a4d725b87452ba1b3e
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index a5bd0a9a883b..3158b559c7da 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-0.8.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d005b8b42a78e924517d32d394bbbbf
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index 1f1a94d8176f..d5551913398c 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] >=dev-ruby/rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-cli-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e277be42e2a8f512c3b458c78f003f8e
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
index 814f9b85e0cf..ca739a8eb192 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytter-1.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dca6c5112ca600bf992a453fce5976d
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9
index 0472718bedc7..d0e4063c9e06 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9
+++ b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=52b4eac86c49012c383dae065afe3e78
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
index 1e48b590075d..b15c44e8f24f 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=5
 HOMEPAGE=https://github.com/aussiegeek/rubyzip
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-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=Ruby
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=06546b081340e6b27d4a47ec6620ef8e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=01990af18534925266f290a142d4a26d
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
index 57d28f1a8feb..c59507b22bbe 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
+++ b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0deb32181113591fc651f9d6b4283705
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.1.6 b/metadata/md5-cache/dev-ruby/rubyzip-1.1.6
index fe4972c081e2..0b38767d8c8d 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.1.6
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.1.6.tar.gz -> rubyzip-1.1.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c31ae197f9ed5e51316c17dcd4927b1b
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7 b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
index 8909a8f7d669..61a86cede482 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.1.7.tar.gz -> rubyzip-1.1.7-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90add455c4bed6f62dc84d04a36ff834
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
index dda74fcdda58..1025b5d7f140 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a32f76fe100befbd4fe39c935b086c1
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
index 70cdaf797d50..6ff581b5b94a 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4746554b919e1f9ea27bb3aac0162789
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
index cd2e67d19ae3..12b74f96577f 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5257ad2b137ae2d5c14e4b2825fa7deb
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
index ec1a86c5b196..9e561a971eb7 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=abe5a2a58e66b99f40e336f2a9d31961
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1 b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
index 75842e4f3e0d..cd7061792445 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rgrove/sanitize/archive/v2.0.6.tar.gz -> sanitize-2.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c63ca8db83c8475c9e5b4786bb5b4882
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.1.0 b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
index 5ba7d5994067..0b820238d46e 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sanitize-2.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cd1a53ab273b2d3ef151bce90eb64a0
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19 b/metadata/md5-cache/dev-ruby/sass-3.2.19
index f2a9bc7ac987..237b59b1a886 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sass-3.2.19.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c8c8a1ce770dfd762695cf0f93d52ae
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19-r1 b/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
index e7cff4c8f29d..74748df8bcf1 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sass-3.2.19.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=599a44a4d85a66f92c0e621582414342
diff --git a/metadata/md5-cache/dev-ruby/sass-3.3.14 b/metadata/md5-cache/dev-ruby/sass-3.3.14
index 45f435b18509..f34e43dae17c 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.3.14
+++ b/metadata/md5-cache/dev-ruby/sass-3.3.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.3
 SRC_URI=mirror://rubygems/sass-3.3.14.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=094315404af1e100202226272e0a01ce
diff --git a/metadata/md5-cache/dev-ruby/sass-3.3.14-r1 b/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
index b3174949fefc..f42bcdfcf68f 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.3
 SRC_URI=mirror://rubygems/sass-3.3.14.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c071c55a4b28546c8266bda965a91cc
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.12 b/metadata/md5-cache/dev-ruby/sass-3.4.12
index df4ca40dabeb..7065f3840f3c 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.12
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.12.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a1b93af0aca05cb234d66f0fcba1a16
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.13 b/metadata/md5-cache/dev-ruby/sass-3.4.13
index aa1d156fb199..b1e3d4d1c458 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.13
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.13.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1949090e3e6b4e1b1220bc369cf685f
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6 b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
index a618dc15444b..ac805d965396 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
+++ b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://rubygems/sass-rails-3.2.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aba03ee7f7582a5269c0e2d5700720f3
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
index 03f7f6ff50e0..c878ffdc7bf4 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://rubygems/sass-rails-4.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80ee1a939d0cae1d842b7e56c48ce736
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.1
index 0076f1c05351..deaa383f04c7 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=mirror://rubygems/sass-rails-5.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c93d437534010fa031eb2ee25fcab2a4
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.2 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.2
index 2f5ac3415d4a..8536b9ac8fed 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.2
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.2.tar.gz -> sass-rails-5.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d447a5af89a2390cb89ef25da859d4d
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.3 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
index b6b64668852f..5330f25a7675 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.3.tar.gz -> sass-rails-5.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b9a0153cb3fa10d5f8eb8fe73887458
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.3.20 b/metadata/md5-cache/dev-ruby/sdoc-0.3.20
index 59bafe446036..e181859a11bf 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.3.20
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.3.20
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sdoc-0.3.20.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e1b4aff4fff53ef82b43679c54384be
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.2.0 b/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
index 5a96faa7ba9b..008eec58e573 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.2.0.tar.gz -> seed-fu-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7839c8f069e09fb86270cb7e7abee5da
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.3 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
index 08fb475a1d10..e1f875b3eece 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.3.tar.gz -> seed-fu-2.3.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc981afda634a839ff461e509e1915c9
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.4 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
index 6af3cc5dd69a..6436d3644c2a 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.4.tar.gz -> seed-fu-2.3.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=faecbe1a0cb1bfa3a67118eedc88cc3f
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.5 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
index 5b829f0a6170..4822c228cc7e 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v.2.3.5.tar.gz -> seed-fu-2.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce0c30a258e2db63b4d58f7edb4cf8a7
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.43.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.43.0
index cb0227bf06bb..284eee6f7494 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.43.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.43.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.43.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f58e3d19da960953f48c372b3cefcce1
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.44.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.44.0
index 0dbd6e203e5e..31d531a6a45b 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.44.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.44.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.44.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56720e4a4b2b156e8d89f2c4e8f376a7
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
index 30886e35d67a..1eb0db1e3cf2 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.45.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.45.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0e7bf27adab8552b9f80584d8581801
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.0 b/metadata/md5-cache/dev-ruby/serialport-1.3.0
index 29ecf1d8099d..b316d5bc336a 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.0
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c658c790dc4d6882e1253539bd9cb998
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index cd253c83b99c..340a9cca3fc3 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c38d440a41f05861a57a9d26eaa2cff5
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.2 b/metadata/md5-cache/dev-ruby/session-3.1.2
index 7a7bcab7a4a8..18811876fecb 100644
--- a/metadata/md5-cache/dev-ruby/session-3.1.2
+++ b/metadata/md5-cache/dev-ruby/session-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=485001f8085e2716a74fe40be23c3b7c
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 96ebd6d417c7..867512832f11 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=081a3a77aa7ce5702236336de009733d
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index 0a78fa54a861..623f45712799 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/settingslogic-2.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e802d55af7e0e598f1c4e7a158e5b78
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0 b/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0
index b23741fe4442..d82993c07917 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/sexp_processor-3.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27ac20c3980a9ae9615c7505c50e2ac6
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0-r1 b/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0-r1
index 93d5deb909e0..a7ad98c57bfe 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-3.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sexp_processor-3.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6909fbf92701750c7906e73fefa793a
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
index ba0eb3b35e41..6f52396da147 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a53f34f88b359086d3e1c0584527f2dc
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4 b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
index f4506cb0f1f3..9137a72199eb 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.4.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6e6199dec390ef2240092fcb4e7a822f
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.5 b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.5
index 595e3e752369..b5e4909c346f 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.5
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.4.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb09200bb5f412e1b5a9f8ca48db3670
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.5.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.5.1
index 751e6d30121a..deecc71bf05a 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.5.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0eb24f4278a73c42e56bbb5720daa23e
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index 6112734ffc54..0baf068b0365 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8aa2476f36de3d7fd9414c5bce512bcf
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
index cd2f79d6ca96..9e724d4ff6ee 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd97304acd68746164fe48d4e446a03c
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
index d86991ce63f4..30afe496de18 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09cc5fa19312f485c4e10d3788ecfcff
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
index 99ec8012c374..fc0ed7fbf839 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d873f45da38044e114a608d182f4bb9
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1 b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
index eb3e95a98ea4..67868c35d3de 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0143a14a7946c779e5aa8068c911e869
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.1 b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
index 651cc3298b0b..89e26dae9142 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa388779ee3176b8a7aec638490f948f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r1 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r1
index 20bed85af3e7..4da55e4cd580 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc41b18aef2a73d79a0dee486d2adae9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index 4f289c256104..b7f577a79d3c 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ad404d172300cc7ed70ef1dddce2e2e
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
index 7c41bc75da53..005b262c5a86 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ec5c3762e4cda25c693551929fc34c2
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6 b/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
index 462aa16e0d2d..2eeef0fdcb00 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.1.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1957e02269c588cc3732c90d60d26239
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.6.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.6.1
index 1ce0c1cc254e..323b80a049aa 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.6.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e83647558a8cf2013500a9b865150e66
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.7.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.7.0
index 9c88e36be9e4..7e1321cb290d 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.7.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d7863f26631aa17af679acbb081054f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
index 0e27daaa2b2d..c3918d9b0954 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a91db16b045fa951d2b6ce5de0f46ff3
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1 b/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
index f2265c9bdd0b..af1c70b2bb73 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7ffe791bc8f4ffbf0ef8a781707bd66
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index 0ff2b8ac3cb7..34152a87b92b 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a867eb44ea432f17b7efa6e04eecb364
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
index 20bb79f5136a..22fba4d7040e 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple-rss-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf6be894426ba8e00ee47231aff6960f
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
index 9f2633f23558..70c650cff59d 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple-rss-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7af9c4c20bc05017c9433fcd7ab7439
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
index 23b08a4178a7..c4a677dd56b1 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=72ded57514d0d4cef60caf8fc7971171
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
index def00dbd350a..ae1a7fc1d424 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce157d85db727813e149e1edf289a6c5
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index 2a84dd0545c0..181451b09e42 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c3635f9113c46ea70a1157c66966899
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.8.2 b/metadata/md5-cache/dev-ruby/simplecov-0.8.2
index 19391f9e0af4..4351cf14a346 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.8.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.8.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b78b01177cfe35bea598caca0b4a528
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.9.0 b/metadata/md5-cache/dev-ruby/simplecov-0.9.0
index 09c9cd01751b..7dfa38dffe02 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.9.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dd7132cee7dc9261d5bf273d7d2d708
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.9.1 b/metadata/md5-cache/dev-ruby/simplecov-0.9.1
index 46d6912be723..22948df83bee 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.9.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.9.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=97557fc6c83ad65bddece2362b0f568e
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
index 866b0e74977a..24f89dfc449f 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-html-0.8.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a256d6c43f51acff24bcc06506cdfec5
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
index f834b0d6c872..bf5e74af6247 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.9
 SRC_URI=mirror://rubygems/simplecov-html-0.9.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1e1b9e34fa463eb8d6bc7a19b046fec
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.5 b/metadata/md5-cache/dev-ruby/sinatra-1.4.5
index f0098588eacc..06b19182c122 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.5
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec665da23a68ade0e20217560c6356e9
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.6 b/metadata/md5-cache/dev-ruby/sinatra-1.4.6
index 798504fd91b1..5b02a96826a3 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.6
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85687d208ac889fa52ecb25ced59d433
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index e5d300d621e3..abce03e910b2 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0bc9cc1e366cdfb0e2f43a5f4ff7405
diff --git a/metadata/md5-cache/dev-ruby/slim-2.0.3 b/metadata/md5-cache/dev-ruby/slim-2.0.3
index 1bc8de7d47da..7720210a53a1 100644
--- a/metadata/md5-cache/dev-ruby/slim-2.0.3
+++ b/metadata/md5-cache/dev-ruby/slim-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/tilt-1.3.3:0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-2.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=978cde048e92e3fca2f1b8ea98000460
diff --git a/metadata/md5-cache/dev-ruby/slop-2.4.4-r1 b/metadata/md5-cache/dev-ruby/slop-2.4.4-r1
index 464414ef544e..ddce248d21ac 100644
--- a/metadata/md5-cache/dev-ruby/slop-2.4.4-r1
+++ b/metadata/md5-cache/dev-ruby/slop-2.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/injekt/slop/tarball/v2.4.4 -> slop-2.4.4.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=810c833bed6c5781b730d4b558d1ea0a
diff --git a/metadata/md5-cache/dev-ruby/slop-3.6.0 b/metadata/md5-cache/dev-ruby/slop-3.6.0
index cb08ae54571c..592fb935a93e 100644
--- a/metadata/md5-cache/dev-ruby/slop-3.6.0
+++ b/metadata/md5-cache/dev-ruby/slop-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/injekt/slop/archive/v3.6.0.tar.gz -> slop-3.6.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d6325b3f7c96de2709de087c75c61af4
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.1.1 b/metadata/md5-cache/dev-ruby/snmplib-1.1.1
index 6f6c16e93e1a..7e73d57299da 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.1.1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a9e80ce3c55dfbe91993349d94518b9
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
index 9ae21b18efbe..e87d6d07e58c 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82f538f02698370dcce3d336243028d4
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
index 86fa26871316..9afa629b4da2 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1c9db27d05449977cbb19eb9b156caf
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 9d65152e6cbc..854892ea3c26 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/source_map-3.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=deb91afb9e49bf903b43b240fc5e5a90
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
index d50225d6c41b..dfedf1145750 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=445f7b036b2cba8d3fe8b153d7ce2f69
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
index 3111cfab56bc..d54f0b6159ff 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6a047a94757934dc015483d4135fa93
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2 b/metadata/md5-cache/dev-ruby/spork-0.9.2
index da32c8ad5dc6..24ee1d8c96f3 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=968fa34f670ab59c233de9720d636a8d
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r1 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
index b6b0e53631d6..0cc5535e5422 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Spork is Tim Harper's implementation of test server
 EAPI=5
 HOMEPAGE=https://github.com/sporkrb/spork
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-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=MIT
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=40910777f631f91dd764cd276c4a74f2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=383d0e5ca68ef8ce1910dbf1d514a9c9
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index 379004a9c025..37b80d65324f 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=835be0f5fe45c1f87b4b1916e60f0cc3
diff --git a/metadata/md5-cache/dev-ruby/spring-1.1.3 b/metadata/md5-cache/dev-ruby/spring-1.1.3
index b3aa7c6f65c7..cfe3185cdc2d 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.1.3
+++ b/metadata/md5-cache/dev-ruby/spring-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.1
 SRC_URI=mirror://rubygems/spring-1.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d21b903e96524e65a62c9c7de4b3353
diff --git a/metadata/md5-cache/dev-ruby/spring-1.3.4 b/metadata/md5-cache/dev-ruby/spring-1.3.4
index 8ea21bafff7e..5e014292789c 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.3.4
+++ b/metadata/md5-cache/dev-ruby/spring-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.3.4.tar.gz -> spring-1.3.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=551ae7dc7c98ca34f2517d524708634a
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.11.3 b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
index 0de0037fc88c..390d716b6e74 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.11.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.11
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.11.3.tar.gz -> sprockets-2.11.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e3b6f366c1cf7d0da44fbb9eac6bf944
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.12.3 b/metadata/md5-cache/dev-ruby/sprockets-2.12.3
index 89c67deb932d..19e170203e77 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.12.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.12.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.12.3.tar.gz -> sprockets-2.12.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a3e19fced20b27682375e90d1a43ad6
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.2.3 b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
index 69d265680d02..2fef08c9b1a8 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.2.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hike-1.2:0[ruby_targets_ruby19] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.2.3.tar.gz -> sprockets-2.2.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c5c2ea1402dbb4e4cd5ebbc3979ce30
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
index e5ba2d769c0e..3493a3790cd3 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.0
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.0.0.tar.gz -> sprockets-rails-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=757170ae3abd171e9e7ff9b1efa07b2c
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
index 8be6bf190e78..a4e86a218554 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.1
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.1.3.tar.gz -> sprockets-rails-2.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cf107f5b3d4a1eda9f8167321baae47
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
index c338cc3f7e92..000c4426fab3 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.0.tar.gz -> sprockets-rails-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=425555404a9dbd7969056ea16563a916
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
index d2a12a7585ff..b6a8c54ff36c 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.2.tar.gz -> sprockets-rails-2.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c74dbcb88739d767187d8d0d1fbc2054
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
index f0f2901e82ba..02ec944fd43d 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.4.tar.gz -> sprockets-rails-2.2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=307a66d7c1283b4103af96233818f299
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.1 b/metadata/md5-cache/dev-ruby/spy-0.4.1
index 832316e89800..1cbc2d5b3753 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.1
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e05114d5a0cb156f695b0c53738b8cd0
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
index 0309bafe5d82..5a53ab80c4ee 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
@@ -10,5 +10,5 @@ RDEPEND==dev-db/sqlite-3* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b2b819937575d451c7eeaa5c5a98f9e
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
index 19651efbbfdd..7cd85f7d493f 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-db/sqlite-3* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.10.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d18dc1e5a8dda162b9891795b9e15825
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.5.1 b/metadata/md5-cache/dev-ruby/sshkit-1.5.1
index 973d639c7f39..c6a9951a459e 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.5.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0f402763edfd8290e638b126419391a
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.6.1 b/metadata/md5-cache/dev-ruby/sshkit-1.6.1
index cd09fc3340f9..eaccdf6325d8 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.6.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87558bf66b17387c683949206e6ab4c8
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.7.1 b/metadata/md5-cache/dev-ruby/sshkit-1.7.1
index a3c06dfbc960..36796528c865 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.7.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e4ae05eb9b2f470d0da67ebf80532a4
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1 b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
index 70aa1be25fe6..159889206179 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.5.0.tar.gz -> stamp-0.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c95d0ce80daf836bddd39bec83567c4
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index b7321680459f..80e926db0dd9 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d1e64a1f5b9d0a5a2071c7e9ca16483
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index 81bf5379604e..87eef006da3e 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/state_machine-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3c9c86d48f700e99ca83d7e23fd479c
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.2 b/metadata/md5-cache/dev-ruby/stomp-1.3.2
index 6ea03db055ff..0f9f1b358f1b 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.2
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=362274e8fa16bacc273f5401684216c2
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1 b/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
index cbca75a18b48..7780837e3cc6 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4038c0c2970f13e8ece02ba8be24a0a5
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.4 b/metadata/md5-cache/dev-ruby/stomp-1.3.4
index 8b2564ad8b23..eae6811f2c34 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad5cdb99aec7ac5f87d5432dc8e9ce5e
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.5.2 b/metadata/md5-cache/dev-ruby/stringex-2.5.2
index a0da7ecd25c9..56dd7a34ddbe 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.5.2
+++ b/metadata/md5-cache/dev-ruby/stringex-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.5.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=521bd6ab5ae34617c67b8a369598e2a2
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index 8f23bbe666bf..318f9f3253c9 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=815f0143d30d7b334ac5576e9127b086
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4 b/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
index c48d309b3de2..b8c5a11ae071 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
+++ b/metadata/md5-cache/dev-ruby/syntax-1.0.0-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/syntax-1.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8d990184c0548e89349c3031158c526
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1 b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
index 38ea12e8b83c..8e16584a733a 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.0.tar.gz -> syntax-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=941d1b6190abb2d97e014b26985bf0b6
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.0 b/metadata/md5-cache/dev-ruby/syslogger-1.6.0
index 6223f850ce72..1096355696db 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.0
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cabc7a8abf83e7ae14c2c268e8b4e62
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.1 b/metadata/md5-cache/dev-ruby/syslogger-1.6.1
index 3794826006d7..0fef2b4e6b74 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.1
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1231f5ff3c33a7e0f106b87042305ca4
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.2 b/metadata/md5-cache/dev-ruby/syslogger-1.6.2
index 64637dbefad0..84e00cdfdd70 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.2
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=778f116d54ebcd9ffad4258b5ce08039
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.4 b/metadata/md5-cache/dev-ruby/systemu-2.6.4
index 644b3056c86d..7f20534044a7 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.4
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/systemu-2.6.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=907231d26895ae96b04ee8e71f5531d2
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index 80de9e501ee9..3536875f0aaf 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/systemu-2.6.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bbfa56cb7b49d3167f870e91fa5d084
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
index 06f86a08eaca..05ecd94ea9ee 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f863fa157d761a69ca1fbbd98db218c
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.8 b/metadata/md5-cache/dev-ruby/temple-0.6.8
index 674d3439eb5d..3ef33a20c358 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.8
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.6.8.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd16d0246f36988ba26b6f539d5c399a
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.4 b/metadata/md5-cache/dev-ruby/temple-0.7.4
index 6a0141e9b25d..50950aedffa2 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.4
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.7.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=984a28dd17eb45bda03b954c425f6c2e
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.5 b/metadata/md5-cache/dev-ruby/temple-0.7.5
index 08cdff957327..3906f2f34bb5 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.5
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/temple-0.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=298ec878be234afbfff69cbe384f58d9
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
index c51c777888a3..cb46c7177a83 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2bd4e3f6c1e06f55d6449041bf389cf
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
index 8ec407d5fb89..f70d843e68e0 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d825b6b311b0c54018be2f65be16fd9
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1 b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
index 8875cebb555b..2a39d84b3cc1 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ddade9be349aac9a0c8dc2bc10a55ab
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.2 b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
index cca52db49f86..35b50affde0e 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.2
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ccfb02d87832afa458cc4fa1902d3fb
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3
index a1944851f022..148f2045606b 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=819227f60c80f3a6769250323923a7ac
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
index 80aafd442b6d..4eae380ff9be 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3f4cd3ff9faea0610a11a0f5c17557f9
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
index d4fbfd7038fb..d2f2fbd78cc0 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e8eb6df845b4ce20ee941546a7c5c65e
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
index 7862a484af03..cdbe8a214398 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65730c5440daa43c648d46e97db5816f
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
index 7206687502d9..11180bbde685 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9397e7f31249732e6cafd72c6d6e26b9
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.0.9-r1 b/metadata/md5-cache/dev-ruby/test-unit-3.0.9-r1
index 93d14fb77a5e..7eee77cb0f36 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.0.9-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.0.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef20c8beeac99985e559d0f195bebd8f
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
index 0b76a33ecf3f..dda2abc76a66 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee590a2f2888aab27f0212a869ae52e9
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
index 705feda1d97d..1312ff1b9259 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5a7f0e6a33e2e15a095b5bf82b59c4b2
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
index a1a490f247e4..60d0f7fc7928 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4e857df664e1c6e3bca078e9afadd3f
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
index ee075d62dec3..6e1e795b45f8 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.5 -> test_declarative-0.0.5.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=092199c24d75c38494273d9dab782502
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r1 b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
index 75d85064f331..a33939499f6c 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d1144da6a3604fd1eaff1c5446844c2c
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r2 b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
index e4c9a3de5001..26e56b551a35 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a0fe550c90913fac01677a9634701e6
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.0 b/metadata/md5-cache/dev-ruby/text-1.3.0
index 87b2ca308ff2..9c12c9742b8f 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.0
+++ b/metadata/md5-cache/dev-ruby/text-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9d5c5386c92012e03c752fa7a953d17
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index 2ea14eacdb9d..0d7b334c7b14 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06348298e10e4d9db403083b7420bd2c
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
index a1c1a6712dec..5a9c681a88e1 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95893d3d1932dc770690e034dc0c269a
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
index 2192045e1a27..f0cbd6ffcd8f 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d198acfe471f2bc5354970c55e160c2
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1 b/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
index 176dba224a44..45426674ddd6 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/textpow-1.3.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=38b5266dca7cccf7822b55812f417423
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index eb68debb3c40..e89cf13b50a0 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae8b291cc2166c7c1e119c66957e3db0
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.1 b/metadata/md5-cache/dev-ruby/thor-0.19.1
index e7d7d3e2df6b..c820f4fc049f 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.1
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://github.com/erikhuda/thor/archive/v0.19.1.tar.gz -> thor-git-0.19.1.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4724d32a271bd3bcb587b53bc80fa8c
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.4 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
index 263416a18c5c..51600ab74ea7 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c60f6b1e919cae1e755ab8093a2f00e
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
index 67c2e8a63ee7..7fb9d211c451 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a939304b468cb851806f1ae36a9df803
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
index bfc642032089..770a5984a349 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6385f493a3aac6a305168dbd8b9899dd
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
index 0351fcefcea1..5592f4067978 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5aab6c0c8156a1c879e87fd13c355e4e
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
index 9afb96d4d2f0..2a93bdd663ff 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f07a3469a836a28bc4d67d705a33566b
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index 2227c78cf393..ea7be6ef9162 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=250acf46532eff88d0ef66594a1ce839
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1 b/metadata/md5-cache/dev-ruby/tilt-1.4.1
index 16523e26f9cf..5f1118c15c74 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4076a2c8a8787713576c1a798d96df6b
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2 b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
index cec4265be916..2f9ef0971775 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6940624c7e27337c476f0f2652241ab3
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1 b/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
index 793f7c757f51..69f326e08a5c 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby19] !!<
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1eadedf8d52d225022065ac65a3254d9
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
index ec1d5af8fe0e..cd3c6df43ccc 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36cdfbfc2ffa697674496df59a7c8c8e
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.3 b/metadata/md5-cache/dev-ruby/timecop-0.7.3
index bff4504b243c..411c2e3cb360 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.3
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc8e1731992263fd2af219bccff645dd
diff --git a/metadata/md5-cache/dev-ruby/timers-4.0.1 b/metadata/md5-cache/dev-ruby/timers-4.0.1
index a4e24da8c7d1..7a580acebfa2 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.0.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hitimes[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e56a420fdc99ff5582c31ac35ae3a2e2
diff --git a/metadata/md5-cache/dev-ruby/tins-0.13.1 b/metadata/md5-cache/dev-ruby/tins-0.13.1
index f34785a9f55d..80d1fc6a6913 100644
--- a/metadata/md5-cache/dev-ruby/tins-0.13.1
+++ b/metadata/md5-cache/dev-ruby/tins-0.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-0.13.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9efd18a425953d37187a5b1d46deb031
diff --git a/metadata/md5-cache/dev-ruby/tins-1.3.2 b/metadata/md5-cache/dev-ruby/tins-1.3.2
index 09a6a79fdfe7..ae90be391f9e 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.3.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.3.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce00a3d048e1ea4af91fcbb166f3dc1d
diff --git a/metadata/md5-cache/dev-ruby/tins-1.3.3 b/metadata/md5-cache/dev-ruby/tins-1.3.3
index 8bbb3ed42fac..ff3cb1c6d879 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.3.3
+++ b/metadata/md5-cache/dev-ruby/tins-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.3.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c5a607c89c8658574c6e6d8ead87eb7
diff --git a/metadata/md5-cache/dev-ruby/tins-1.3.5 b/metadata/md5-cache/dev-ruby/tins-1.3.5
index 444a72abebf8..73ac4c62a572 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.3.5
+++ b/metadata/md5-cache/dev-ruby/tins-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.3.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55e16df5c4bd4ae54ebc2e0c3b8b0ede
diff --git a/metadata/md5-cache/dev-ruby/tins-1.5.1 b/metadata/md5-cache/dev-ruby/tins-1.5.1
index 2044ab45d75e..8fc6852f536d 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.5.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0025283eea339cf166b1875500bd6377
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
index 0c016cf15057..ac7703d4b9d8 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/tokyocabinet ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tokyocabinet-1.29.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e7ae98cec34563bba2c428827e22906
diff --git a/metadata/md5-cache/dev-ruby/toml-0.1.2 b/metadata/md5-cache/dev-ruby/toml-0.1.2
index f56d4c8b9259..e912b7934985 100644
--- a/metadata/md5-cache/dev-ruby/toml-0.1.2
+++ b/metadata/md5-cache/dev-ruby/toml-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/parslet[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jm/toml/archive/v0.1.2.tar.gz -> toml-0.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b82899be632fa29726c84a87733b8e3
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
index 12be2e24645e..243742a61fdb 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c20e0c9b9e279f206047066e63483ff
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index 451a1bc13781..7a4331d26921 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98f0e3a40641e301f9ec2733f030031c
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1 b/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
index ef840a014319..831796d04d84 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
+++ b/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/treetop-1.4.15.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=611a8fa464765ef26341a09bbfe6cef3
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.5.3 b/metadata/md5-cache/dev-ruby/treetop-1.5.3
index f0e17645a16e..b430d6d5fb03 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.5.3
+++ b/metadata/md5-cache/dev-ruby/treetop-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/treetop-1.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb56fc761d4400fd66e50750401c11cb
diff --git a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4 b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
index 9c1db82d8fb1..230fc55fd352 100644
--- a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
+++ b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/trollop-1.16.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1dfbd778e8343d5577ca24bf6d7ce6c
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.0 b/metadata/md5-cache/dev-ruby/trollop-2.0
index cdafaf3209fb..b3acdd153ae0 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.0
+++ b/metadata/md5-cache/dev-ruby/trollop-2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=954c04bcf43392a0ce7fdfae44bd310c
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.1 b/metadata/md5-cache/dev-ruby/trollop-2.1.1
index dcfdfe2a0654..895a2e90ff76 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.1
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b34e06512617226d4467c5b21a42df15
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
index 93897f6a7836..6d5472685ffb 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.1.tar.gz -> ttfunk-1.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c24f8bfa6ee3841517f004297c0b4529
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
index 61d8ec65be57..8471b7b7411b 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.4.0.tar.gz -> ttfunk-1.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afc29300c7c5032f58d2de4a720b0a93
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.1 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
index abc0d73e270a..4690ff03c914 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/turbolinks-2.5.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3098a0950e98841d54613e7234e3bba2
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
index 91da7ba372fd..1a237cc5d4e6 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/turbolinks-2.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54aa08663d9483169028e8966ac28c51
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.13.0 b/metadata/md5-cache/dev-ruby/twitter-5.13.0
index 353fe6aa8729..dd58200db6f1 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.13.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.13.0.tar.gz -> twitter-5.13.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94b82e5de991cef7e59eb10d808812f1
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.14.0 b/metadata/md5-cache/dev-ruby/twitter-5.14.0
index 2cf8bd0e4425..9125a64e543d 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.14.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.14.0.tar.gz -> twitter-5.14.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50f6316482dd12cdfd26cc21b2ed3ddb
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index 236d75e96bd6..8435a44b11f8 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/typed-array-0.1.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39a882719e44e501115d07e2aaeb6919
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9 b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
index 523f2527e418..1a75ce57d5bb 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/typhoeus-0.6.9.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c31053f82e078f16fb42a93bd04a3d11
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.7.1 b/metadata/md5-cache/dev-ruby/typhoeus-0.7.1
index 1de4b91dbef9..239b1bd8916d 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.7.1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.7.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/typhoeus-0.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=306562c831836e7fc8f2a48b7c6910c2
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
index c48ea442f9b4..e275ae77a98d 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.43.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5c10fc8c8575220ca5ce0a744b7b179e
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
index cfc208aa6c35..45a680f9189d 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.43.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=532564f45256f674a0a05a94f572309c
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
index a0624418ee4f..251b2adefdee 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/timezone-data ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=404c5c4784dc6ccec7e0396986b4e699
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
index ca1f8226e9a1..0f6ce632a1de 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=077c10b41a255c108c4117f42e3ea245
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
index 6553384b20c7..ad9c71c8a5ef 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3777afa1c667fb69a636b25fc5024e0b
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.0 b/metadata/md5-cache/dev-ruby/uglifier-2.7.0
index 9739756f7d32..a6553437df1f 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03d0f12abce8489f078d21fc4288907b
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.1 b/metadata/md5-cache/dev-ruby/uglifier-2.7.1
index 2e43ceec3948..7f9825645bb7 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.1
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11fe9768cf803887eb872799351959cf
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index 98c9049645d8..f45db595ba5a 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ultraviolet-1.0.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d7d53cb9b81a009bfe1d428820da4a2
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.3-r1 b/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
index 2ad8470f78cb..06fccedd09e7 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/unf_ext[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f3bfac2a0b858081622c1a8385e2b77f
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index ed614b6d9626..509fe2e02488 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/unf_ext[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e23709ba87d46155458ea7cff03916c
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
index ea87283f19fe..1f372c5384ce 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ab945a32d1a3c8d6d59d35de8ff8dc1
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
index bcec1357c392..c25d7868ed70 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.6-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54c286acd87de6c2ab450293319dc178
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
index 34df816e1265..a8f5e0c39ba9 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46eae677809f9fde4fc8c9a9c501eb6c
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
index 6dc107547b1e..146c4e7f7252 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f68a7b33248e821d7bab1a84860249d
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
index 3a6907cf0b5b..151f650dd6e1 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=736ba1d20d0bf3626c9ab037bb95fff8
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.12 b/metadata/md5-cache/dev-ruby/vcard-0.2.12
index c03877da0161..77b6dea6205c 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.12
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vcard-0.2.12.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=92fc410f97fbe4bb1377520b5fa719d2
diff --git a/metadata/md5-cache/dev-ruby/vcr-2.9.3 b/metadata/md5-cache/dev-ruby/vcr-2.9.3
index 372ae6e1399a..4f47c00a3cd7 100644
--- a/metadata/md5-cache/dev-ruby/vcr-2.9.3
+++ b/metadata/md5-cache/dev-ruby/vcr-2.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/vcr-2.9.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4fa5530b5e1f5c604715d995ce10e657
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.3 b/metadata/md5-cache/dev-ruby/vlad-2.6.3
index b7e4a5ffd253..1bce3e8165bf 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.6.3
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.6.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6fb15ae8106833df56054936339b8f6b
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.4 b/metadata/md5-cache/dev-ruby/vlad-2.6.4
index 2c0f63c75ce1..33ad72305740 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.6.4
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.6.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f621aee69e1979c4c9cf16894de44de9
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.3 b/metadata/md5-cache/dev-ruby/warden-1.2.3
index 31e8aae9dfbf..00ce2c512c0a 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.3
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6289083a6239e0a08e455a0208b9d7b
diff --git a/metadata/md5-cache/dev-ruby/watch-0.1.0 b/metadata/md5-cache/dev-ruby/watch-0.1.0
index c1da17c321d5..f448e07dc018 100644
--- a/metadata/md5-cache/dev-ruby/watch-0.1.0
+++ b/metadata/md5-cache/dev-ruby/watch-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/watch-0.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9ea64a23f6785cbf90e32a36a415fa8b
diff --git a/metadata/md5-cache/dev-ruby/weakling-0.0.4 b/metadata/md5-cache/dev-ruby/weakling-0.0.4
index 698938211491..3c3ffe0ace6c 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f4c8f51b00bec38c22925f6a4f37034e
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.1.1 b/metadata/md5-cache/dev-ruby/web-console-2.1.1
index d1c86ff087c5..d883c5076f55 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.1.1
+++ b/metadata/md5-cache/dev-ruby/web-console-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-4.0[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/web-console/archive/v2.1.1.tar.gz -> web-console-2.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d389db5328b13fa70598ef103d1ac4d5
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.1.2 b/metadata/md5-cache/dev-ruby/web-console-2.1.2
index 93dabb9955e3..e266fa251ae1 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.1.2
+++ b/metadata/md5-cache/dev-ruby/web-console-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-4.0[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/web-console/archive/v2.1.2.tar.gz -> web-console-2.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f91852a3731cd120a065bb34a929ba8
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.19.0 b/metadata/md5-cache/dev-ruby/webmock-1.19.0
index ce1c617f6509..794b9df97464 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.19.0
+++ b/metadata/md5-cache/dev-ruby/webmock-1.19.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.19.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2be144635009bcb4fb26f9c857c3be03
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.20.3 b/metadata/md5-cache/dev-ruby/webmock-1.20.3
index 68ab8a61d1fc..db21745c9a79 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.20.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.20.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.20.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a365bc7e4cdfccc243d40fff4d53a70
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
index e5a26c1294da..796772a94cc5 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55da5a18dcca4a6c5758ff666c718a27
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
index 27326618f049..db92ec720ea6 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af3a25a61f246a1ecedcb4ce60deeb51
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.1 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
index 1013755a6bb2..c20209024b13 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] dev-ruby/ex
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.1.tar.gz -> wikicloth-0.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b2670c3dad61fb2af1f7b1f48716348
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.2 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
index e11b85f63ac9..c997df1cc25e 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] dev-ruby/ex
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.2.tar.gz -> wikicloth-0.8.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1800652a0944fbfb71493cba569c5f1a
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.0.5 b/metadata/md5-cache/dev-ruby/will_paginate-3.0.5
index 3ac46ecc8f40..4cf0bad08b84 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.0.5
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.0.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ec813b513e9df1da41b313a3516d9fd
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.0.6 b/metadata/md5-cache/dev-ruby/will_paginate-3.0.6
index 23dc320fa7bb..2d0159a43a90 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.0.6
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.0.6.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=32b04b495f240d52fb40ca079676203e
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.0.7 b/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
index c4822d200d0b..f2b959a5460f 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.0.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8bdb07098809aa0ddec5c3d6e6addbc
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
index 1d04403e1b92..25faa5a38186 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2e5d2792bf085999b3934c77553c042
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index 1d60f48c7946..5b20c0b4ea67 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=99dcc75effeea4737b8cd8728ecdbcdd
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.3 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
index 8af0cc54bb70..6eb91ab53436 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/xml-simple-1.1.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=674d3d23d375e435835648fc46f3d2fd
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.4 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
index 72cb5abac875..ccbc78ac7616 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/xml-simple-1.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2c365700a8dae1a7a9e6f11f6139816
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index d626b62ece05..2fac5a59ffde 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ad9b83687d823621168f2e5c9a5ae900
diff --git a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1 b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
index 64b0d874ea9b..6eb0f36a547b 100644
--- a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/xpath-0.1.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e326195e8283afd119645a9864c57c5d
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
index d5e0e4bc8e31..079c49cbb4d5 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.0.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a24be974a5402e269c6de1608c032a4c
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
index 55db57fc174d..9097465b6515 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=5
 HOMEPAGE=http://github.com/brianmario/yajl-ruby
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ae7263ffa92c6e07f4fde63f2361b81e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4723c18ff75f53ae08aad229869fde27
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
index 4006c64f45ee..8ed24fddd8dc 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a6d6acbcd5cecea62327de6ea60f9863
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
index 76eddd451787..50bc8e338826 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da905a0a78723fd26dc4849719fe335a
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
index 2b68b1e9b37b..e68a9aef00b5 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4565ebbc3fb6b3c5a2784c685ae8b170
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.6 b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
index e0120b671895..848a528d0618 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.6
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.8.7.6.tar.gz -> yard-0.8.7.6-git.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64119000d104db64b783df5a4697ab83
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.0 b/metadata/md5-cache/dev-ruby/zentest-4.11.0
index 495c6c5f4d6d..4158d05f4075 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd4a530af29431db62c54e304f56670d
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.9.5 b/metadata/md5-cache/dev-ruby/zentest-4.9.5
index 9da5061485ea..7ffac423c58d 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.9.5
+++ b/metadata/md5-cache/dev-ruby/zentest-4.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.9.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=764837aed84abe30b1fc20e901b8a12d
diff --git a/metadata/md5-cache/dev-scheme/bigloo-3.0c_p4 b/metadata/md5-cache/dev-scheme/bigloo-3.0c_p4
index 25c71d75111e..f51fcbfeb49a 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-3.0c_p4
+++ b/metadata/md5-cache/dev-scheme/bigloo-3.0c_p4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.5 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo3.0c-4.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=387b5754277bba4a7b44ed6c25a4135f
diff --git a/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3 b/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
index 03decad13352..6fdd6bb570b6 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
+++ b/metadata/md5-cache/dev-scheme/bigloo-3.4a_p3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/boehm-gc-7.1[threads?] emacs? ( virtual/emacs ) gmp? ( dev-libs/gmp ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) java? ( >=virtual/jdk-1.5 app-arch/zip ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/members/Cyprien.Nicolas/mirror/bigloo-3.4a-patchset-1.tbz2 ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo3.4a-3.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d4b46b0cdcef30ca7a913e4f3d887e0
diff --git a/metadata/md5-cache/dev-scheme/bigloo-3.6a b/metadata/md5-cache/dev-scheme/bigloo-3.6a
index aa53df48b3c2..8719aa5163ec 100644
--- a/metadata/md5-cache/dev-scheme/bigloo-3.6a
+++ b/metadata/md5-cache/dev-scheme/bigloo-3.6a
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boehm-gc-7.1[threads?] emacs? ( virtual/emacs ) gmp? ( dev-li
 REQUIRED_USE=bglpkg? ( web ) openpgp? ( crypto ) packrat? ( srfi1 ) srfi27? ( x86? ( gmp ) )
 SLOT=0
 SRC_URI=ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo3.6a.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e39d73b7b6b463e73337a24866ca48a
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2 b/metadata/md5-cache/dev-scheme/jscheme-7.2
index 3a66bbc2d79d..0ac8ab812038 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/jscheme/jscheme-7.2.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 53f574c5af20..ef5aa19a7877 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c5f96024c24d..bd7f4dc1fcad 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 12193eeb381b..6564026a9419 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a2c101fcdef6..e3cd737a90d7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 65f9e49176c0..180eb04d1d4c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=785ced69919c6ec01b790d795593be62
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
index 19db0a39b133..b8342c4fde7c 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7eab41a4f2591761dee827bd583da14
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
index eca4a7eff494..f76b4db61cc0 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0512c9ce72bbb8e088c5959cc6d0a036
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
index 22c4022b0d12..41f424153084 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fb33b8c9fc0c3a3576cca3bd912e51d
diff --git a/metadata/md5-cache/dev-util/antlrworks-1.2.3 b/metadata/md5-cache/dev-util/antlrworks-1.2.3
index 773f5277d16d..eada3b59a0cc 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9be7564d43ad..ce52a5d5c6be 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffac973de0a65466a64031fb37ddfbed
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.3 b/metadata/md5-cache/dev-util/aruba-0.5.3
index 7a76dbdc8cd7..92ba37f83416 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.3
+++ b/metadata/md5-cache/dev-util/aruba-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.3.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e718831671e2b4c8f5ccaffa2195d78
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.4-r1 b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
index bef858a0fcb4..c132f27bfa88 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.4-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.4.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bd856acaf2ae3d3e062cb2963edf0d8d
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5043220348e786085234b3748000d662
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.1 b/metadata/md5-cache/dev-util/aruba-0.6.1
index 5dd51cf02ec6..7005f827c512 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.1
+++ b/metadata/md5-cache/dev-util/aruba-0.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3270dc9f53a58c0a502aa86cca24ac77
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2 b/metadata/md5-cache/dev-util/aruba-0.6.2
index fef871a72b69..51c69164cf44 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5daf134efaa33deba28b4066dbe5e04b
diff --git a/metadata/md5-cache/dev-util/astyle-2.02.1 b/metadata/md5-cache/dev-util/astyle-2.02.1
index 1e2d9d8520b0..9c516ae2e096 100644
--- a/metadata/md5-cache/dev-util/astyle-2.02.1
+++ b/metadata/md5-cache/dev-util/astyle-2.02.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.02.1_linux.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc9305ae45efd1d762e6c3228b3aad9c
diff --git a/metadata/md5-cache/dev-util/astyle-2.03 b/metadata/md5-cache/dev-util/astyle-2.03
index a428773ff7b4..b5a91765c791 100644
--- a/metadata/md5-cache/dev-util/astyle-2.03
+++ b/metadata/md5-cache/dev-util/astyle-2.03
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.03_linux.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06e56030f4dabdb82523766485139a29
diff --git a/metadata/md5-cache/dev-util/astyle-2.04 b/metadata/md5-cache/dev-util/astyle-2.04
index 34e43623a320..2783f645d23d 100644
--- a/metadata/md5-cache/dev-util/astyle-2.04
+++ b/metadata/md5-cache/dev-util/astyle-2.04
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.04_linux.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d67a5b55f7b757d7b7bc317dbc556ddc
diff --git a/metadata/md5-cache/dev-util/bluej-3.1.1 b/metadata/md5-cache/dev-util/bluej-3.1.1
index 0d45963080b8..7504207025d6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b7f70a89b4e6..06deca606b27 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bf890f0da5a9..f17fae27e4fc 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ddf1533d9d6b..9cd034d92cc1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f7ee12ec9255f8b28530944b4555c26e
diff --git a/metadata/md5-cache/dev-util/cucumber-1.2.1 b/metadata/md5-cache/dev-util/cucumber-1.2.1
index 7c4486c0fd99..f47665fe9a2a 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] >=dev-ruby/gherkin-2.11.0[ruby_targets_ruby19] >=dev-ruby/json-1.4.6[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9de8146e7b2a068f7d870774b6d43ea3
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.17 b/metadata/md5-cache/dev-util/cucumber-1.3.17
index 74dba1753c1f..c042bb50ce91 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.17
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.17
@@ -4,11 +4,11 @@ DESCRIPTION=Executable feature scenarios
 EAPI=5
 HOMEPAGE=http://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby19] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby20] >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby20] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby20] >=dev-ruby/multi_test-0.1.1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.17.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3ee305a5b0e864a7a8312e0dda7c9af8
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=54499c02d7964bd7d10f1bf244cde295
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.18 b/metadata/md5-cache/dev-util/cucumber-1.3.18
index 6dc27262ef95..5997d7071c76 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.18
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.18
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.18.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df6662ccda4f355769a5ecbdc2e5c3ac
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.19 b/metadata/md5-cache/dev-util/cucumber-1.3.19
index 5d8a18893cd0..c310f5dc26c5 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.19
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.19
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.19.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=81daccaf3aaaec04d6a945b03d84c61b
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.1 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
index 1d6b39c0fa9a..b184b4250e14 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=476484f597a490a477e7e4a7d171c2a0
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.2 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
index 08155a475f90..a3d5f049768f 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=460163edbcf295b29a8172d79c75402c
diff --git a/metadata/md5-cache/dev-util/debhelper-9.20150502 b/metadata/md5-cache/dev-util/debhelper-9.20150502
new file mode 100644
index 000000000000..899cf9e877e9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-9.20150502
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=5
+HOMEPAGE=http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/
+IUSE=test linguas_de linguas_es linguas_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20150502.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=943ad70a41d1033e79b90a248d7bbaa5
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 131bf4ec134d..fd38644a0c51 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab603efd87c8..ae6d4b86bad1 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7d437e383c2c..40facca7e0b8 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acf96a1064ff0c82ffddae3255ea1368
diff --git a/metadata/md5-cache/dev-util/fujaba-4.2.0 b/metadata/md5-cache/dev-util/fujaba-4.2.0
index 7f2e184d76bc..7472c2cf7054 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a1ddb246b3f7..f7a13a457bed 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1f6c0ade0077a4a7ef519558f8309dd
diff --git a/metadata/md5-cache/dev-util/jay-1.1.1-r2 b/metadata/md5-cache/dev-util/jay-1.1.1-r2
index fa8c09f52654..e72b2be32647 100644
--- a/metadata/md5-cache/dev-util/jay-1.1.1-r2
+++ b/metadata/md5-cache/dev-util/jay-1.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> jay-1.1.1.zip http://dev.gentoo.org/~ssuominen/jay-1.1.1-mono.snk.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20557c022ac5d738bd23c4b0cd423e58
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r2 b/metadata/md5-cache/dev-util/jconfig-2.8-r2
index a7096b05fa11..4155b494e834 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d0bf146c7771..0fe1f1a7878b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fbae264116da..bbf722c00111 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cdcea7867f94253d5747556476fd033
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-1.610 b/metadata/md5-cache/dev-util/jenkins-bin-1.611
similarity index 71%
rename from metadata/md5-cache/dev-util/jenkins-bin-1.610
rename to metadata/md5-cache/dev-util/jenkins-bin-1.611
index b4504ff276a0..e3582b763e01 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-1.610
+++ b/metadata/md5-cache/dev-util/jenkins-bin-1.611
@@ -7,6 +7,6 @@ LICENSE=MIT
 RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts virtual/jre
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/1.610/jenkins.war -> jenkins-bin-1.610.war
+SRC_URI=http://mirrors.jenkins-ci.org/war/1.611/jenkins.war -> jenkins-bin-1.611.war
 _eclasses_=user	f54e098dd38ba1c0847a13e685b87747
-_md5_=410002cf5988e4b5cf9210148a72b98f
+_md5_=2c4e17e070345c162e7859ece40b3218
diff --git a/metadata/md5-cache/dev-util/jif-3.1_rc1 b/metadata/md5-cache/dev-util/jif-3.1_rc1
index 7e1bcd314aa8..839caf4adff0 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.1.9-r1
 SLOT=0
 SRC_URI=http://www.slade.altervista.org/downloads/JIF31_src_RC1.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f0f0f37a09f873f14d22bd09cd10d8f
diff --git a/metadata/md5-cache/dev-util/netbeans-7.2 b/metadata/md5-cache/dev-util/netbeans-7.2
index 1cacb2b62f48..9f4ad5e4c0c7 100644
--- a/metadata/md5-cache/dev-util/netbeans-7.2
+++ b/metadata/md5-cache/dev-util/netbeans-7.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-harness-7.2 ~dev-java/netbeans-ide-7.2 ~dev-java/netbeans-nb-7.2 ~dev-java/netbeans-platform-7.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-7.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-7.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-7.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-7.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-7.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-7.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-7.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-7.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-7.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-7.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-7.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-7.2 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-7.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-7.2 ) doc? ( ~dev-java/netbeans-javadoc-7.2 ) >=dev-java/java-config-2.1.9-r1
 SLOT=7.2
 SRC_URI=linguas_af? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ar? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_bg? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ca? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_cs? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_de? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_el? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_es? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_fr? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_gl? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_hi_IN? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_id? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_it? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ja? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ko? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_lt? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_nl? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_pl? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_pt_BR? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_pt_PT? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ro? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ru? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_si? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_sq? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_sr? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_sv? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_ta_IN? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_tl? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_tr? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_vi? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_zh_CN? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 ) linguas_zh_TW? ( http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.2-20120725.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e65ab6e8678b0ff6286b5ff9c0f6ada3
diff --git a/metadata/md5-cache/dev-util/netbeans-8.0.2 b/metadata/md5-cache/dev-util/netbeans-8.0.2
index 16e350d03dad..45dfa86f7e74 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=573645ef4571f7747cc7965173dc774c
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
index 94df5caf8d30..4fb55512e86f 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28c0bf17b738d0e522f4a013d5f7c425
diff --git a/metadata/md5-cache/dev-util/oprofile-1.0.0-r1 b/metadata/md5-cache/dev-util/oprofile-1.0.0-r1
index 479838879e46..f8861d66668f 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.0.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a804284aff15ff72d896e1ceb8925467
diff --git a/metadata/md5-cache/dev-util/pmd-4.2.5 b/metadata/md5-cache/dev-util/pmd-4.2.5
index b32e3b6224a3..936b74c8b3b0 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a122b1cd2c7988544747f6ba8e182457
diff --git a/metadata/md5-cache/dev-util/qbs-1.4.0 b/metadata/md5-cache/dev-util/qbs-1.4.0
index 81933629010e..10cfce482d24 100644
--- a/metadata/md5-cache/dev-util/qbs-1.4.0
+++ b/metadata/md5-cache/dev-util/qbs-1.4.0
@@ -3,11 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-q
 DESCRIPTION=Qt Build Suite
 EAPI=5
 HOMEPAGE=http://wiki.qt.io/Qbs
-IUSE=doc test
+IUSE=doc examples test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qbs/1.4.0/qbs-1.4.0.src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=e5ef000e40724f4996df0cc1df60417b
+_md5_=34daa03fafd372d2db1a9beb46cb8a34
diff --git a/metadata/md5-cache/dev-util/travis-yaml-0.1.0 b/metadata/md5-cache/dev-util/travis-yaml-0.1.0
index 967f249b00d6..505670d259b1 100644
--- a/metadata/md5-cache/dev-util/travis-yaml-0.1.0
+++ b/metadata/md5-cache/dev-util/travis-yaml-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/psych[ruby_targets_ruby19] ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/travis-yaml-0.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=854413f05810baaf1ece9d739e01bcaa
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 ff2bc5f9ebe2..20f0feb478d6 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa743647bfccd91c0181bd1f38836a9c
diff --git a/metadata/md5-cache/dev-util/watchr-0.7 b/metadata/md5-cache/dev-util/watchr-0.7
index e032b44c9320..c7784c4e11d9 100644
--- a/metadata/md5-cache/dev-util/watchr-0.7
+++ b/metadata/md5-cache/dev-util/watchr-0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/watchr-0.7.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9abfcaabb5b913d1b55291e950856b4c
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 465ab83d00b6..0bbf1924a25d 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1b5c904cf7a1..6f487cf89446 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1c98da6337a2..ff64fde831ef 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 51c0e4fa7ef4..ab0ab53992aa 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cf76466be9c1..e8938ccf24c7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 575993a50688..c8794361e769 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6a1e40ea0d6e..1be2ba77a781 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80a5e9f482422c8ded6bb340222853a7
diff --git a/metadata/md5-cache/dev-vcs/git-2.3.6 b/metadata/md5-cache/dev-vcs/git-2.3.6
index d87e2e8fa666..1997c7cb54d3 100644
--- a/metadata/md5-cache/dev-vcs/git-2.3.6
+++ b/metadata/md5-cache/dev-vcs/git-2.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-2.3.6.tar.xz mirror://kernel/software/scm/git/git-2.3.6.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.6.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.6.tar.xz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=b4376d620c3c7d020a0fa4391984b47a
+_md5_=3c5fb1f8a60e2aa172a4648b26a603c2
diff --git a/metadata/md5-cache/dev-vcs/gitsh-0.8 b/metadata/md5-cache/dev-vcs/gitsh-0.8
index d1f273f1bbe3..64a62f8542c8 100644
--- a/metadata/md5-cache/dev-vcs/gitsh-0.8
+++ b/metadata/md5-cache/dev-vcs/gitsh-0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/bundler[ruby_targets_ruby19] dev-ruby/bl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/gitsh/archive/v0.8.tar.gz -> gitsh-0.8.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fab5f7360bbf26b7cfcbce129fbc5146
diff --git a/metadata/md5-cache/dev-vcs/hub-1.12.4 b/metadata/md5-cache/dev-vcs/hub-1.12.4
index 505bf6f92c4a..2b2ff427b38f 100644
--- a/metadata/md5-cache/dev-vcs/hub-1.12.4
+++ b/metadata/md5-cache/dev-vcs/hub-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/github/hub/archive/v1.12.4.tar.gz -> hub-1.12.4.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9396c2e009d71090824b4c8c8cb3db70
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.5.0 b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
index bee0d026926f..4794b8a5b414 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b4b71bc28e3b..3b19adc41c3f 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62075aea6e6a1db83fe66dcff8d3d66b
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.19 b/metadata/md5-cache/dev-vcs/subversion-1.7.19
index 49cfe2d54565..8d3831e8e2c2 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.19
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/ap
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.19.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f4e4cc50fc0c639db6d4fc531c8de4e
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.20 b/metadata/md5-cache/dev-vcs/subversion-1.7.20
index 607c3d63ec47..f5f446dc75d8 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.20
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/ap
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.20.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b58fd8060153bf11b08a1fbf8163efea
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.11 b/metadata/md5-cache/dev-vcs/subversion-1.8.11
index c315e8c3f97b..73a639a1c46a 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.11
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.11.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29043b24242d31c5700363debd29f03d
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.13 b/metadata/md5-cache/dev-vcs/subversion-1.8.13
index ce7cf3e53607..816d8462fb78 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.13
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.13.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e9f61d29584017375c810b8447133136
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 56c0842f2d32..76b4c4be8527 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3691eae3243a..908ff6643d73 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c335df3f62667975dc3543efff11d2c8
diff --git a/metadata/md5-cache/games-emulation/dolphin-3.5-r1 b/metadata/md5-cache/games-emulation/dolphin-3.5-r1
deleted file mode 100644
index a5697fcd267d..000000000000
--- a/metadata/md5-cache/games-emulation/dolphin-3.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=>=media-libs/glew-1.6 >=media-libs/libsdl-1.2[joystick] <media-libs/libsfml-2.0 sys-libs/readline:= x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) app-arch/zip media-gfx/nvidia-cg-toolkit media-libs/freetype >=sys-devel/gcc-4.6.0 sys-devel/gettext virtual/pkgconfig x11-libs/wxGTK:2.9 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Gamecube and Wii game emulator
-EAPI=5
-HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio pulseaudio
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=media-libs/glew-1.6 >=media-libs/libsdl-1.2[joystick] <media-libs/libsfml-2.0 sys-libs/readline:= x11-libs/libXext x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) ffmpeg? ( virtual/ffmpeg ) lzo? ( dev-libs/lzo ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) games-misc/games-envd
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/dolphin-emu/dolphin/archive/3.5.zip -> dolphin-3.5.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=b40b4a3b04b518f97445e8af76d092d6
diff --git a/metadata/md5-cache/games-emulation/dolphin-4.0-r1 b/metadata/md5-cache/games-emulation/dolphin-4.0-r2
similarity index 98%
rename from metadata/md5-cache/games-emulation/dolphin-4.0-r1
rename to metadata/md5-cache/games-emulation/dolphin-4.0-r2
index fa10e9e2a898..cafba776c5a8 100644
--- a/metadata/md5-cache/games-emulation/dolphin-4.0-r1
+++ b/metadata/md5-cache/games-emulation/dolphin-4.0-r2
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/4.0.zip -> dolphin-4.0.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=303cab9609ffbe8604fb86b09ddefc6b
+_md5_=360b98db48476de5cc3d046ff7b31e54
diff --git a/metadata/md5-cache/games-emulation/dolphin-4.0.2-r6 b/metadata/md5-cache/games-emulation/dolphin-4.0.2-r7
similarity index 98%
rename from metadata/md5-cache/games-emulation/dolphin-4.0.2-r6
rename to metadata/md5-cache/games-emulation/dolphin-4.0.2-r7
index 2a7f5ae36a56..65bf8048a634 100644
--- a/metadata/md5-cache/games-emulation/dolphin-4.0.2-r6
+++ b/metadata/md5-cache/games-emulation/dolphin-4.0.2-r7
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/4.0.2.zip -> dolphin-4.0.2.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=86a41186cd00ebbbf90c4b67d47ea34d
+_md5_=aca5c11a52cc98676501146efa8b4b4c
diff --git a/metadata/md5-cache/games-misc/lolcat-42.1.0 b/metadata/md5-cache/games-misc/lolcat-42.1.0
index b5b18e441335..8263f41ef343 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.1.0
+++ b/metadata/md5-cache/games-misc/lolcat-42.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/trollop-1.16.2-r3:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.1.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0a6af92fa836e46f62b04f184f9da8f4
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
index 748171b31e08..41bc87c22706 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f28abe198c10..b7ab390c3efa 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9475c54d2d99..e4b79e6b7a31 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1cd8df5a3eea..b15ca8098482 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d0decc4349ef..8c3415d88104 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afa91ee13cbca6894e0405b52024e2bb
diff --git a/metadata/md5-cache/games-util/searchtool-0.4.4 b/metadata/md5-cache/games-util/searchtool-0.4.4
index f94fbe068e08..79100f9d027b 100644
--- a/metadata/md5-cache/games-util/searchtool-0.4.4
+++ b/metadata/md5-cache/games-util/searchtool-0.4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/searchtool/searchtool-0.4.4.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=970d0abfcff3f81165f3ecdc5d451a44
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.2 b/metadata/md5-cache/gnome-extra/libgda-5.2.2
index 37f429e38b94..45ead3d87c75 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.2
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( g
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.2.tar.xz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e1d26104743974c1adf08f407b7ed398
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.2 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.2
deleted file mode 100644
index 345eb71f5aa0..000000000000
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=~app-misc/tracker-1.0.2 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
-DESCRIPTION=Nautilus extension to tag files for Tracker
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=~app-misc/tracker-1.0.2 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
-SLOT=0
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=94dd52407adb800cbaf3d0852b1e186b
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6
deleted file mode 100644
index f79ce837fc34..000000000000
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=~app-misc/tracker-1.0.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
-DESCRIPTION=Nautilus extension to tag files for Tracker
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=~app-misc/tracker-1.0.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
-SLOT=0
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.6.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=052e88ac9a7ae1a7c36ab72d06f62c53
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.5 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.2.6
similarity index 71%
rename from metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.5
rename to metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.2.6
index 40665daa04ad..175d094c036a 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.5
+++ b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.2.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare setup
-DEPEND=~app-misc/tracker-1.0.5 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
+DEPEND=~app-misc/tracker-1.2.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
 DESCRIPTION=Nautilus extension to tag files for Tracker
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=~app-misc/tracker-1.0.5 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
+RDEPEND=~app-misc/tracker-1.2.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 SLOT=0
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.5.tar.xz
+SRC_URI=mirror://gnome/sources/tracker/1.2/tracker-1.2.6.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=efd6fea0036f6187c631b2572b078b2a
+_md5_=fded96199a702414cad0f25cab88b5da
diff --git a/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0 b/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
index 1726c61afa96..40338d14436b 100644
--- a/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
+++ b/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql ) postgres? ( de
 REQUIRED_USE=|| ( java mysql postgres sqlite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnustep-2	5c8ef29c1d72267699559746ef1c0096	gnustep-base	87d599af9a09a523d6d233e462f3758e	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f8e63a5e898c53fdbc935ddfdda8f1e
diff --git a/metadata/md5-cache/java-virtuals/ejb-api-0 b/metadata/md5-cache/java-virtuals/ejb-api-0
index 71ee9ad9ffd4..c5c7c1c34727 100644
--- a/metadata/md5-cache/java-virtuals/ejb-api-0
+++ b/metadata/md5-cache/java-virtuals/ejb-api-0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-ejb-api:0 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1571fe3bd0f14d6418b3177021692b7
diff --git a/metadata/md5-cache/java-virtuals/interceptor-api-0 b/metadata/md5-cache/java-virtuals/interceptor-api-0
index e023ad22b15f..5a068b37e553 100644
--- a/metadata/md5-cache/java-virtuals/interceptor-api-0
+++ b/metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3389dba3fa30e606aa14e39d8d7bc95e
diff --git a/metadata/md5-cache/java-virtuals/jaf-1.1-r1 b/metadata/md5-cache/java-virtuals/jaf-1.1-r1
index 0aa8347a5d79..caf43ade60b1 100644
--- a/metadata/md5-cache/java-virtuals/jaf-1.1-r1
+++ b/metadata/md5-cache/java-virtuals/jaf-1.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebs
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/sun-jaf:0 dev-java/gnu-jaf:1 ) >=dev-java/java-config-2.1.8 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=56f9b5ade662d1692087c03822e740db
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r1 b/metadata/md5-cache/java-virtuals/javamail-1.0-r1
index 87314b9001c5..882babf128de 100644
--- a/metadata/md5-cache/java-virtuals/javamail-1.0-r1
+++ b/metadata/md5-cache/java-virtuals/javamail-1.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/sun-javamail >=dev-java/gnu-javamail-1.0-r2 ) !<dev-java/gnu-javamail-1.0-r2 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b47a5268b70f78a012257718635dede0
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r2 b/metadata/md5-cache/java-virtuals/javamail-1.0-r2
index 603cf120c0e0..3eefcb0a065a 100644
--- a/metadata/md5-cache/java-virtuals/javamail-1.0-r2
+++ b/metadata/md5-cache/java-virtuals/javamail-1.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/sun-javamail:0 dev-java/gnu-javamail:1 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6b6af689f4fe96df32cdae94432e8c5
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r3 b/metadata/md5-cache/java-virtuals/javamail-1.0-r3
index 407898a63899..87dadc0eb38b 100644
--- a/metadata/md5-cache/java-virtuals/javamail-1.0-r3
+++ b/metadata/md5-cache/java-virtuals/javamail-1.0-r3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/oracle-javamail:0 dev-java/sun-javamail:0 dev-java/gnu-javamail:1 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b26111806e683a4c8d24354f54610f8d
diff --git a/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1 b/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
index bf17faab9fc6..ced89bf227e1 100644
--- a/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
+++ b/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 >=dev-java/jaxp-1.4-r1:0 ) >=dev-java/java-config-2.1.8 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f6750d958b5cf9972db39382ac80539
diff --git a/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2 b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2
index 13829fc2e5eb..1788e850716d 100644
--- a/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2
+++ b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/icedtea-bin:6 dev-java/icedtea:6 dev-java/icedtea-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 dev-java/oracle-jdk-bin:1.8 dev-java/apple-jdk-bin:1.6 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf4e347c620b218eb051d34a2184416c
diff --git a/metadata/md5-cache/java-virtuals/jms-1.1 b/metadata/md5-cache/java-virtuals/jms-1.1
index 220e7518e5c4..933e66156c06 100644
--- a/metadata/md5-cache/java-virtuals/jms-1.1
+++ b/metadata/md5-cache/java-virtuals/jms-1.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linu
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-jms-api:0 dev-java/sun-jms:0 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44ddede3872072c77421b703677dd19b
diff --git a/metadata/md5-cache/java-virtuals/jmx-1.0-r3 b/metadata/md5-cache/java-virtuals/jmx-1.0-r3
index 7b81765de88b..07d41a3ee3c0 100644
--- a/metadata/md5-cache/java-virtuals/jmx-1.0-r3
+++ b/metadata/md5-cache/java-virtuals/jmx-1.0-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc
 LICENSE=public-domain
 RDEPEND=|| ( virtual/jre:1.7 virtual/jre:1.6 virtual/jre:1.5 dev-java/sun-jmx:0 ) >=dev-java/java-config-2.1.8 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e1ea9ed00049e93d8f3b2efed03a303
diff --git a/metadata/md5-cache/java-virtuals/jmx-1.0-r4 b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
index 615f2f427869..9ab0a21ea5a5 100644
--- a/metadata/md5-cache/java-virtuals/jmx-1.0-r4
+++ b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 virtual/jre:1.6 virtual/jre:1.5 dev-java/sun-jmx:0 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7adb145d6c36d4e1366322c9a71ece4d
diff --git a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3 b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
index fb2366dd0ad0..82c4e17ed1ba 100644
--- a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
+++ b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr67:0 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c58da64cb1c35cbad08e85230955672
diff --git a/metadata/md5-cache/java-virtuals/script-api-1.0 b/metadata/md5-cache/java-virtuals/script-api-1.0
index ea7f96b0567f..cc1b777e0966 100644
--- a/metadata/md5-cache/java-virtuals/script-api-1.0
+++ b/metadata/md5-cache/java-virtuals/script-api-1.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr223:0 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7800abb590273563c1c378adb9eacc1a
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.2 b/metadata/md5-cache/java-virtuals/servlet-api-2.2
index a264a3955c7d..5b07e20e133e 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.2
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linu
 LICENSE=public-domain
 RDEPEND=dev-java/tomcat-servlet-api:2.2 >=dev-java/java-config-2.1.6
 SLOT=2.2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1df6ef611342701295b09ac893b75801
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.3 b/metadata/md5-cache/java-virtuals/servlet-api-2.3
index d95dcacd821d..c61899bedbaa 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.3
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linu
 LICENSE=public-domain
 RDEPEND=dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.1.6
 SLOT=2.3
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95c2bd28a7a96787f2b0c9a747632665
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.4 b/metadata/md5-cache/java-virtuals/servlet-api-2.4
index 6305d9307ee1..14ccf55e3224 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.4
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-mac
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) >=dev-java/java-config-2.1.6
 SLOT=2.4
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e03d683eb370f1ac5e1a5899fc530450
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1 b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
index 24da52bddb29..d48b87a40de3 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd6
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:2.5 dev-java/resin-servlet-api:2.5 dev-java/glassfish-servlet-api:2.5 ) >=dev-java/java-config-2.1.6
 SLOT=2.5
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dd5b937e5b4b731bbf369694a22be12
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1 b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
index 8cced44909e0..f50645a08283 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:3.0 dev-java/resin-servlet-api:3.0 ) >=dev-java/java-config-2.1.6
 SLOT=3.0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d9781a3b8a82e3b2e190942c7e3b7f28
diff --git a/metadata/md5-cache/java-virtuals/stax-api-1-r4 b/metadata/md5-cache/java-virtuals/stax-api-1-r4
index 544809425b77..e212a2dc0e5b 100644
--- a/metadata/md5-cache/java-virtuals/stax-api-1-r4
+++ b/metadata/md5-cache/java-virtuals/stax-api-1-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr173 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b66f92e5ed8764fc18f0e2ab14b6ba22
diff --git a/metadata/md5-cache/java-virtuals/transaction-api-1.1 b/metadata/md5-cache/java-virtuals/transaction-api-1.1
index 322a09c87324..eff55f395caa 100644
--- a/metadata/md5-cache/java-virtuals/transaction-api-1.1
+++ b/metadata/md5-cache/java-virtuals/transaction-api-1.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-transaction-api:0 dev-java/jta:0 ) >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ca00e1e09e7c431fcaf7e282c3f5505
diff --git a/metadata/md5-cache/java-virtuals/xmlrpc-api-0 b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
index 72877fb78b01..8734bd1ab94c 100644
--- a/metadata/md5-cache/java-virtuals/xmlrpc-api-0
+++ b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-xmlrpc-api:0 >=dev-java/java-config-2.1.6
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	java-virtuals-2	348b5b41a30c0b4eee11e7a9343d53ce	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b271da1c43eb09f30dc3cf73f6691b2
diff --git a/metadata/md5-cache/kde-base/korundum-4.14.3-r1 b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
index 1053f887aa72..f9b13d8f6bc8 100644
--- a/metadata/md5-cache/kde-base/korundum-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/qtruby-4.14.3:4[aqua=,ruby_targets_ruby20] >=kde-base/smokekd
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/korundum-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=82d3c9659b0a0c583b9ff0d7fd90f674
diff --git a/metadata/md5-cache/kde-base/krossjava-4.14.3 b/metadata/md5-cache/kde-base/krossjava-4.14.3
index d178c588c1f4..9a95b7690f4f 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.1.9-r1 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8f84d10c5dd79a139c6b40b8f7ae66a7
diff --git a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1 b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
index f4ac147fd481..2c4b6d79997d 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) dev
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	kde4-meta	99e6fa43762d8563ba5546fed686a63a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=15c4fdf7e1b1e3b72934d45cd87cf360
diff --git a/metadata/md5-cache/kde-base/poxml-4.14.3 b/metadata/md5-cache/kde-base/poxml-4.14.3
index 1054f9dcefbf..088f3bdb0036 100644
--- a/metadata/md5-cache/kde-base/poxml-4.14.3
+++ b/metadata/md5-cache/kde-base/poxml-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=extras? ( >=virtual/jre-1.5 >=dev-java/antlr-2.7.7:0[cxx,java,script] ) !<=kde-base/kdesdk-misc-4.10.50:4 extras? ( >=dev-java/java-config-2.1.9-r1 ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) 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/poxml-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f5f76893bcc48d00c3488c55ef7aca68
diff --git a/metadata/md5-cache/kde-base/qtruby-4.14.3-r2 b/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
index 043f871a2e41..dbb09a895318 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
+++ b/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/qtruby-4.14.3.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	4241a8d9ed765c83041b38ac128505cd	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d4fda05f587946ad08de521f9ecf8292
diff --git a/metadata/md5-cache/kde-misc/semantik-0.9.1 b/metadata/md5-cache/kde-misc/semantik-0.9.4
similarity index 93%
rename from metadata/md5-cache/kde-misc/semantik-0.9.1
rename to metadata/md5-cache/kde-misc/semantik-0.9.4
index f34d45825f64..60690e98071f 100644
--- a/metadata/md5-cache/kde-misc/semantik-0.9.1
+++ b/metadata/md5-cache/kde-misc/semantik-0.9.4
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup u
 DEPEND=>=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(+)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 >=sys-apps/sed-4 dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=] dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=Mindmapping-like tool for document generation
 EAPI=5
-HOMEPAGE=http://freehackers.org/~tnagy/semantik.html
+HOMEPAGE=http://freehackers.org/~tnagy/semantik.html https://code.google.com/p/semantik/
 IUSE=debug python_targets_python2_7 aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=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(+)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.4:4[aqua=]
 REQUIRED_USE=python_targets_python2_7
 SLOT=4
-SRC_URI=https://semantik.googlecode.com/files/semantik-0.9.1.tar.bz2
+SRC_URI=http://ftp.waf.io/pub/release/semantik-0.9.4.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=fa5871318dddb624f8a45b67fbaad728
+_md5_=5ab249d93a8366e7993742af99ff1d4f
diff --git a/metadata/md5-cache/mail-mta/courier-0.74.1-r1 b/metadata/md5-cache/mail-mta/courier-0.74.1-r1
index 27387bfa2b41..af6b6a160f32 100644
--- a/metadata/md5-cache/mail-mta/courier-0.74.1-r1
+++ b/metadata/md5-cache/mail-mta/courier-0.74.1-r1
@@ -3,11 +3,11 @@ DEPEND=>=net-libs/courier-authlib-0.66.1 net-libs/courier-unicode !gnutls? ( >=d
 DESCRIPTION=An MTA designed specifically for maildirs
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=~amd64 ~arm hppa ~x86
 LICENSE=GPL-2
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.66.1 net-libs/courier-unicode !gnutls? ( >=dev-libs/openssl-0.9.6 ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.74.1.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=0d56a38877b47fa1069f146ffb003f5d
+_md5_=5f4c8883c0269c1b16f48b684a1574a2
diff --git a/metadata/md5-cache/media-gfx/aoi-2.5 b/metadata/md5-cache/media-gfx/aoi-2.5
index 3bce127e6101..e75ca81fa9a9 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3b1d5ae49f86..50a262c43d6e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69f36d3596baf522f63a55a4c1a68878
diff --git a/metadata/md5-cache/media-gfx/brlcad-7.18.4 b/metadata/md5-cache/media-gfx/brlcad-7.18.4
index 5eb4a8493fd8..1e2661d3a80b 100644
--- a/metadata/md5-cache/media-gfx/brlcad-7.18.4
+++ b/metadata/md5-cache/media-gfx/brlcad-7.18.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 BSD
 RDEPEND=media-libs/libpng sys-libs/zlib >=sci-libs/tnt-3 sci-libs/jama =dev-tcltk/itcl-3.4* =dev-tcltk/itk-3.4* dev-tcltk/iwidgets dev-tcltk/tkimg dev-tcltk/tkpng sys-libs/libtermcap-compat media-libs/urt x11-libs/libXt x11-libs/libXi java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/brlcad/brlcad-7.18.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b640e6a7b713ea91e0286e0f9844f304
diff --git a/metadata/md5-cache/media-gfx/enblend-4.1.3 b/metadata/md5-cache/media-gfx/enblend-4.1.3
index 08c3691174a4..f60447b90f06 100644
--- a/metadata/md5-cache/media-gfx/enblend-4.1.3
+++ b/metadata/md5-cache/media-gfx/enblend-4.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff >=media-libs/vigra-1.8.0 sci-libs/gsl virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut ) sys-apps/help2man virtual/pkgconfig doc? ( media-gfx/imagemagick media-gfx/transfig sci-visualization/gnuplot[gd] virtual/latex-base ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff:= >=media-libs/vigra-1.8.0 sci-libs/gsl virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut ) sys-apps/help2man virtual/pkgconfig doc? ( media-gfx/imagemagick media-gfx/transfig sci-visualization/gnuplot[gd] virtual/latex-base ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Image Blending with Multiresolution Splines
 EAPI=5
 HOMEPAGE=http://enblend.sourceforge.net/
 IUSE=debug doc gpu image-cache openmp
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2 VIGRA
-RDEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff >=media-libs/vigra-1.8.0 sci-libs/gsl virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut )
+RDEPEND=>=dev-libs/boost-1.31.0:= media-libs/glew >=media-libs/lcms-2.5:2 >=media-libs/libpng-1.2.43:0= >=media-libs/openexr-1.0:= media-libs/plotutils[X] media-libs/tiff:= >=media-libs/vigra-1.8.0 sci-libs/gsl virtual/jpeg:0= debug? ( dev-libs/dmalloc ) gpu? ( media-libs/freeglut )
 REQUIRED_USE=openmp? ( !image-cache )
 SLOT=0
 SRC_URI=mirror://sourceforge/enblend/enblend-enfuse-4.1.3.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6ab712417cca4f74fc318c0f54915e02
+_md5_=454a3f41615afcb95a986a5ed9e456ef
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r3 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r3
index 1407942a5f83..19a6d29555b1 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r3
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c784cce12112b0a87e1341221081e49
diff --git a/metadata/md5-cache/media-gfx/freewrl-2.3.3 b/metadata/md5-cache/media-gfx/freewrl-2.3.3
index d40e275b7665..290301d369be 100644
--- a/metadata/md5-cache/media-gfx/freewrl-2.3.3
+++ b/metadata/md5-cache/media-gfx/freewrl-2.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-2.3.3.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4931dc77108e6a9793d38f18ba4f131c
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index e08ce2724d9d..689ea794d19e 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -7,5 +7,5 @@ IUSE=curl debug java libeai motif +nsplugin opencl osc +sox static-libs elibc_Fr
 LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng virtual/jpeg media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aae85a061c200875acba5610a7b4ffc9
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.34.0 b/metadata/md5-cache/media-gfx/graphviz-2.34.0
index 8ccf4611a093..7045e783116e 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.34.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.34.0
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_pyth
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.34.0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4ea8337e7f9b416d2ca33fe580484dc6
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.36.0 b/metadata/md5-cache/media-gfx/graphviz-2.36.0
index 9df818bf6514..1de632e5976b 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.36.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.36.0
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_pyth
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e7b1ce5639ea3906966f42132eb8ce4
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.36.0-r1 b/metadata/md5-cache/media-gfx/graphviz-2.36.0-r1
index f3d5efbed572..0735ac60567a 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.36.0-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.36.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_pyth
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33fa742799172c44bc93f96d71cce845
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.38.0 b/metadata/md5-cache/media-gfx/graphviz-2.38.0
index 2b9e90c4c9d3..319bfae083fc 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.38.0
+++ b/metadata/md5-cache/media-gfx/graphviz-2.38.0
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_pyth
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9860083658b98c34623c4be8fdb1a27b
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 ebfc4c30a0ed..d79b7b75ce76 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/opcion/Opcion_v1.1.1_src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2cc2c09f7b387cec221af063fc583823
diff --git a/metadata/md5-cache/media-gfx/plantuml-7999 b/metadata/md5-cache/media-gfx/plantuml-7999
index acc00135f21a..16f6e22b5abd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c82cc1d1725f7031666fbe2c86066664
diff --git a/metadata/md5-cache/media-libs/glpng-1.46 b/metadata/md5-cache/media-libs/glpng-1.46
deleted file mode 100644
index c7e7ff3ef408..000000000000
--- a/metadata/md5-cache/media-libs/glpng-1.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/opengl virtual/glu media-libs/libpng:0= sys-libs/zlib sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=An OpenGL PNG image library
-EAPI=5
-HOMEPAGE=http://repo.or.cz/w/glpng.git
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=ZLIB
-RDEPEND=virtual/opengl virtual/glu media-libs/libpng:0= sys-libs/zlib
-SLOT=0
-SRC_URI=http://repo.or.cz/w/glpng.git/snapshot/v1.46.tar.gz -> glpng-1.46.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6fff1eb740c1fff27f1feafdf537930b
diff --git a/metadata/md5-cache/media-libs/glpng-1.46-r1 b/metadata/md5-cache/media-libs/glpng-1.46-r1
new file mode 100644
index 000000000000..19d19e69a49e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glpng-1.46-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=An OpenGL PNG image library
+EAPI=5
+HOMEPAGE=http://repo.or.cz/w/glpng.git
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ZLIB
+RDEPEND=virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://repo.or.cz/w/glpng.git/snapshot/v1.46.tar.gz -> glpng-1.46.tar.gz
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=a36d59b575fb04edac3c7ad106bdb088
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5
new file mode 100644
index 000000000000..50a92785ed7d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) >=dev-libs/check-0.9.2 >=dev-util/gtk-doc-am-1.12 virtual/pkgconfig test? ( >=media-libs/gst-plugins-bad-1.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-apps/sed-4 >=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(-)?] nls? ( >=sys-devel/gettext-0.17 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=A GStreamer based RTSP server
+EAPI=5
+HOMEPAGE=http://people.freedesktop.org/~wtay/
+IUSE=examples +introspection static-libs 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 nls
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.0
+SRC_URI=http://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.4.5.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0c3740489c1c7194094bf8b7a8726a3b
diff --git a/metadata/md5-cache/media-libs/leptonica-1.72 b/metadata/md5-cache/media-libs/leptonica-1.72
deleted file mode 100644
index 033f2283487d..000000000000
--- a/metadata/md5-cache/media-libs/leptonica-1.72
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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=C library for image processing and analysis
-EAPI=5
-HOMEPAGE=http://code.google.com/p/leptonica/
-IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp 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 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( jpeg png tiff )
-SLOT=0
-SRC_URI=http://www.leptonica.com/source/leptonica-1.72.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=b2f1151a92e8fe587d3a409c086e85ec
diff --git a/metadata/md5-cache/media-libs/leptonica-1.72-r1 b/metadata/md5-cache/media-libs/leptonica-1.72-r1
new file mode 100644
index 000000000000..cc8bcad6af21
--- /dev/null
+++ b/metadata/md5-cache/media-libs/leptonica-1.72-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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=C library for image processing and analysis
+EAPI=5
+HOMEPAGE=http://code.google.com/p/leptonica/
+IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp 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 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( jpeg png tiff )
+SLOT=0
+SRC_URI=http://www.leptonica.com/source/leptonica-1.72.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=51da5e2c387783e0de64f60bee39cd36
diff --git a/metadata/md5-cache/media-libs/libbluray-0.5.0 b/metadata/md5-cache/media-libs/libbluray-0.5.0
index c87cb8d29909..4a0a8c392d8f 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.5.0
+++ b/metadata/md5-cache/media-libs/libbluray-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( truetype? ( media-libs/freetype:2 ) >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.5.0/libbluray-0.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b78c63db981515a254857f830feaad4d
diff --git a/metadata/md5-cache/media-libs/libbluray-0.5.0-r1 b/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
index 44d6f0b7a7a6..0af2848edb30 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
+++ b/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.5.0/libbluray-0.5.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58dad86490b37d0ff1214d12cc4d3734
diff --git a/metadata/md5-cache/media-libs/libbluray-0.6.1 b/metadata/md5-cache/media-libs/libbluray-0.6.1
index 349bfe5ae2ff..2cab48a71968 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.6.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.6.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.6.1/libbluray-0.6.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b7ae28a6802f9462331bb06b4469368
diff --git a/metadata/md5-cache/media-libs/libbluray-0.6.2 b/metadata/md5-cache/media-libs/libbluray-0.6.2
index f072d37d3aa9..bd8fb2146cdd 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.6.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.6.2/libbluray-0.6.2.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3478d00c11b81f56b026420a5cdbdfd6
diff --git a/metadata/md5-cache/media-libs/libbluray-0.7.0 b/metadata/md5-cache/media-libs/libbluray-0.7.0
index 35ab8eeb6951..318bda998de1 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.7.0
+++ b/metadata/md5-cache/media-libs/libbluray-0.7.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.7.0/libbluray-0.7.0.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18a3147df3322df2743854418525221d
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 98360c9717de..421eaeae4fd7 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -7,5 +7,5 @@ IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=551d748e310feffd408633a7a2944273
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta17 b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
index 4edfce207212..102dd5701bdf 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta17
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta17
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/glu virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta17.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8035805d5ccf8629d90b17fc499e651e
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r1 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r1
index 512e16f90b20..805efd0f244c 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r1
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r1
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-li
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=169eb838a85665c61e35184d137b9205
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
index 427479d5c3c2..7ac192ade6cb 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03490c73e49f5919176f75e8f0e98997
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index 373a620b162a..733a53c5209a 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4a58d321034ab4e3c2de8c2c054e1a
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
index d47e49f75728..f4a88ad5d604 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65f286c208c0180d313ee9067a1debe6
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
index 92b114e66253..5fef8c001ba9 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b951dba9a87c079de7e3876f1e59e34d
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
index cbf200f739e9..c0cd8fc8da17 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a11a7f3c323ebc235b23e5328f5636fe
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
index 4bd910b12255..17ae11038640 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.4.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=584c9e685aff92e9d65a391686baa889
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.18 b/metadata/md5-cache/media-libs/libpano13-2.9.18
index 8c2268a267cd..bc43291124d4 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.18
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d55d065e269ec8c8b195ad5d766d73a
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.19 b/metadata/md5-cache/media-libs/libpano13-2.9.19
index a72890aaffc2..b8462c65b98f 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.19
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.19.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed97a3e9f8105a36bfbd30ea5cb6bc88
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.10 b/metadata/md5-cache/media-libs/opencv-2.4.10
index a807ae742883..cf6ac950a2d1 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.10
+++ b/metadata/md5-cache/media-libs/opencv-2.4.10
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/2.4.10/opencv-2.4.10.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=64e27e98871f8a3cd51a314e8ec347da
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.9 b/metadata/md5-cache/media-libs/opencv-2.4.9
index d7614d7d91df..f2dce72cebf1 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.9
+++ b/metadata/md5-cache/media-libs/opencv-2.4.9
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/2.4.9/opencv-2.4.9.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18c112a692c50cb0b498a02c68d8800e
diff --git a/metadata/md5-cache/media-libs/portmidi-217 b/metadata/md5-cache/media-libs/portmidi-217
index fd4601d7b949..59c0f1cfbf25 100644
--- a/metadata/md5-cache/media-libs/portmidi-217
+++ b/metadata/md5-cache/media-libs/portmidi-217
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a51090f57b505a2746543c20329179c
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r1 b/metadata/md5-cache/media-libs/portmidi-217-r1
index c5e049ca3caa..cdfd2cbcec8f 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r1
+++ b/metadata/md5-cache/media-libs/portmidi-217-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87854cae65c5221fe57e1cc96f410080
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.1 b/metadata/md5-cache/media-libs/rubberband-1.8.1
index 5a09b9e51c9b..8e6f49f0bb8c 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.8.1
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
 EAPI=5
 HOMEPAGE=http://www.breakfastquay.com/rubberband/
 IUSE=static-libs
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0
 SLOT=0
 SRC_URI=http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=917682495db7a3fb789876106b6e5942
+_md5_=9204e0f8c32b6a9182e0de1fbd2d603f
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.22 b/metadata/md5-cache/media-radio/flrig-1.3.22
new file mode 100644
index 000000000000..b43d5e4616b3
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.3.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=5
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=http://www.w1hkj.com/downloads/flrig/flrig-1.3.22.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=e8be2731883448b8899926bf0005855f
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.13 b/metadata/md5-cache/media-radio/xlog-2.0.13
new file mode 100644
index 000000000000..4050809b71ba
--- /dev/null
+++ b/metadata/md5-cache/media-radio/xlog-2.0.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An amateur radio logging program
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/xlog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/xlog/xlog-2.0.13.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=d9312a36ac70d92e1945a6b293ba4652
diff --git a/metadata/md5-cache/media-sound/ardour-4.0 b/metadata/md5-cache/media-sound/ardour-4.0
deleted file mode 100644
index 710d466fa08c..000000000000
--- a/metadata/md5-cache/media-sound/ardour-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=Digital Audio Workstation
-EAPI=5
-HOMEPAGE=http://ardour.org/
-IUSE=altivec doc jack nls lv2 cpu_flags_x86_sse
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 )
-SLOT=4
-SRC_URI=https://github.com/Ardour/ardour/archive/4.0.tar.gz -> ardour-4.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=002a69969470b33f0497c9764fc83aeb
diff --git a/metadata/md5-cache/media-sound/ardour-4.0-r1 b/metadata/md5-cache/media-sound/ardour-4.0-r1
deleted file mode 100644
index e277a191425d..000000000000
--- a/metadata/md5-cache/media-sound/ardour-4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=Digital Audio Workstation
-EAPI=5
-HOMEPAGE=http://ardour.org/
-IUSE=altivec doc jack nls lv2 cpu_flags_x86_sse
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 )
-SLOT=4
-SRC_URI=https://github.com/Ardour/ardour/archive/4.0.tar.gz -> ardour-4.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=7393b4891e49217be48dfa647f8c5f5b
diff --git a/metadata/md5-cache/media-sound/ardour-4.0-r2 b/metadata/md5-cache/media-sound/ardour-4.0-r2
index e6feccb1b989..76b66dad0796 100644
--- a/metadata/md5-cache/media-sound/ardour-4.0-r2
+++ b/metadata/md5-cache/media-sound/ardour-4.0-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads]
+DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 sys-devel/gettext doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=Digital Audio Workstation
 EAPI=5
 HOMEPAGE=http://ardour.org/
-IUSE=altivec doc jack nls lv2 cpu_flags_x86_sse
+IUSE=altivec doc jack lv2 cpu_flags_x86_sse
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 )
 SLOT=4
 SRC_URI=https://github.com/Ardour/ardour/archive/4.0.tar.gz -> ardour-4.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=e7eb82f23fa391e95a18ee60316cf133
+_md5_=286afbe586ddc64235bd11a721310086
diff --git a/metadata/md5-cache/media-sound/ardour-9999 b/metadata/md5-cache/media-sound/ardour-9999
index ff6869dd3198..752ae4d9993a 100644
--- a/metadata/md5-cache/media-sound/ardour-9999
+++ b/metadata/md5-cache/media-sound/ardour-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads] dev-vcs/git
+DEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) virtual/pkgconfig >=media-sound/jack-audio-connection-kit-0.120 sys-devel/gettext doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads] dev-vcs/git
 DESCRIPTION=Digital Audio Workstation
 EAPI=5
 HOMEPAGE=http://ardour.org/
-IUSE=altivec doc jack nls lv2 cpu_flags_x86_sse
+IUSE=altivec doc jack lv2 cpu_flags_x86_sse
 LICENSE=GPL-2
 RDEPEND=media-libs/aubio media-libs/liblo sci-libs/fftw:3.0 media-libs/freetype:2 >=dev-libs/glib-2.10.1:2 >=dev-cpp/glibmm-2.32.0 >=x11-libs/gtk+-2.8.1:2 >=dev-libs/libxml2-2.6:2 >=media-libs/libsndfile-1.0.18 >=media-libs/libsamplerate-0.1 >=media-libs/rubberband-1.6.0 >=media-libs/libsoundtouch-1.6.0 media-libs/flac media-libs/raptor:2 >=media-libs/liblrdf-0.4.0-r20 >=gnome-base/libgnomecanvas-2 media-libs/vamp-plugin-sdk dev-libs/libxslt dev-libs/libsigc++:2 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 media-libs/alsa-lib x11-libs/pango x11-libs/cairo media-libs/libart_lgpl virtual/libusb:0 dev-libs/boost >=media-libs/taglib-1.7 net-misc/curl jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 )
 SLOT=4
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=c0a26b5d58798c999a36f506830e7409
+_md5_=bf3b6c06c40394177b4d180143ae0c57
diff --git a/metadata/md5-cache/media-sound/csound-5.19.01 b/metadata/md5-cache/media-sound/csound-5.19.01
index 4e45a10faa3d..f70ffad7d2ec 100644
--- a/metadata/md5-cache/media-sound/csound-5.19.01
+++ b/metadata/md5-cache/media-sound/csound-5.19.01
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? (
 REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( cxx )
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound5.19.01.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a198b8481f4862b386346458df651369
diff --git a/metadata/md5-cache/media-sound/csound-6.02 b/metadata/md5-cache/media-sound/csound-6.02
index 1933db9a192b..74cbab050f4d 100644
--- a/metadata/md5-cache/media-sound/csound-6.02
+++ b/metadata/md5-cache/media-sound/csound-6.02
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound6.02.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b67638858886690d6706ef342a7d9734
diff --git a/metadata/md5-cache/media-sound/csound-6.03.2 b/metadata/md5-cache/media-sound/csound-6.03.2
index 60203923f1bb..fa3323ee8882 100644
--- a/metadata/md5-cache/media-sound/csound-6.03.2
+++ b/metadata/md5-cache/media-sound/csound-6.03.2
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound6.03.2.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=592f7bc30b6adca49c0a1a9c9e1b2560
diff --git a/metadata/md5-cache/media-sound/csound-6.04 b/metadata/md5-cache/media-sound/csound-6.04
index 863a03e25ce2..c760beb8ee54 100644
--- a/metadata/md5-cache/media-sound/csound-6.04
+++ b/metadata/md5-cache/media-sound/csound-6.04
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound6.04.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2791fa465d4921eeb91026463dc09191
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
index 778be534e26d..f670e59634c4 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 77b4a6492f98..e75deff7d025 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 21b8db8e0bb3..a94fd64a3a7d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1a92806a8bff..3fad9a94d72e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3104778b7c9af851f1d77c70e0f34888
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 11fe1ff5da88..dd661e9aa929 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.1.9-r1 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	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 9fd87504e0cb..6de3f563ce2b 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f9b25b9eeef5..f2d27190692e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8125fc1f115c784b24cc6496aabb1185
diff --git a/metadata/md5-cache/media-tv/xawtv-3.95-r3 b/metadata/md5-cache/media-tv/xawtv-3.95-r3
new file mode 100644
index 000000000000..b8c0479e5c33
--- /dev/null
+++ b/metadata/md5-cache/media-tv/xawtv-3.95-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=sys-libs/ncurses-5.1 virtual/jpeg:0 X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/motif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng:0 ) X? ( x11-apps/xset x11-apps/bdftopcf x11-proto/videoproto xext? ( x11-proto/xineramaproto ) ) X? ( x11-apps/mkfontdir media-fonts/encodings ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Small suite of video4linux related software
+EAPI=5
+HOMEPAGE=http://bytesex.org/xawtv/
+IUSE=aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext X
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.1 virtual/jpeg:0 X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/motif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng:0 )
+SLOT=0
+SRC_URI=http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz X? ( http://dl.bytesex.org/releases/tv-fonts/tv-fonts-1.1.tar.bz2 ) mirror://gentoo/xawtv-patches-4.tar.bz2
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	font	b3239d2dc442d1717b9725e2be7cb5d6	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=f17a4dcf019a5088cd8ee37e5094d317
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 ad2ee05f176a..db98d4e4d9ff 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 adfd1bc8d92c..ea5ba3177e6e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c8bfe292f9c1..9ee7c2a40520 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 f5a6e996cbbb..33f607498bd0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 2db582277bd8..cbdce0b7ddb7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cde99bdb8a31..ca90a0a995fb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5530bfacf4d6490fbbc358c25a1ee7a
diff --git a/metadata/md5-cache/media-video/mpv-0.3.11-r1 b/metadata/md5-cache/media-video/mpv-0.3.11-r1
deleted file mode 100644
index 3bc4d3a142ec..000000000000
--- a/metadata/md5-cache/media-video/mpv-0.3.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=libav? ( >=media-video/libav-9.10:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-1.2.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( libav? ( media-libs/libpostproc:0= ) !libav? ( >=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?] ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1:= libav? ( >=media-video/libav-9.10:0=[network] ) !libav? ( >=media-video/ffmpeg-1.2.4:0=[network] ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) virtual/pkgconfig >=dev-lang/perl-5.8 dev-python/docutils doc-pdf? ( dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-tex/xcolor ) X? ( x11-proto/videoproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) dev-lang/python !dev-lang/python[-threads] >=sys-apps/sed-4
-DESCRIPTION=Video player based on MPlayer/mplayer2
-EAPI=5
-HOMEPAGE=http://mpv.io/
-IUSE=+alsa bluray bs2b +cdio -doc-pdf dvb +dvd dvdnav +enca encode +iconv jack -joystick jpeg ladspa lcms +libass libav libcaca libguess lirc lua luajit +mpg123 -openal +opengl oss portaudio +postproc pulseaudio pvr +quvi -radio samba sdl selinux +shm v4l vaapi vcd vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=libav? ( >=media-video/libav-9.10:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-1.2.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/ncurses sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm opengl? ( virtual/opengl ) lcms? ( media-libs/lcms:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+)] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( libav? ( media-libs/libpostproc:0= ) !libav? ( >=media-video/ffmpeg-1.2:0=[encode?,threads,vaapi?,vdpau?] ) ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( >=media-libs/libquvi-0.4.1:= libav? ( >=media-video/libav-9.10:0=[network] ) !libav? ( >=media-video/ffmpeg-1.2.4:0=[network] ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.3.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
-REQUIRED_USE=dvdnav? ( dvd ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) radio? ( v4l || ( alsa oss ) ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
-SLOT=0
-SRC_URI=https://waf.googlecode.com/files/waf-1.7.15 https://github.com/mpv-player/mpv/archive/v0.3.11.tar.gz -> mpv-0.3.11.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=5e5b711caacc8bec7a792597b2e7ca1d
diff --git a/metadata/md5-cache/media-video/mpv-0.8.3 b/metadata/md5-cache/media-video/mpv-0.8.3
index a77de7c56ffd..434cfd0d4391 100644
--- a/metadata/md5-cache/media-video/mpv-0.8.3
+++ b/metadata/md5-cache/media-video/mpv-0.8.3
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=5
 HOMEPAGE=http://mpv.io/
 IUSE=+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv lirc lua luajit mpg123 openal +opengl oss pulseaudio pvr samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=|| ( cli libmpv ) dvdnav? ( dvd ) egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
 SRC_URI=http://ftp.waf.io/pub/release/waf-1.8.4 https://github.com/mpv-player/mpv/archive/v0.8.3.tar.gz -> mpv-0.8.3.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=2da4d24ecb57dd541546a0b63bba5809
+_md5_=b539e84a732b910d60c8755e7e8c4d5f
diff --git a/metadata/md5-cache/media-video/mpv-0.7.3 b/metadata/md5-cache/media-video/mpv-0.9.1
similarity index 52%
rename from metadata/md5-cache/media-video/mpv-0.7.3
rename to metadata/md5-cache/media-video/mpv-0.9.1
index f0348b0cc166..2ae1a03352c6 100644
--- a/metadata/md5-cache/media-video/mpv-0.7.3
+++ b/metadata/md5-cache/media-video/mpv-0.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( libav? ( >=media-libs/libpostproc-10.20140517:0= ) !libav? ( >=media-video/ffmpeg-2.1.4:0= ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) virtual/pkgconfig >=dev-lang/perl-5.8 dev-python/docutils doc-pdf? ( dev-python/rst2pdf ) X? ( x11-proto/videoproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) dev-lang/python !dev-lang/python[-threads] >=sys-apps/sed-4
-DESCRIPTION=Free, open source, and cross-platform media player (fork of MPlayer/mplayer2)
+DEPEND=libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.12.1:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lua? ( !luajit? ( =dev-lang/lua-5.1*:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) virtual/pkgconfig >=dev-lang/perl-5.8 dev-python/docutils doc-pdf? ( dev-python/rst2pdf ) X? ( x11-proto/videoproto xinerama? ( x11-proto/xineramaproto ) xscreensaver? ( x11-proto/scrnsaverproto ) ) dev-lang/python !dev-lang/python[-threads] >=sys-apps/sed-4
+DESCRIPTION=Media player based on MPlayer and mplayer2
 EAPI=5
 HOMEPAGE=http://mpv.io/
-IUSE=+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack joystick jpeg ladspa lcms +libass libav libcaca libguess libmpv lirc lua luajit mpg123 openal +opengl oss portaudio postproc pulseaudio pvr samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=libav? ( >=media-video/libav-10:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.1.4:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lirc? ( app-misc/lirc ) lua? ( !luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2 ) ) mpg123? ( >=media-sound/mpg123-1.14.0 ) openal? ( >=media-libs/openal-1.13 ) portaudio? ( >=media-libs/portaudio-19_pre20111121 ) postproc? ( libav? ( >=media-libs/libpostproc-10.20140517:0= ) !libav? ( >=media-video/ffmpeg-2.1.4:0= ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
+IUSE=+alsa bluray bs2b cdio +cli doc-pdf dvb +dvd dvdnav egl +enca encode +iconv jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2+ BSD ISC
+RDEPEND=libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( virtual/opengl egl? ( media-libs/mesa[egl] ) ) lcms? ( >=media-libs/lcms-2.6:2 ) vaapi? ( >=x11-libs/libva-0.34.0[X(+),opengl?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) alsa? ( >=media-libs/alsa-lib-1.0.18 ) bluray? ( >=media-libs/libbluray-0.3.0 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 dvdnav? ( >=media-libs/libdvdnav-4.2.0 ) ) enca? ( app-i18n/enca ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.12.1:=[enca?,fontconfig] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) libguess? ( >=app-i18n/libguess-1.0 ) lua? ( !luajit? ( =dev-lang/lua-5.1*:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[threads] ) v4l? ( media-libs/libv4l ) wayland? ( >=dev-libs/wayland-1.6.0 media-libs/mesa[egl,wayland] >=x11-libs/libxkbcommon-0.3.0 ) selinux? ( sec-policy/selinux-mplayer )
 REQUIRED_USE=|| ( cli libmpv ) dvdnav? ( dvd ) egl? ( opengl X ) enca? ( iconv ) lcms? ( opengl ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( wayland X ) ) pvr? ( v4l ) vaapi? ( X ) vdpau? ( X ) wayland? ( opengl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X )
 SLOT=0
-SRC_URI=http://ftp.waf.io/pub/release/waf-1.8.1 https://github.com/mpv-player/mpv/archive/v0.7.3.tar.gz -> mpv-0.7.3.tar.gz
+SRC_URI=http://ftp.waf.io/pub/release/waf-1.8.4 https://github.com/mpv-player/mpv/archive/v0.9.1.tar.gz -> mpv-0.9.1.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
-_md5_=d211dac906e5c6ab30ec0213fc9dc021
+_md5_=41be6c88a83ff2713fd59a6370dbd616
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 19932431a73d..8a0d12f11dfd 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10791336764614208ada7a599beafbfd
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 49c882ec1f9a..18b4db992931 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fc713112d99323d794c0c24f2e4f45a5
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.9.3 b/metadata/md5-cache/net-analyzer/metasploit-4.9.3
index b3174f8bce97..e6947bf08414 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.9.3
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=strip
 SLOT=4.9
 SRC_URI=http://downloads.metasploit.com/data/releases/archive/framework-4.9.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5778ee4701255fafab8c0d86801bd425
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index eae2f64c9e7b..0ce1142ebdf6 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -9,5 +9,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] dev-ruby/ac
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=strip
 SLOT=9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a69da67cc5f6e36e825f215b37ecc2f8
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19 b/metadata/md5-cache/net-analyzer/munin-2.0.19
index 8e4955e213ee..e33764ee8688 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-py
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=185884bab8548e74b0d7cf145597d0a5
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
index e4d0c6858466..9d971d0f397f 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-py
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e51659295026450b9fc6196081ba287
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.25 b/metadata/md5-cache/net-analyzer/munin-2.0.25
index cf74e7c84968..4e90e3d9f241 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.25
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.25
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.25.tar.gz http://dev.gentoo.org/~jlec/distfiles/munin-2.0.25-gentoo-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=973a9e7c2c3b05a5271189c4ac8f117b
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.25-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
index 954a177b1557..9cf6c766f758 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.25.tar.gz http://dev.gentoo.org/~jlec/distfiles/munin-2.0.25-gentoo-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49ab0ed32f958d1b4871567c70c74248
diff --git a/metadata/md5-cache/net-analyzer/munin-2.1.9999 b/metadata/md5-cache/net-analyzer/munin-2.1.9999
index ef358402a1a8..c05385fa5dd3 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.1.9999
+++ b/metadata/md5-cache/net-analyzer/munin-2.1.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c854a6ae868f890b2cb0d9a1e8bf55dd
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.13 b/metadata/md5-cache/net-analyzer/vnstat-1.13
index ad355b14d434..f538ba69cd72 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.13
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.13
@@ -4,10 +4,10 @@ DESCRIPTION=Console-based network traffic monitor that keeps statistics of netwo
 EAPI=5
 HOMEPAGE=http://humdi.net/vnstat/
 IUSE=gd selinux test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 SLOT=0
 SRC_URI=http://humdi.net/vnstat/vnstat-1.13.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=c9ce61ec4a66eb4bb10b33f6d952ffeb
+_md5_=6a3b36a8dd0e20b933d2ad1bc568fcdd
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.12-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.0.12-r1
index b4fecedc938e..7a273ddfd2bc 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.12-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.12-r1
@@ -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 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( 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[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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.12.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=99d4a37409c2626e0b6a64bbff1fbdd2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.13 b/metadata/md5-cache/net-analyzer/zabbix-2.0.13
index 4c3767356fab..7ab4e9c079c4 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.13
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.13
@@ -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 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( 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[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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.13.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=5134ea386e1ec61b1c53a4d65484cdaf
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.0.14 b/metadata/md5-cache/net-analyzer/zabbix-2.0.14
index a73cb54fc2da..b1107619e1fe 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.0.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.0.14
@@ -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 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( 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[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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.14.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=d3a25fb5ca7abdda4cf67417f66f2db8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.5 b/metadata/md5-cache/net-analyzer/zabbix-2.2.5
index 910991b13496..b6de768cb5c7 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-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.5.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=d89299584ab2f2126384868093f532bc
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.7 b/metadata/md5-cache/net-analyzer/zabbix-2.2.7
index 83b6c491cba1..8affea30ecdd 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.7
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.7
@@ -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-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.7.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=9c7e730678d1a02726d0d574f36ffb00
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.8 b/metadata/md5-cache/net-analyzer/zabbix-2.2.8
index 441721f6faa4..6dd73a4dbdcc 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.8
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.8
@@ -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-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.8.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=20c75c83e125ff8b022927977c467828
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.4.1 b/metadata/md5-cache/net-analyzer/zabbix-2.4.1
index 7b22ff58d570..c6ff60872aaf 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.4.1
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.4.1
@@ -8,5 +8,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-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.4.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=1f7a90f957d208171edd8cbac817ce03
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.4.3 b/metadata/md5-cache/net-analyzer/zabbix-2.4.3
index deadc28f1224..55780b45cfd3 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.4.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.4.3
@@ -8,5 +8,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-8.3.0 ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) jabber? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( >=virtual/jdk-1.4 ) 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.1.9-r1 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.4.3.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	depend.php	df169a364e191b840b695604097e3c21	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=b9b1378370ef6a5128eeb7edc2bad779
diff --git a/metadata/md5-cache/net-dns/libidn-1.29 b/metadata/md5-cache/net-dns/libidn-1.29
index 5dc77a59219b..1532bf6a4abd 100644
--- a/metadata/md5-cache/net-dns/libidn-1.29
+++ b/metadata/md5-cache/net-dns/libidn-1.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.29.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2fa48ab5b35af1567899d818c6b6b97
diff --git a/metadata/md5-cache/net-dns/libidn-1.30 b/metadata/md5-cache/net-dns/libidn-1.30
index df5c9f751933..d52618197b9a 100644
--- a/metadata/md5-cache/net-dns/libidn-1.30
+++ b/metadata/md5-cache/net-dns/libidn-1.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.30.tar.gz
-_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be663f9d4fde31d9be858c570e0b154b
diff --git a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3 b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
index 523023f0dac9..3501e3fb80b2 100644
--- a/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
+++ b/metadata/md5-cache/net-fs/ncpfs-2.2.6-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Provides Access to Netware services using the NCP protocol
 EAPI=5
 HOMEPAGE=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/
 IUSE=nls pam php
-KEYWORDS=amd64 ~mips ppc ~ppc64 x86
+KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=nls? ( sys-devel/gettext ) pam? ( virtual/pam ) php? ( || ( dev-lang/php virtual/httpd-php ) )
 SLOT=0
 SRC_URI=ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-2.2.6.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=49f7271523fbcc3acdfd1f9638ee6775
+_md5_=e30e53cbb79cec1c192166ded6989310
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.11.1 b/metadata/md5-cache/net-fs/openafs-1.6.11.1
new file mode 100644
index 000000000000..7f7b2e93c39b
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-1.6.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The OpenAFS distributed file system
+EAPI=5
+HOMEPAGE=http://www.openafs.org/
+IUSE=doc kerberos +modules pam
+KEYWORDS=~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) modules? ( ~net-fs/openafs-kernel-1.6.11.1 )
+SLOT=0
+SRC_URI=http://openafs.org/dl/openafs/1.6.11.1/openafs-1.6.11.1-src.tar.bz2 http://openafs.org/dl/openafs/1.6.11.1/openafs-1.6.11.1-doc.tar.bz2 http://dev.gentoo.org/~bircoph/patches/openafs-patches-20150503.tar.xz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bf0ed22d3bd08f1bc21a03d067b4d9a7
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.11.1 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.11.1
new file mode 100644
index 000000000000..9a7590573312
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=The OpenAFS distributed file system kernel module
+EAPI=5
+HOMEPAGE=http://www.openafs.org/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openafs.org/dl/openafs/1.6.11.1/openafs-1.6.11.1-src.tar.bz2 http://openafs.org/dl/openafs/1.6.11.1/openafs-1.6.11.1-doc.tar.bz2 http://dev.gentoo.org/~bircoph/patches/openafs-patches-20150503.tar.xz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=67c1af1d70c38222d8cf0756d33720ab
diff --git a/metadata/md5-cache/net-ftp/gftp-2.0.19-r2 b/metadata/md5-cache/net-ftp/gftp-2.0.19-r2
new file mode 100644
index 000000000000..c5d28867d8dc
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/gftp-2.0.19-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 sys-devel/gettext sys-libs/ncurses sys-libs/readline:0 gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
+DESCRIPTION=Gnome based FTP Client
+EAPI=5
+HOMEPAGE=http://www.gftp.org
+IUSE=gtk ssl
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sys-devel/gettext sys-libs/ncurses sys-libs/readline:0 gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=http://www.gftp.org/gftp-2.0.19.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=fe3e49924f6fdfc28ebc064292166966
diff --git a/metadata/md5-cache/net-ftp/gftp-9999 b/metadata/md5-cache/net-ftp/gftp-9999
deleted file mode 100644
index 84f0c12712a0..000000000000
--- a/metadata/md5-cache/net-ftp/gftp-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install preinst unpack
-DEPEND=dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl ) sys-devel/gettext >=dev-util/intltool-0.35.5 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/subversion net-misc/rsync
-DESCRIPTION=Gnome based FTP Client
-EAPI=1
-HOMEPAGE=http://www.gftp.org
-IUSE=gtk ssl
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl )
-SLOT=0
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=353514a76743c521b27413ee4ce9b9e1
diff --git a/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r1 b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r1
new file mode 100644
index 000000000000..9ebb80052898
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/gproftpd-8.3.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 >=x11-libs/pango-1.0 >=dev-libs/atk-1.0 >=media-libs/freetype-2.0 ssl? ( >=dev-libs/openssl-0.9.6f ) >=net-ftp/proftpd-1.2.9 virtual/pkgconfig
+DESCRIPTION=GTK frontend to proftpd
+EAPI=5
+HOMEPAGE=http://mange.dynup.net/linux.html
+IUSE=gnome ssl
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2 >=x11-libs/pango-1.0 >=dev-libs/atk-1.0 >=media-libs/freetype-2.0 ssl? ( >=dev-libs/openssl-0.9.6f ) >=net-ftp/proftpd-1.2.9
+SLOT=0
+SRC_URI=http://mange.dynup.net/linux/gproftpd/gproftpd-8.3.2.tar.gz
+_md5_=eecd7e4b543e2dd28a2c8c92ce73089c
diff --git a/metadata/md5-cache/net-im/kouchat-1.1.0 b/metadata/md5-cache/net-im/kouchat-1.1.0
index 41cbd1040e50..66c0033831ab 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 50c4dba78dbb..c09a4be6fe81 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec59aa09775e4ab63278dea0cbc57410
diff --git a/metadata/md5-cache/net-im/openfire-3.9.2-r1 b/metadata/md5-cache/net-im/openfire-3.9.2-r1
index fc68c8f57d5e..bb792db7b9de 100644
--- a/metadata/md5-cache/net-im/openfire-3.9.2-r1
+++ b/metadata/md5-cache/net-im/openfire-3.9.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_9_2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=410db3c128c3ffd785edd92ff15c24d0
diff --git a/metadata/md5-cache/net-im/openfire-3.9.3 b/metadata/md5-cache/net-im/openfire-3.9.3
index 2a087bf014f2..ac20a35e9fd9 100644
--- a/metadata/md5-cache/net-im/openfire-3.9.3
+++ b/metadata/md5-cache/net-im/openfire-3.9.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_9_3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eeda1240ad65c7330a000d990998679c
diff --git a/metadata/md5-cache/net-im/openfire-3.9.3-r1 b/metadata/md5-cache/net-im/openfire-3.9.3-r1
index 62883bf67c3a..8ee907a63ce9 100644
--- a/metadata/md5-cache/net-im/openfire-3.9.3-r1
+++ b/metadata/md5-cache/net-im/openfire-3.9.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_9_3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7490f3875bb8993b060de23ad3261eca
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10 b/metadata/md5-cache/net-irc/epic5-1.1.10
index 22312b171fac..6a393c9d5394 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libicon
 REQUIRED_USE=ruby? ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b8d43ada7ac6c9004f874de6a80afb1
diff --git a/metadata/md5-cache/net-irc/jircii-41 b/metadata/md5-cache/net-irc/jircii-41
index 35079e7e7869..8c734c48209f 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.1.9-r1
 SLOT=0
 SRC_URI=http://jirc.hick.org/download/jerkb41.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d67b77df1d67acf9f8e65a773fba420
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
index ea0eaab6c94a..1c0940eb82e6 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
@@ -10,5 +10,5 @@ RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) fi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://dev.a3li.li/gentoo/distfiles/rbot-0.9.15_p20131020.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f3ea6ed70f92689539217cfd48df378
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330 b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
index 198fa3968aff..67698f83ec76 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/NativeThread-0_pre20080330.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e3906e0978cf3a34d854cda1f73ac59
diff --git a/metadata/md5-cache/net-libs/aqbanking-5.5.1 b/metadata/md5-cache/net-libs/aqbanking-5.5.1
index fa01f3824858..1cef6324f7bc 100644
--- a/metadata/md5-cache/net-libs/aqbanking-5.5.1
+++ b/metadata/md5-cache/net-libs/aqbanking-5.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Generic Online Banking Interface
 EAPI=5
 HOMEPAGE=http://www.aquamaniac.de/aqbanking/
 IUSE=chipcard debug doc ebics examples gtk ofx
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-misc/ktoblzcheck-1.48 >=dev-libs/gmp-5 >=sys-libs/gwenhywfar-4.13.1[gtk?] virtual/libintl ofx? ( >=dev-libs/libofx-0.9.5 ) chipcard? ( >=sys-libs/libchipcard-5.0.2 ) ebics? ( dev-libs/xmlsec[gcrypt,gnutls] )
 SLOT=0
 SRC_URI=http://www.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=aqbanking-5.5.1.tar.gz -> aqbanking-5.5.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=3a86ca11b1d3d6905d286a78c14c82c3
+_md5_=20a3e6158e8ddab61671182d94b5ee16
diff --git a/metadata/md5-cache/net-libs/axtls-1.4.8 b/metadata/md5-cache/net-libs/axtls-1.4.8
deleted file mode 100644
index ed777e8e7635..000000000000
--- a/metadata/md5-cache/net-libs/axtls-1.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
-EAPI=4
-HOMEPAGE=http://axtls.sourceforge.net/
-IUSE=httpd cgi-lua cgi-php static static-libs doc savedconfig
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86
-LICENSE=BSD GPL-2
-RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
-REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
-SLOT=0
-SRC_URI=mirror://sourceforge/axtls/axTLS-1.4.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f78adabe5f6f38cd856ab8431d3b0db0
diff --git a/metadata/md5-cache/net-libs/axtls-1.4.9 b/metadata/md5-cache/net-libs/axtls-1.4.9
deleted file mode 100644
index 95d9cbb39b15..000000000000
--- a/metadata/md5-cache/net-libs/axtls-1.4.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
-EAPI=4
-HOMEPAGE=http://axtls.sourceforge.net/
-IUSE=httpd cgi-lua cgi-php static static-libs doc savedconfig
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 s390 x86
-LICENSE=BSD GPL-2
-RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
-REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
-SLOT=0
-SRC_URI=mirror://sourceforge/axtls/axTLS-1.4.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9dab7d7e49f56b4e75e43672139674ed
diff --git a/metadata/md5-cache/net-libs/axtls-1.4.9-r1 b/metadata/md5-cache/net-libs/axtls-1.5.3
similarity index 86%
rename from metadata/md5-cache/net-libs/axtls-1.4.9-r1
rename to metadata/md5-cache/net-libs/axtls-1.5.3
index 50daa4bad816..751f196801e3 100644
--- a/metadata/md5-cache/net-libs/axtls-1.4.9-r1
+++ b/metadata/md5-cache/net-libs/axtls-1.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
 EAPI=5
 HOMEPAGE=http://axtls.sourceforge.net/
 IUSE=httpd cgi-lua cgi-php static static-libs doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 savedconfig
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
-SRC_URI=mirror://sourceforge/axtls/axTLS-1.4.9.tar.gz
+SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=8d502882f841f36f324f77f27bcb997d
+_md5_=d24907e90cd78a30c600894d1d01b2cb
diff --git a/metadata/md5-cache/net-libs/courier-unicode-1.1 b/metadata/md5-cache/net-libs/courier-unicode-1.1
index faa7285c19c2..f939c902e07f 100644
--- a/metadata/md5-cache/net-libs/courier-unicode-1.1
+++ b/metadata/md5-cache/net-libs/courier-unicode-1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Unicode library used by the courier mail server
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm hppa ppc64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-unicode-1.1.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=ab62cbc58eeee25897b90267e120d1d1
+_md5_=c1a96d57c48b11e5ceea8cfa59f45b51
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15 b/metadata/md5-cache/net-libs/gnutls-3.3.15
new file mode 100644
index 000000000000..c6a165c87ffe
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15
@@ -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.13:1.13 >=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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=24ebb4119f54a0746fcefb939c2f1222
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.0 b/metadata/md5-cache/net-libs/gnutls-3.4.1
similarity index 98%
rename from metadata/md5-cache/net-libs/gnutls-3.4.0
rename to metadata/md5-cache/net-libs/gnutls-3.4.1
index 1945310d0d12..d9151d9e32fa 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.4.0
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/30
-SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.0.tar.xz
+SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.1.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=61161b290331c39a2e2091df63767a16
+_md5_=0b7cb0d7621f9146e64fcd30535b512a
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
index a29e409bce82..cbf34854c6b9 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b1a31033311d..a535fda350e0 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bb4aa07af93a..c296076e3f54 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.1.9-r1
 SLOT=0
 SRC_URI=http://mirror.i2p2.de/i2psource_0.8.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=474656cb23ec2ce9cdce392df570311e
diff --git a/metadata/md5-cache/net-libs/opal-3.10.11 b/metadata/md5-cache/net-libs/opal-3.10.11
index 1bf7f5f4724c..da3dd29a813e 100644
--- a/metadata/md5-cache/net-libs/opal-3.10.11
+++ b/metadata/md5-cache/net-libs/opal-3.10.11
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.11-htmldoc.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccd55bbcd07b24038da03ca6de20efdc
diff --git a/metadata/md5-cache/net-libs/opal-3.12.4 b/metadata/md5-cache/net-libs/opal-3.12.4
index de4f622252ec..6687e75281d2 100644
--- a/metadata/md5-cache/net-libs/opal-3.12.4
+++ b/metadata/md5-cache/net-libs/opal-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.12.4.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.12.4-htmldoc.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ccf5ee5c1248eec52000095eab2a65b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.6.6 b/metadata/md5-cache/net-libs/webkit-gtk-2.6.6
new file mode 100644
index 000000000000..5174db2beeed
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.6.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 virtual/jpeg:0= >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=dev-libs/icu-3.8.1-r1:= >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:=[X] >=x11-libs/gtk+-3.6.0:3[X,introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.30.0.0 x11-libs/libXrender x11-libs/libXt x11-libs/libX11 >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) libsecret? ( app-crypt/libsecret ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/perl-5.10 || ( virtual/rubygems[ruby_targets_ruby20] virtual/rubygems[ruby_targets_ruby21] virtual/rubygems[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby19] ) >=app-accessibility/at-spi2-core-2.5.3 >=dev-libs/atk-2.8.0 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 >=sys-devel/flex-2.5.34 || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.10 ) geoloc? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=5
+HOMEPAGE=http://www.webkitgtk.org/
+IUSE=coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 virtual/jpeg:0= >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=dev-libs/icu-3.8.1-r1:= >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=net-libs/libsoup-2.42:2.4[introspection?] >=x11-libs/cairo-1.10.2:=[X] >=x11-libs/gtk+-3.6.0:3[X,introspection?] dev-db/sqlite:3= >=x11-libs/pango-1.30.0.0 x11-libs/libXrender x11-libs/libXt x11-libs/libX11 >=x11-libs/gtk+-2.24.10:2 egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0 ) libsecret? ( app-crypt/libsecret ) opengl? ( virtual/opengl ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geoloc? ( introspection ) introspection? ( gstreamer ) webgl? ( opengl )
+SLOT=4/37
+SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.6.6.tar.xz
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=47e49005af9b3abd0a63c9e639e84169
diff --git a/metadata/md5-cache/net-mail/Freemail-9999 b/metadata/md5-cache/net-mail/Freemail-9999
index b0d47639b8f6..f130e15fa8fe 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8fdd21c44ee24d404a9079a9d3bba54e
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.3 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.3
new file mode 100644
index 000000000000..7ac2c1fd6717
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.8.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++
+EAPI=5
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~bloch/acng/ http://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse systemd tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.8.3.orig.tar.xz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=7c4df7a677df1f1760429b5c4e17f894
diff --git a/metadata/md5-cache/net-misc/curl-7.42.1 b/metadata/md5-cache/net-misc/curl-7.42.1
index f51ce6ff27c0..771a41ee17d7 100644
--- a/metadata/md5-cache/net-misc/curl-7.42.1
+++ b/metadata/md5-cache/net-misc/curl-7.42.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=5
 HOMEPAGE=http://curl.haxx.se/
 IUSE=adns idn ipv6 kerberos ldap metalink rtmp 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
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ( =net-libs/gnutls-2.12*[nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.15.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) idn? ( >=net-dns/libidn-1.28[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( >=net-dns/c-ares-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.42.1.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=5292db161134dcd6f6d46d734962a715
+_md5_=3ad71be962a7d7f4db68f3d9e10a86d9
diff --git a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r1 b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r1
index bcf05b6e8e13..73cac75e60f7 100644
--- a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r1
+++ b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/jsap:0 >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b144d0339848a70b9abe6196e8ea6374
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 db39ee670ea8..3e31c67f7cb7 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be9a11e5199ac670758079b409d96118
diff --git a/metadata/md5-cache/net-misc/mikutter-3.1.1 b/metadata/md5-cache/net-misc/mikutter-3.1.1
index 7d4287970c9e..b5b27fad0a5f 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.1.1
+++ b/metadata/md5-cache/net-misc/mikutter-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f373ed41729dfc33044f7d51a716967d
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 0da41126df7c..d287b717abfa 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/bsearch[ruby_targets_ruby20] dev-ruby/delayer[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] dev-ruby/memoize[ruby_targets_ruby20] >=dev-ruby/moneta-0.7[ruby_targets_ruby20] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby20] dev-ruby/rcairo[ruby_targets_ruby20] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby20] dev-ruby/ruby-hmac[ruby_targets_ruby20] dev-ruby/typed-array[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6d3c673ed5844aa45a52d1945bb53fb3
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index 2a0202d6486b..b0de3d9ba309 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a7d0ac46a35e5a36de74670da671889
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06 b/metadata/md5-cache/net-misc/openconnect-7.06
index 2a6f20ed9368..cac66ff69d6f 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06
+++ b/metadata/md5-cache/net-misc/openconnect-7.06
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) sys-apps/iproute2 java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acd4d7eb0388a9b5c7c4db002330d94f
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.9 b/metadata/md5-cache/net-misc/sstp-client-1.0.9-r1
similarity index 84%
rename from metadata/md5-cache/net-misc/sstp-client-1.0.9
rename to metadata/md5-cache/net-misc/sstp-client-1.0.9-r1
index 3acb39234168..804b3d231df8 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.9
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.9-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:= virtual/pkgconfig
 DESCRIPTION=A client implementation of Secure Socket Tunneling Protocol (SSTP)
 EAPI=5
 HOMEPAGE=http://sstp-client.sourceforge.net/
 IUSE=static
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp
+RDEPEND=>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-dialup/ppp:=
 SLOT=0
 SRC_URI=mirror://sourceforge/sstp-client/sstp-client-1.0.9.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dbbdd0c49db95edc8408f17e2be2221b
+_md5_=0b5168cf4fe5fecd3c653c05aaef3ce8
diff --git a/metadata/md5-cache/net-misc/termtter-2.2.2 b/metadata/md5-cache/net-misc/termtter-2.2.2
index b70909693059..1930e82fabb5 100644
--- a/metadata/md5-cache/net-misc/termtter-2.2.2
+++ b/metadata/md5-cache/net-misc/termtter-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/highl
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/termtter-2.2.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5575e128d8525b3b5a58a8ec5c38e14c
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
index f312e6fcf15d..b81557dc3d8b 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.15* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.0-patches-0.2.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.3.0-patches-0.2.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.15.0.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=49f9e256728489bc7fc022c1612da000
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
index bae102798e7e..15c13ae87982 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.1-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.3.1-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.0.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b55c579b480aa050c89cc8d1774c27cd
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
index 417e3e7326b7..04df16edea74 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.15* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.0-patches-0.2.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.3.0-patches-0.2.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.15.0.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cea9753c7b691568df703d3139b3fa93
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
index cc9509cefe13..55cba61e8ff0 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.1-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.3.1-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.0.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=22f91fa1edfeb4bf79977049b35f2e5a
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1 b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
index e90853fa0c2a..d367ce2ef231 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.4.2.tar.gz -> tigervnc-1.4.2.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.4.2-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06a6af6e3b772cec4d14ededfc085b77
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2 b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
index 4f6f4bb8413b..dbe4934481b3 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.17* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.4.2.tar.gz -> tigervnc-1.4.2.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.4.2-patches-0.1.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.17.1.tar.bz2 )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33068af45a31adcffc93c1d9b218af64
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r1 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r1
index 4452cde697c9..d0cfafc8bff1 100644
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r1
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=081598520ad7307aae1131ba9e5dfcc2
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
index f26711f5360c..7974960e5a6a 100644
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6aff1187f465d04b783aabd0f2739cc6
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.2 b/metadata/md5-cache/net-misc/yajhfc-0.5.2
index 761a2ed38e33..40e0968ad5ef 100644
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.2
+++ b/metadata/md5-cache/net-misc/yajhfc-0.5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_2.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db93774bfd4bbdd799876450f86ad7e9
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.7 b/metadata/md5-cache/net-misc/yajhfc-0.5.7
index d37c1c7ad1da..4583e9990279 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.1.9-r1
 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e7e99b5680bd85a29cb9fd1f5ef3c716
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.04.03 b/metadata/md5-cache/net-misc/youtube-dl-2015.04.03
index 4b52b329b652..85ff864edb93 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.04.03
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.04.03
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2015.04.03/youtube-dl-2015.04.03.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c14e5254abd05ec03188b116aa3f59d2
+_md5_=5c594ca816299efc2d350953f6ba3f35
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.04.26 b/metadata/md5-cache/net-misc/youtube-dl-2015.04.26
index b159060bbb55..8424f9c05d48 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.04.26
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.04.26
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2015.04.26/youtube-dl-2015.04.26.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=66792cef0a3513268dd913d5bf36c73a
+_md5_=b1951f25d5670a1629244f05ff452768
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.04.28 b/metadata/md5-cache/net-misc/youtube-dl-2015.04.28
index 06a972d9ad58..720d95a430e8 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.04.28
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.04.28
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2015.04.28/youtube-dl-2015.04.28.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=82ae12b90bf683f94508803fbe100a87
+_md5_=fafd7631fd3a8491496dd0eb91f53efa
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2 b/metadata/md5-cache/net-nds/jxplorer-3.2
index c9e490e06d3c..5acd7a29f465 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 876210ee2f1d..cc7ddc5f02b2 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bee33fddbb36..0fd12e99f635 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5d35696130cc3f1ba6afa27ec8858ed4
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 644654e6ac41..aee28221c7c1 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6df044a45b9f..e79b69e90f59 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ab2f08031ee4..fb799c77f71d 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/frostwire/frostwire-4.20.9.noarch.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=41b4c286833f16f1392e5f324b27db8c
diff --git a/metadata/md5-cache/net-p2p/mktorrent-1.0-r1 b/metadata/md5-cache/net-p2p/mktorrent-1.0-r1
new file mode 100644
index 000000000000..104b2b536e3d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/mktorrent-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=ssl? ( dev-libs/openssl:0 )
+DESCRIPTION=Simple command line utility to create BitTorrent metainfo files
+EAPI=5
+HOMEPAGE=http://mktorrent.sourceforge.net
+IUSE=threads +ssl debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=025b6a02511696ac689e740c8777e433
diff --git a/metadata/md5-cache/net-p2p/myster-8.0-r1 b/metadata/md5-cache/net-p2p/myster-8.0-r1
index 0fa552a350cc..4fe6c5532bb7 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/myster/Myster_PR8_Generic.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5a62dab37941..1f33666c1925 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1ac577cf1f4d..447776018f46 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 6822bb55a604..f7b0aff6ff39 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 c944887b539c..70907091c45e 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7e015dba1acc..a6f892357f74 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8522cd38a7fe8c6a9888bde3b51d27ed
diff --git a/metadata/md5-cache/net-print/cups-1.7.5 b/metadata/md5-cache/net-print/cups-1.7.5
index 7514ff5245e2..91801b9d3dac 100644
--- a/metadata/md5-cache/net-print/cups-1.7.5
+++ b/metadata/md5-cache/net-print/cups-1.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.7.5/cups-1.7.5-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61380ce4132aeb29cb889bdde43f4d00
diff --git a/metadata/md5-cache/net-print/cups-1.7.5-r2 b/metadata/md5-cache/net-print/cups-1.7.5-r2
index 5499a6d015d5..9376e32cda9e 100644
--- a/metadata/md5-cache/net-print/cups-1.7.5-r2
+++ b/metadata/md5-cache/net-print/cups-1.7.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.7.5/cups-1.7.5-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ffbb47b5ecd0c7f8fb176ee14c88a79
diff --git a/metadata/md5-cache/net-print/cups-1.7.9999 b/metadata/md5-cache/net-print/cups-1.7.9999
index 8399cc3149a7..1011d70db314 100644
--- a/metadata/md5-cache/net-print/cups-1.7.9999
+++ b/metadata/md5-cache/net-print/cups-1.7.9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f9e01132f3436ef43fe4b1e6ec5fb7fd
diff --git a/metadata/md5-cache/net-print/cups-2.0.0-r2 b/metadata/md5-cache/net-print/cups-2.0.0-r2
index bd9b80e290bd..973ce4c298ff 100644
--- a/metadata/md5-cache/net-print/cups-2.0.0-r2
+++ b/metadata/md5-cache/net-print/cups-2.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.0/cups-2.0.0-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c09b1c8d0d823cdc2e8f64929e94af18
diff --git a/metadata/md5-cache/net-print/cups-2.0.1-r1 b/metadata/md5-cache/net-print/cups-2.0.1-r1
index a893a97264c9..461bed754367 100644
--- a/metadata/md5-cache/net-print/cups-2.0.1-r1
+++ b/metadata/md5-cache/net-print/cups-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.1/cups-2.0.1-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c88db9940c786ce3fb832c2a0fb3e317
diff --git a/metadata/md5-cache/net-print/cups-2.0.2 b/metadata/md5-cache/net-print/cups-2.0.2
index 3ba876066fac..cf2d9221fcfd 100644
--- a/metadata/md5-cache/net-print/cups-2.0.2
+++ b/metadata/md5-cache/net-print/cups-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.2/cups-2.0.2-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03d968349066aff0f3988ae2dbf2a3e2
diff --git a/metadata/md5-cache/net-print/cups-2.0.2-r1 b/metadata/md5-cache/net-print/cups-2.0.2-r1
index 1af80296409c..40137f5b54f3 100644
--- a/metadata/md5-cache/net-print/cups-2.0.2-r1
+++ b/metadata/md5-cache/net-print/cups-2.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.2/cups-2.0.2-source.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=860d33c5952f0039574062eed683d472
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 52c7bdb3319a..91b4dee9e3a7 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a73f0e51a1b4ee9d1003f71c6be844e
diff --git a/metadata/md5-cache/net-print/gmso2-0.1-r1 b/metadata/md5-cache/net-print/gmso2-0.1-r1
index a437c208b299..4ce6b8c0b8a6 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c885befb542b5c00ffde60e501ffeda3
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.0-r2 b/metadata/md5-cache/net-proxy/dante-1.4.0-r2
index 352701ead922..ff207b011f84 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.0-r2
+++ b/metadata/md5-cache/net-proxy/dante-1.4.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A free socks4,5 and msproxy implementation
 EAPI=5
 HOMEPAGE=http://www.inet.no/dante/
 IUSE=debug kerberos pam selinux static-libs tcpd upnp
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-dante )
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.0.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=3afa2e5218cf6dd16964c275a3f80458
+_md5_=5e64f24149062eb39822de142845b28b
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.1 b/metadata/md5-cache/net-proxy/dante-1.4.1
index 75de6b3363f8..5d81e699c46c 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1
@@ -10,4 +10,4 @@ RDEPEND=kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wra
 SLOT=0
 SRC_URI=ftp://ftp.inet.no/pub/socks/dante-1.4.1.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9bfaab21e694d302623f85f182eddaf5
+_md5_=68aba159bb3a98516d706a62b64f534f
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.4 b/metadata/md5-cache/net-proxy/squid-3.5.4
index df0881b7cb3a..120661a11e99 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.4
+++ b/metadata/md5-cache/net-proxy/squid-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.4.tar.xz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7e0dfe28b70f10526ff0a7a233fc3995
+_md5_=7c542fd3446c1a1a7b86146b0149c6dd
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.61-r2 b/metadata/md5-cache/net-proxy/sshuttle-0.61-r3
similarity index 94%
rename from metadata/md5-cache/net-proxy/sshuttle-0.61-r2
rename to metadata/md5-cache/net-proxy/sshuttle-0.61-r3
index 4a26b9e6c7e6..b6320c35e838 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.61-r2
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.61-r3
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/dist/sshuttle-0.61.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7a47ea9697f44dcda2d2799c8e5f9ac2
+_md5_=25341ccbeb629e90004a85e9efa28cb4
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20130212-r1 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20130212-r1
index d61b25f1ab1c..f6e943965c1f 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20130212-r1
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20130212-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) python? ( python_ta
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20130212.tar.xz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a79378749c220404e1e6ddb416282c39
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 6d4b19caa706..0bd72f1a2c32 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03ce38dac142088e50ce5419c83e068a
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index 7c137c3370f4..527b1f504307 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:= pcap? ( net-libs/libbtbb[pcap] ) virtual/libusb:1= python? ( =dev-lang/python-2* ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:= pcap? ( net-libs/libbtbb[pcap] ) specan? ( 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(-)] ) virtual/libusb:1= sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An open source wireless development platform suitable for Bluetooth experimentation
 EAPI=5
 HOMEPAGE=http://ubertooth.sourceforge.net/
-IUSE=+bluez +dfu +specan +pcap +python +ubertooth1-firmware +udev
+IUSE=+bluez +specan +pcap +ubertooth1-firmware +udev python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:= pcap? ( net-libs/libbtbb[pcap] ) virtual/libusb:1= specan? ( >=dev-qt/qtgui-4.7.2:4 >=dev-python/pyside-1.0.2 >=dev-python/numpy-1.3 >=dev-python/pyusb-1.0.0_alpha1 ) dfu? ( >=dev-python/pyusb-1.0.0_alpha1 ) udev? ( virtual/udev ) python? ( =dev-lang/python-2* )
-REQUIRED_USE=dfu? ( python ) specan? ( python ) ubertooth1-firmware? ( dfu ) python? ( || ( dfu specan ) )
+RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:= pcap? ( net-libs/libbtbb[pcap] ) specan? ( 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(-)] ) virtual/libusb:1= specan? ( >=dev-qt/qtgui-4.7.2:4 >=dev-python/pyside-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) udev? ( virtual/udev )
+REQUIRED_USE=specan? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=8b9a2fbcfea22f9e5a855dcf6e2ad1a0
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	git-r3	3a2bd0ae504c33a50061885480f3def3	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=f11f613509a581a11d8ed9ad432ea7e1
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.3.1 b/metadata/md5-cache/sci-astronomy/cpl-6.3.1
index d81516eb4e0d..0b1a00735d5f 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.3.1
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.310 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.3.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=081d66445a57b1e7e55bf428de34454a
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4 b/metadata/md5-cache/sci-astronomy/cpl-6.4
index 21ae3500fbb7..ed43463c01bb 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.310 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a890448602b647cb4900693154a04292
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4.1 b/metadata/md5-cache/sci-astronomy/cpl-6.4.1
index 23dccc3d9abf..0c13267c9ce1 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4.1
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-astronomy/wcslib:0= >=sci-libs/cfitsio-3.310:0= sci-libs/fftw:3.0= gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc66c49c6ba173c1dcb7b8ecb2a85101
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4.2 b/metadata/md5-cache/sci-astronomy/cpl-6.4.2
index 435c699c5f4e..6b3b85043097 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4.2
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-astronomy/wcslib:0= >=sci-libs/cfitsio-3.310:0= sci-libs/fftw:3.0= gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=847bd04d25ef4f6a4edc4b6fa1eff352
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 19e1d5a44519..7decd4cef877 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 fdf179d91fec..73eb386b57c5 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50b32654e32e1a300494d6579a05316e
diff --git a/metadata/md5-cache/sci-biology/amap-2.2-r2 b/metadata/md5-cache/sci-biology/amap-2.2-r2
index 8fcfe91fb5c0..374ae37efb4a 100644
--- a/metadata/md5-cache/sci-biology/amap-2.2-r2
+++ b/metadata/md5-cache/sci-biology/amap-2.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://baboon.math.berkeley.edu/amap/download/amap.2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b942854b29f446c0db112ef3513d135e
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 a23fc9d0c997..0aae50aa3624 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 78323ec205a0..d2d5dd777fd1 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1d5b80c95b31..a9c5b4794e5a 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e169b3e0583d376a2e88e7c39a6f26a1
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1 b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
index 5f33d684ec99..ef56b48f8876 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
+++ b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/libxml[ruby_targets_ruby19] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.bioruby.org/archive/bioruby-1.4.3.0001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f6dd278d513494c698deb1bd4e57509
diff --git a/metadata/md5-cache/sci-biology/bioruby-9999 b/metadata/md5-cache/sci-biology/bioruby-9999
index 8580c157156d..ddef060d1414 100644
--- a/metadata/md5-cache/sci-biology/bioruby-9999
+++ b/metadata/md5-cache/sci-biology/bioruby-9999
@@ -8,5 +8,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/libxml[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/libxml[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afac6236c32138db3d39ccad6667b245
diff --git a/metadata/md5-cache/sci-biology/gatk-2.4 b/metadata/md5-cache/sci-biology/gatk-2.4
index 0f8b95961e3e..b18a16d389b0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 894e87c66fdb..5438077374eb 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bb6ca46732c9..1fe5a1b5be0c 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7bd8e4a1c9c3..b5e99368b642 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=54ba893de1536071160ba9dfd3b56093
diff --git a/metadata/md5-cache/sci-biology/mauve-9999 b/metadata/md5-cache/sci-biology/mauve-9999
index 24c1b714222a..b39f32f431d2 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d52e92661809..bfa93ee69956 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3e51bcb1b798..1c754a1f2ad8 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69dc5eae2146414a5b5ddc10e523f7b9
diff --git a/metadata/md5-cache/sci-biology/readseq-20100513 b/metadata/md5-cache/sci-biology/readseq-20100513
index 3d994fb98493..2db250fbec0f 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7565566ee1bb..eaf542e82306 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _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 f17299d06dbc..7d2f0f0ff72d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=70727c3feff21d8f907f0c9f1461cddd
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2 b/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
index 9ccf8866367e..bfe4d87fb9fe 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
+++ b/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 sci-chemistry/pymol[python_targets_python2_7(-)?,-pyth
 RESTRICT=fetch
 SLOT=0
 SRC_URI=Caver2_1_2_pymol_plugin.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=adc5e358ce367571694a2ada5dc34648
diff --git a/metadata/md5-cache/sci-chemistry/tinker-5.1.09 b/metadata/md5-cache/sci-chemistry/tinker-5.1.09
index 5b83c28d4833..44298cde4434 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-5.1.09
+++ b/metadata/md5-cache/sci-chemistry/tinker-5.1.09
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/maloc !dev-util/diffuse >=virtual/jre-1.6 virtual/fortran java?
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-5.1.09.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=46d7b7ec9167da3cc94e9645af5ea7f3
diff --git a/metadata/md5-cache/sci-chemistry/tinker-6 b/metadata/md5-cache/sci-chemistry/tinker-6
index f9ab3bca816c..fcefecd00429 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-6
+++ b/metadata/md5-cache/sci-chemistry/tinker-6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !dev-util/diffu
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b6da5f79d88ed2bd54a7c5a0c73204a6
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index ebcf02e8c2b3..6f75c0fc2395 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.09.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d0d95c3e18ee..9db3bc9ca372 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.10.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0004ef0d23e7..813d1e97059f 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.11.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 724bb7cc5a64..c9b391414e36 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.00.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 3cbad64aa0fb..711951523ea3 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.02.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 65b93dfb9235..447accf593ab 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b29f58cdcc68af21c220a7e65846ab0a
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.22.9 b/metadata/md5-cache/sci-electronics/klayout-0.22.9
index 1d6f861a9f9b..fe3e8b00c84a 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.22.9
+++ b/metadata/md5-cache/sci-electronics/klayout-0.22.9
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:4[qt3support] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://178.77.72.242/downloads/klayout-0.22.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e893a77a8f127217f1f1c5a4d8c53b8
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.23.10 b/metadata/md5-cache/sci-electronics/klayout-0.23.10
index 498a61b0fd49..2ef431fbc3e3 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.23.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.23.10
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:4[qt3support] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://178.77.72.242/downloads/klayout-0.23.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ec4594f75678b1eb96b819854e375d2
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.0.3 b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
index 828893726079..31fbc3d81eb9 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=>=virtual/jre-1.5 >=dev-java/rxtx-2.2_pre2 dev-java/swing-layout:1 dev-java/jcalendar:1.2 dev-java/jcharts >=dev-java/java-config-2.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c22d0243b21d1037c7ae1ff4352c3036
diff --git a/metadata/md5-cache/sci-geosciences/josm-5485 b/metadata/md5-cache/sci-geosciences/josm-5485
index e5b8acd3a9f9..69c024c44d3e 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51447e7bda9db5e2b966d3deaa33c81b
diff --git a/metadata/md5-cache/sci-geosciences/josm-5608 b/metadata/md5-cache/sci-geosciences/josm-5608
index 60b883809fab..3c27982cffed 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1c5e4b558ee60efd99b330287e61b8a2
diff --git a/metadata/md5-cache/sci-geosciences/josm-6060 b/metadata/md5-cache/sci-geosciences/josm-6060
index 47f52e159a18..0571c30062b6 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3be0bf0b99dd76b07c5fd91456a071b8
diff --git a/metadata/md5-cache/sci-geosciences/josm-7347 b/metadata/md5-cache/sci-geosciences/josm-7347
index 774f60d03170..83ff0de281f0 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.1.9-r1
 SLOT=0
 SRC_URI=mirror://gentoo/josm-7347.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc16f53ff546c8747e18743fd32ae2f4
diff --git a/metadata/md5-cache/sci-geosciences/josm-9999 b/metadata/md5-cache/sci-geosciences/josm-9999
index 2f1cb9263a29..3f688366c2b1 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.1.9-r1
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d2a5fb0898a8ed9b5de3df6b2986b66
diff --git a/metadata/md5-cache/sci-geosciences/mkgmap-1995 b/metadata/md5-cache/sci-geosciences/mkgmap-1995
index bcfb54a05969..dfe09bd78652 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8bede0e0140bdfc050b054133792af71
diff --git a/metadata/md5-cache/sci-geosciences/osmosis-0.35.1 b/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
index a44118d14b66..c916602c46bb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f04c90fd8e32538755528b4115379f89
diff --git a/metadata/md5-cache/sci-libs/cdf-3.4.1 b/metadata/md5-cache/sci-libs/cdf-3.4.1
index 5be944deb940..6cfd48317174 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.4.1
+++ b/metadata/md5-cache/sci-libs/cdf-3.4.1
@@ -9,5 +9,5 @@ LICENSE=CDF
 RDEPEND=java? ( >=virtual/jre-1.5 ) ncurses? ( sys-libs/ncurses ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_1-dist-cdf.tar.gz java? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_1-dist-java.tar.gz ) doc? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34crm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34frm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34ifd.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34prm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34ug.pdf java? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34jrm.pdf ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a85f3d15c27775172322b429c6bd5753
diff --git a/metadata/md5-cache/sci-libs/cdf-3.5.0.2 b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
index d835f215d1b2..dfbc9c842659 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.5.0.2
+++ b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
@@ -9,5 +9,5 @@ LICENSE=CDF
 RDEPEND=java? ( >=virtual/jre-1.5 ) ncurses? ( sys-libs/ncurses ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-cdf.tar.gz java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-java.tar.gz ) doc? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350crm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350frm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf35ifd.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350prm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350ug.pdf java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350jrm.pdf ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=70fd8b2cc59c4b1a3272e78dad32d97a
diff --git a/metadata/md5-cache/sci-libs/gdal-1.10.0-r1 b/metadata/md5-cache/sci-libs/gdal-1.10.0-r1
index c262308efb83..c5d48c8ce34c 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.10.0-r1
+++ b/metadata/md5-cache/sci-libs/gdal-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat media-libs/tiff:0= sci-libs/libgeotiff || ( <sys-libs/zli
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=740f8585e16555c6f4d862028ddfc465
diff --git a/metadata/md5-cache/sci-libs/gdal-1.10.1 b/metadata/md5-cache/sci-libs/gdal-1.10.1
index 7eb2ff70081a..fb330473753b 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.10.1
+++ b/metadata/md5-cache/sci-libs/gdal-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=deb0fa84882fff31ee86e9127486be6d
diff --git a/metadata/md5-cache/sci-libs/gdal-1.11.1-r1 b/metadata/md5-cache/sci-libs/gdal-1.11.1-r1
index a5046e84131c..dd6ae996e1f1 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.11.1-r1
+++ b/metadata/md5-cache/sci-libs/gdal-1.11.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87dee8b604d93c830ae2bc5fcb08aaa9
diff --git a/metadata/md5-cache/sci-libs/gdal-1.11.1-r2 b/metadata/md5-cache/sci-libs/gdal-1.11.1-r2
index d04a4b8ac438..e9ca9066dc86 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.11.1-r2
+++ b/metadata/md5-cache/sci-libs/gdal-1.11.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e77349cb43cd4108f20544cafb6d1d5
diff --git a/metadata/md5-cache/sci-libs/gdal-1.11.1-r3 b/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
index a6800564cbb2..7354bc4f4a26 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
+++ b/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e653dc5b5dda3696742b9acd9e9377c8
diff --git a/metadata/md5-cache/sci-libs/gdal-1.9.2 b/metadata/md5-cache/sci-libs/gdal-1.9.2
index 5ed057502dba..bcfecb2f06b8 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.9.2
+++ b/metadata/md5-cache/sci-libs/gdal-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat media-libs/tiff:0= sci-libs/libgeotiff || ( <sys-libs/zli
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.9.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	7a1c6bac46bba968758a2f7666af645b	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd52f1f52720be6649b7960e5019861b
diff --git a/metadata/md5-cache/sci-libs/jmol-acme-1.0 b/metadata/md5-cache/sci-libs/jmol-acme-1.0
index 1e3ad9eca96b..91f175241164 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af104e194669d46f851f81bcf6e6e54e
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.17 b/metadata/md5-cache/sci-libs/libsvm-3.17
index b074736b00b8..c41b4a55774b 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.17
+++ b/metadata/md5-cache/sci-libs/libsvm-3.17
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.17.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a3690c283e73b5deebe86d21a2e2fbc3
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.17-r1 b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
index 6755e26a07f6..7b2971b147e7 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.17-r1
+++ b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.17.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f295f949e470f7ea423d138ed099287
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index 04fec1cb6eb3..51c3793ef724 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=37a9da1cd8746b3e7d619e7e7140debd
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.5 b/metadata/md5-cache/sci-libs/opencascade-6.5
index f18d3fde9590..9429eb03dab8 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.5
+++ b/metadata/md5-cache/sci-libs/opencascade-6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/ti
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.5_release/OpenCASCADE650.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7157682095102438389d82257389059
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.5.5 b/metadata/md5-cache/sci-libs/opencascade-6.5.5
index a6697ea5b44b..a50641a641e3 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.5.5
+++ b/metadata/md5-cache/sci-libs/opencascade-6.5.5
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.5.5
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.5.5_release/OpenCASCADE655.tgz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf4fb61ff2002d735f7167cf14f98a9a
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.6.0 b/metadata/md5-cache/sci-libs/opencascade-6.6.0
index 5554b8ba7f44..aa2311530de7 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.6.0
+++ b/metadata/md5-cache/sci-libs/opencascade-6.6.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.6.0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d818faa0393138f777e6ed3c29af751c
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.7.0 b/metadata/md5-cache/sci-libs/opencascade-6.7.0
index bb3fdbc01cb5..1456b23f0148 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.7.0
+++ b/metadata/md5-cache/sci-libs/opencascade-6.7.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.7.0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.7.0_release/opencascade-6.7.0.tgz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2245ab89681c6750c7cb989ad2c5643
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.7.1 b/metadata/md5-cache/sci-libs/opencascade-6.7.1
index b99f8c1650dd..c22654b2a40c 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.7.1
+++ b/metadata/md5-cache/sci-libs/opencascade-6.7.1
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.7.1
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.7.1_release/opencascade-6.7.1.tgz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a89d415d6152129a3cd96b156a569f4
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.8.0 b/metadata/md5-cache/sci-libs/opencascade-6.8.0
index 9d89d37a1f54..0370597b4175 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.8.0
+++ b/metadata/md5-cache/sci-libs/opencascade-6.8.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.8.0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.8.0_release/opencascade-6.8.0.tgz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d4d07e06247d451363219f37fb1dc0a
diff --git a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
index 727d91ebc774..65750ea33ec8 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.10.0.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=1136521e6229d89c45f03b71b3f02276
diff --git a/metadata/md5-cache/sci-libs/plplot-5.11.0 b/metadata/md5-cache/sci-libs/plplot-5.11.0
index f67f444103c6..b6583f2d5f36 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.11.0
+++ b/metadata/md5-cache/sci-libs/plplot-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.11.0.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
 _md5_=7e92a14cf709d033d63afbb215d83e43
diff --git a/metadata/md5-cache/sci-libs/proj-4.8.0 b/metadata/md5-cache/sci-libs/proj-4.8.0
index 158852c0b8e3..22cc1c46ce61 100644
--- a/metadata/md5-cache/sci-libs/proj-4.8.0
+++ b/metadata/md5-cache/sci-libs/proj-4.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://ftp.remotesensing.org/pub/proj/proj-4.8.0.tar.gz http://download.osgeo.org/proj/proj-datumgrid-1.5.zip http://trac.osgeo.org/proj/export/2190/tags/4.8.0/proj/src/org_proj4_PJ.h -> proj-4.8.0-org_proj4_PJ.h
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aab66876e2e8acd1aaa34c8c2b7f261a
diff --git a/metadata/md5-cache/sci-libs/shogun-1.1.0 b/metadata/md5-cache/sci-libs/shogun-1.1.0
index b1b68c33cc28..213f1ee7752a 100644
--- a/metadata/md5-cache/sci-libs/shogun-1.1.0
+++ b/metadata/md5-cache/sci-libs/shogun-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 free-noncomm
 RDEPEND=sci-libs/gsl sys-libs/zlib arpack? ( sci-libs/arpack ) bzip2? ( app-arch/bzip2 ) glpk? ( sci-mathematics/glpk ) gzip? ( app-arch/gzip ) hdf5? ( sci-libs/hdf5 ) java? ( >=virtual/jdk-1.5 ) json? ( dev-libs/json-c ) lapack? ( virtual/cblas virtual/lapack ) lpsolve? ( sci-mathematics/lpsolve ) lua? ( dev-lang/lua ) lzo? ( dev-libs/lzo ) mono? ( dev-lang/mono ) octave? ( sci-mathematics/octave[hdf5=] ) python? ( dev-python/numpy ) R? ( dev-lang/R ) readline? ( sys-libs/readline ) ruby? ( >=dev-ruby/narray-0.6.0.1-r2 ) snappy? ( app-arch/snappy ) superlu? ( sci-libs/superlu ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/1.1/sources/shogun-1.1.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.3.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.3.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e865762cd1bf1c24ae8b5897f5977fec
diff --git a/metadata/md5-cache/sci-libs/shogun-2.0.0 b/metadata/md5-cache/sci-libs/shogun-2.0.0
index 5bfcb7b5f250..2f85311c88bc 100644
--- a/metadata/md5-cache/sci-libs/shogun-2.0.0
+++ b/metadata/md5-cache/sci-libs/shogun-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 free-noncomm
 RDEPEND=sci-libs/gsl sys-libs/zlib arpack? ( sci-libs/arpack ) bzip2? ( app-arch/bzip2 ) eigen? ( >=dev-cpp/eigen-3 ) glpk? ( sci-mathematics/glpk ) gzip? ( app-arch/gzip ) hdf5? ( sci-libs/hdf5 ) java? ( >=virtual/jdk-1.5 ) json? ( dev-libs/json-c ) lapack? ( virtual/cblas virtual/lapack ) lpsolve? ( sci-mathematics/lpsolve ) lua? ( dev-lang/lua ) lzo? ( dev-libs/lzo ) mono? ( dev-lang/mono ) nlopt? ( sci-libs/nlopt ) octave? ( sci-mathematics/octave[hdf5=] ) python? ( dev-python/numpy ) R? ( dev-lang/R ) readline? ( sys-libs/readline ) ruby? ( >=dev-ruby/narray-0.6.0.1-r2 ) snappy? ( app-arch/snappy ) superlu? ( sci-libs/superlu ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/2.0/sources/shogun-2.0.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.4.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.4.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4cbc1b1ce867a4907709f0a12ec8d32
diff --git a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14 b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
index 1d88a8398f2a..07226b313bc4 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5df363f86767f7e7ea017044b2385440
diff --git a/metadata/md5-cache/sci-libs/vtk-6.0.0 b/metadata/md5-cache/sci-libs/vtk-6.0.0
index 2a668c9f8be1..559145fb0daa 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.0.0
+++ b/metadata/md5-cache/sci-libs/vtk-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( qt4 ) python? ( python_targets_python2_7 ) tcl? ( rendering
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.0/vtk-6.0.0.tar.gz doc? ( http://www.vtk.org/files/release/6.0/vtkDocHtml-6.0.0.tar.gz )
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3db0128d9a44dadff93c74164015df85
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0 b/metadata/md5-cache/sci-libs/vtk-6.1.0
index 7aaf03aac35a..5728dd375627 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_target
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=6d1d851fa7f99f0da0efc10a5eab31d0
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1 b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
index 75b968f22a0d..9a94650f5194 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_target
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	qmake-utils	ea709b525d28e3087eddedb2f884dbbe	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86	webapp	25b9b1696f5e698711f47d45c3d45e3e
 _md5_=b23cac6d009574678c55a5a28d0366b5
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1
index e8a0e5f067c3..efa7364af442 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2011.1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2011.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) >=app-shells/bash-3.0 >=dev-lang/polyml-5.4.1[-portable] >=dev-lang/perl-5.8.8-r2 graphbrowsing? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2011-1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fdbde655addea4ac186410d3cadd01a0
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
index 5fed91567177..5d4399faa256 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 dc5363fe93b7..505f9c04ccba 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 62f29caec15f..60bbb6b7a2d7 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a7342ba8bf90..5b99a3a896b2 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 bccca09e0a91..8a31e3c76a4a 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	b5ddb40c4095c9a1a3f6fd49d32fd922
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 b812d17a900b..41f332b4546e 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.1.9-r1 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	17a3c86e01ea263d17656e5c677a9368	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-pkg-simple	17a3c86e01ea263d17656e5c677a9368	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7162edda687d6d49ff4a52d42f4691c8
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.36.1 b/metadata/md5-cache/sci-mathematics/maxima-5.36.1
index e300115a7e65..b4ad9e42db9f 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.36.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.36.1
@@ -11,4 +11,4 @@ RDEPEND=X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.36.1.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=542b013209b73d9544492cf6fdf0d933
+_md5_=751c5ac23a10275937570094f246f430
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.1 b/metadata/md5-cache/sci-mathematics/octave-3.8.1
index 6e76f771d966..90e0574f7440 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses jit? ( <sys-devel/llvm-3.5 ) virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] x11-libs/gl2ps virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/3.8.1
 SRC_URI=mirror://gnu/octave/octave-3.8.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2956e096df226662d6dccea949363ee0
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1 b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
index b9eb53816b24..47b162f2aed5 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:5= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick:=[cxx] media-gfx/imagemagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0 ) jit? ( <sys-devel/llvm-3.5 ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/3.8.1
 SRC_URI=mirror://gnu/octave/octave-3.8.1.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05874bd21e4092e8f62db53a3323dc9c
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.2 b/metadata/md5-cache/sci-mathematics/octave-3.8.2
index 9d3151b60f13..d1ae38883669 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.2
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:5= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick:=[cxx] media-gfx/imagemagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0 ) jit? ( <sys-devel/llvm-3.5:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/3.8.2
 SRC_URI=mirror://gnu/octave/octave-3.8.2.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1007af51c4b130ce9b42174ebe528d2e
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.97.336 b/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
index 0866d37b0005..59ccc48c483e 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 d1bd5a93ae7d..8a6bc5cffe28 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 5362a0571c6b..6027046a2de3 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 7a9e1a8ea650..5ceca23ee51f 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 ce1f8e6df4ff..6ad8db4faf3f 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 1e7a3f12cb2f..efd350765dc0 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 0b017511a7e1..ae574891dec6 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 cedd6ba8dcab..ff36aeaa992f 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.1.9-r1
 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	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b13bd2acf55a3ca805187b013f3ffe69
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.2 b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
index 1bc182636eb4..4ed759cbea38 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.2
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.2.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cdd6f03266c17eade773fcc701416a84
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.3 b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
index 3c3f1d22b193..ed189ac2a342 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.3
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.3.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a26df0f26b0ef9a76239b29696dd8082
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.4 b/metadata/md5-cache/sci-mathematics/yacas-1.3.4
index adde1002c11e..0132035e3689 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.4
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/1
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.4.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d8d635528b463d4d5ca2abd09b35ae9
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 1bb97c14b26f..8c5ef04b9fff 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 e69c1bdf6446..08fbaff3a7fb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 00f1fbc747f6..6e5f109895d0 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 35965f77101d..0f80d025e5a0 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.1.9-r1 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=123fc7f497435f6f5245a6af67502aa2
diff --git a/metadata/md5-cache/sci-physics/lammps-20150430 b/metadata/md5-cache/sci-physics/lammps-20150430
new file mode 100644
index 000000000000..342123f1a017
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/lammps-20150430
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) gzip? ( app-arch/gzip ) sci-libs/voro++ python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran
+DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
+EAPI=5
+HOMEPAGE=http://lammps.sandia.gov/
+IUSE=doc examples gzip lammps-memalign mpi python static-libs python_targets_python2_7 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) gzip? ( app-arch/gzip ) sci-libs/voro++ python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 ) )
+SLOT=0
+SRC_URI=http://lammps.sandia.gov/tars/lammps-30Apr15.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=55ec167b09d601e0e034cc1c6424f7ee
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
index d4bc8395c13a..d05d52fdb84c 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.1.9-r1
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67a5c56fc80db896cd963021882eafe1
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.3.5 b/metadata/md5-cache/sys-apps/lm_sensors-3.3.5
index bea002a977f2..60f78fc73ab2 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.3.5
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
 EAPI=5
 HOMEPAGE=http://www.lm-sensors.org/
 IUSE=sensord static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/perl sensord? ( net-analyzer/rrdtool virtual/logger )
 SLOT=0
 SRC_URI=http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.5.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c60f933a7257d61c2db74f8161a704dd
+_md5_=7069ba465df2a86d75c23bae25e24e40
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 278be441fa19..5ca139ebeda8 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24c49bd9655cc547fc769e121eb77f29
diff --git a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1 b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1
index c1cf0c62091d..b9a4cc097d1f 100644
--- a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1
+++ b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=!minimal? ( >=virtual/jre-1.4 ) !minimal? ( x11-libs/libXtst x11-libs/libXi ) || ( sys-cluster/openmpi[fortran?,threads?] sys-cluster/mpich2[fortran?,threads?] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.0.6p1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6bdc57c65789e72841b6c9f0a2978c64
diff --git a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r1 b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r1
index 4d17ce17bdbc..5c43a57d5904 100644
--- a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r1
+++ b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r1
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=!minimal? ( >=virtual/jre-1.4 ) !minimal? ( x11-libs/libXtst x11-libs/libXi ) || ( sys-cluster/openmpi[fortran?,threads?] sys-cluster/mpich2[fortran?,threads?] ) fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.0.6p1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb49c0912e3b81fc8e95045dac895c90
diff --git a/metadata/md5-cache/sys-cluster/projections-6.2.1 b/metadata/md5-cache/sys-cluster/projections-6.2.1
index 3c894d93b336..b90404fae222 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbc449a9ea40f911075bc3b08dc1fcb8
diff --git a/metadata/md5-cache/sys-cluster/swift-2.3.0 b/metadata/md5-cache/sys-cluster/swift-2.3.0
index d2a8d9072bb9..71e20a5f087a 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.3.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.3.0
@@ -11,4 +11,4 @@ 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	2b8c53f6065bdee2d757472215a3088f	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=daa97914c4c8047d5e79561c04032b9a
+_md5_=2b640770e4a3d36fc06056c610fefda0
diff --git a/metadata/md5-cache/sys-devel/gettext-0.18.3.2 b/metadata/md5-cache/sys-devel/gettext-0.18.3.2
index 0134e4a349e8..68bbba1daf39 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.18.3.2
+++ b/metadata/md5-cache/sys-devel/gettext-0.18.3.2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.18.3.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b09b5cd2e4034789221924f787b71324
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.3 b/metadata/md5-cache/sys-devel/gettext-0.19.3
index 5cadb1b2bd35..d094ce353545 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.3
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f57b54cc7e862a577aa75fcdf5c09ce4
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.4 b/metadata/md5-cache/sys-devel/gettext-0.19.4
index 1fc5174797c0..3c8fc036773d 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.4
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b46ba8efb8f8f322acba97a4bd6c10f
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.13.23 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.13.23
deleted file mode 100644
index 9a0f590b6bce..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.13.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-23.13.10.0.tgz -> iwl7265-ucode-0.10.13.23.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a1d287125b6c9f7d7e5af660ac609aeb
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22
deleted file mode 100644
index ecc9494a2311..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-22.24.8.0.tgz -> iwl7265-ucode-0.8.24.22.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9063df04d8b66133ae9afdb9c0e3b8d9
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25
deleted file mode 100644
index 651c1bf3f98a..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-25.228.9.0.tgz -> iwl7265-ucode-0.9.228.25.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=02381efed83982634572ef3707f435bb
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 8842005ee025..e00542fd6f0d 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 af0f882d6d2d..1c216f6bc9da 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 4c31f6c65e8b..6dacf3ae8851 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=142a16bfaea799e2d00b6947b9d238fb
diff --git a/metadata/md5-cache/sys-fs/mac-fdisk-0.1-r6 b/metadata/md5-cache/sys-fs/mac-fdisk-0.1_p16
similarity index 65%
rename from metadata/md5-cache/sys-fs/mac-fdisk-0.1-r6
rename to metadata/md5-cache/sys-fs/mac-fdisk-0.1_p16
index 2ee118b65697..ac3d31993539 100644
--- a/metadata/md5-cache/sys-fs/mac-fdisk-0.1-r6
+++ b/metadata/md5-cache/sys-fs/mac-fdisk-0.1_p16
@@ -1,9 +1,10 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install prepare
 DESCRIPTION=Mac/PowerMac disk partitioning utility
+EAPI=5
 HOMEPAGE=ftp://ftp.mklinux.apple.com/pub/Other_Tools/
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mac-fdisk/mac-fdisk_0.1.orig.tar.gz mirror://debian/pool/main/m/mac-fdisk/mac-fdisk_0.1-13.diff.gz
+SRC_URI=mirror://debian/pool/main/m/mac-fdisk/mac-fdisk_0.1.orig.tar.gz mirror://debian/pool/main/m/mac-fdisk/mac-fdisk_0.1-16.diff.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=26fc8a8187947ba2784358d88c87e4b4
+_md5_=a73507a88c9a6d7896c573e14d4a5202
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.1 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.1
new file mode 100644
index 000000000000..62716b93bc30
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full Linux 4.0 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+EAPI=5
+HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
+IUSE=bfsonly symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-4.0.N/deblob-4.0 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-4.0.N/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-2.base.tar.xz mirror://gentoo/genpatches-4.0-2.extras.tar.xz mirror://gentoo/genpatches-4.0-2.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=11f52e0f74512afc21533eb7b50dad08
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.40 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.40-r1
similarity index 91%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.14.40
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.14.40-r1
index c0e8bcf2b913..62e892487fc9 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.40
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.40-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.40
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.40-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-44.base.tar.xz
+SLOT=3.14.40-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.40-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-44.base.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c1585a3eaab1c09018874e24b205435d
+_md5_=42bbef27276333e1da1dfc9bd3d4aa76
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.19.6 b/metadata/md5-cache/sys-kernel/hardened-sources-3.19.6-r1
similarity index 91%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.19.6
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.19.6-r1
index f0ad0d8702e6..096285428d95 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.19.6
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.19.6-r1
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.19.6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-3.19 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-check -> deblob-check-3.19 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.19.6-1.extras.tar.bz2 mirror://gentoo/genpatches-3.19-6.base.tar.xz
+SLOT=3.19.6-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-3.19 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.19.N/deblob-check -> deblob-check-3.19 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.19.6-2.extras.tar.bz2 mirror://gentoo/genpatches-3.19-6.base.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8a70c22eda353b91526c509a3ff759a1
+_md5_=25d974f3e17125b831388bdc44abaf72
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r6 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r7
similarity index 91%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r6
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r7
index 50561c6290bd..0a3cd46399b7 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r6
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68-r7
@@ -9,7 +9,7 @@ LICENSE=GPL-2 !deblob? ( freedist )
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.68-r6
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.68-7.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+SLOT=3.2.68-r7
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.68-8.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3453638c91cfa8a889e2df97c0804d13
+_md5_=e5a29dce0d8477d328bf1e40cd0d45db
diff --git a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1 b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
index 437447fee528..f57dc23bc35d 100644
--- a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
+++ b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e0e86bfe30f20899112ad190d423b41
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
index e08463f8eb8e..a480469d4efe 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9167b5257d1af312eddd5a229b79eb94
diff --git a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1 b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
index a498f2ea08a5..c772367c1627 100644
--- a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
+++ b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
@@ -8,5 +8,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.4
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.4.20.tar.gz mirror://gentoo/db-4.4.20-20060110-rpc_server-java.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.4
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1208c78f36a329e934996c0c7342d5d
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1 b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
index 40475a38d5cd..c300ff78fc6d 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29a98c5dc1ec94145caf8960c4d59d36
diff --git a/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/metadata/md5-cache/sys-libs/db-4.6.21_p4
index 41b99d1da379..b32a67f75a90 100644
--- a/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f62d123e39a77daa47d8d3ea57ad24db
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p4 b/metadata/md5-cache/sys-libs/db-4.7.25_p4
index 4ef28de682c5..a2ae228aaba2 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p4
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p4
@@ -8,5 +8,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a62ac3c8f34cec49c96d948c6c23ba15
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30 b/metadata/md5-cache/sys-libs/db-4.8.30
index cc694e83c181..e4621072e631 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30
+++ b/metadata/md5-cache/sys-libs/db-4.8.30
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e70297097ee967758b84e5cb2b881c8b
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r1 b/metadata/md5-cache/sys-libs/db-4.8.30-r1
index aa0510beaa20..1e25ccd80128 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r1
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c140074bcb97d9beac3d18e89d34b848
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r2 b/metadata/md5-cache/sys-libs/db-4.8.30-r2
index be1e4376a008..cd0c118ed6d4 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r2
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=084fd8a93b067a3a5c9027c1030f036f
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29 b/metadata/md5-cache/sys-libs/db-5.1.29
index 2db0de366550..cfbefd4409bd 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29
+++ b/metadata/md5-cache/sys-libs/db-5.1.29
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58d98c3a14cc99429f3bddbf6b00942f
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29-r1 b/metadata/md5-cache/sys-libs/db-5.1.29-r1
index f4a05d79abd2..ceda62961096 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/j
 REQUIRED_USE=test? ( tcl )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9eebe15a7847caedda640355e31a8a0c
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r1 b/metadata/md5-cache/sys-libs/db-5.3.28-r1
index c9d4ddb69796..2996f35d900c 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r1
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/j
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e9fe2fc8ee0d6c6c17a5a6424aa3db2
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index 1a964bbf79aa..a510055fac46 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ee6e8eb57438752214f0ac475c5b81a
diff --git a/metadata/md5-cache/sys-libs/db-6.0.30 b/metadata/md5-cache/sys-libs/db-6.0.30
index 5cbef5299806..64f69b102432 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.30
+++ b/metadata/md5-cache/sys-libs/db-6.0.30
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fa98212708b9bcb3eb8c3d682b9f675
diff --git a/metadata/md5-cache/sys-libs/db-6.0.30-r1 b/metadata/md5-cache/sys-libs/db-6.0.30-r1
index 1e39503e4851..c28a54729587 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.30-r1
+++ b/metadata/md5-cache/sys-libs/db-6.0.30-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=820a1e6a44ad85ccadf77839199d9bd7
diff --git a/metadata/md5-cache/sys-libs/db-6.1.19 b/metadata/md5-cache/sys-libs/db-6.1.19
index 768f97e8891f..92c938a8fba2 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.19
+++ b/metadata/md5-cache/sys-libs/db-6.1.19
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.19.tar.gz
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33461e692b13965d40e21da9e503b176
diff --git a/metadata/md5-cache/virtual/perl-podlators-2.5.3 b/metadata/md5-cache/virtual/perl-podlators-2.5.3
index 318817d96f18..6899b8104b1d 100644
--- a/metadata/md5-cache/virtual/perl-podlators-2.5.3
+++ b/metadata/md5-cache/virtual/perl-podlators-2.5.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=5
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
 RDEPEND=|| ( =dev-lang/perl-5.20* ~perl-core/podlators-2.5.3 ) !<perl-core/podlators-2.5.3 !>perl-core/podlators-2.5.3-r999
 SLOT=0
-_md5_=e4d2e38e5e07ed49822ec7ed74c0d507
+_md5_=ee4e3e23f6a862b75096baf83e6e277b
diff --git a/metadata/md5-cache/virtual/ruby-ffi-2 b/metadata/md5-cache/virtual/ruby-ffi-2
index 112c4493b92d..4cba320b3a0c 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-2
+++ b/metadata/md5-cache/virtual/ruby-ffi-2
@@ -6,5 +6,5 @@ IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3447c4746243df51fe9b4d9202a9be33
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
index 197896d5fc4a..1aba52626efb 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ b/metadata/md5-cache/virtual/ruby-ffi-3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd9787561a62c783a21e78dc470c690b
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r3 b/metadata/md5-cache/virtual/ruby-minitest-0-r3
index 1fc4bd032405..a8a532a78af6 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r3
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r3
@@ -6,5 +6,5 @@ IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_ruby20? ( || ( dev-ruby/minitest[ruby_targets_ruby20] dev-lang/ruby:2.0 ) ) ruby_targets_jruby? ( dev-ruby/minitest[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e562240a4ec1f85ba63dc76dc65306f3
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r4 b/metadata/md5-cache/virtual/ruby-minitest-0-r4
index 405680bc8a4a..b49383938c0d 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r4
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_ruby20? ( || ( dev-ruby/minitest[ruby_targets_ruby20] dev-lang/ruby:2.0 ) ) ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) ruby_targets_jruby? ( dev-ruby/minitest[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db6170b0ccae06e9f0bcb63b38fc5b4c
diff --git a/metadata/md5-cache/virtual/ruby-ssl-6 b/metadata/md5-cache/virtual/ruby-ssl-6
index 495986568a06..f76b2e5c8388 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-6
+++ b/metadata/md5-cache/virtual/ruby-ssl-6
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9[ssl] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f51ee670b18139153a4518fa16a12135
diff --git a/metadata/md5-cache/virtual/ruby-ssl-7 b/metadata/md5-cache/virtual/ruby-ssl-7
index 269c5f0ca58d..fd1320d7776e 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-7
+++ b/metadata/md5-cache/virtual/ruby-ssl-7
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9[ssl] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9c21744d9fb84100e59add9af7ea7f81
diff --git a/metadata/md5-cache/virtual/rubygems-10 b/metadata/md5-cache/virtual/rubygems-10
index 25114467b3ba..4e2fbc34922a 100644
--- a/metadata/md5-cache/virtual/rubygems-10
+++ b/metadata/md5-cache/virtual/rubygems-10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_rbx? ( dev-lang/rubinius )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_rbx )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e439c8d1a0e10a937bd3d7e9a36448b0
diff --git a/metadata/md5-cache/virtual/rubygems-9 b/metadata/md5-cache/virtual/rubygems-9
index 09c612473db7..ec88bb13a179 100644
--- a/metadata/md5-cache/virtual/rubygems-9
+++ b/metadata/md5-cache/virtual/rubygems-9
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48f965e8264326021057318aca3e8e3e
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.28-r1 b/metadata/md5-cache/www-apache/mod_jk-1.2.28-r1
index d52f74e51d6b..ec3ccc203540 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.28-r1
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.28-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/source/jk-1.2.28/tomcat-connectors-1.2.28-src.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0f2f89f1cad565d5758e0c935f2d971
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.30 b/metadata/md5-cache/www-apache/mod_jk-1.2.30
index bd9bff055044..61bf7fdd9029 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.30
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.30
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/source/jk-1.2.30/tomcat-connectors-1.2.30-src.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61268134a1beecf69190d22b07ad9b7c
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.32 b/metadata/md5-cache/www-apache/mod_jk-1.2.32
index 9f76ec8c52c3..ba8fb14b4d3e 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.32
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.32
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f7fe3159fee0572a8244e695f27d4901
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 8c6f773dffc1..2cdca90150eb 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.1.9-r1
 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8bdbc2632f8e602d6daa6555f9cff38
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.41 b/metadata/md5-cache/www-apache/passenger-4.0.41
index 3620d9892fb1..f7103938896d 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.41
+++ b/metadata/md5-cache/www-apache/passenger-4.0.41
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.1.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.41.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d63ef56008b9e9d279082e5fa8cfdf9c
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.53 b/metadata/md5-cache/www-apache/passenger-4.0.53
index 8626e28e2f31..48a8ad4c818d 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.53
+++ b/metadata/md5-cache/www-apache/passenger-4.0.53
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.53.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=184c54d0d4b9ac7afb6985a4a0da16bd
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.56 b/metadata/md5-cache/www-apache/passenger-4.0.56
index 8986dacd621e..ab50fde20be2 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.56
+++ b/metadata/md5-cache/www-apache/passenger-4.0.56
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.56.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=998f9d3c597e9277d27d00ca193bf768
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.59 b/metadata/md5-cache/www-apache/passenger-4.0.59
index 3861f66b2955..67f200df01f4 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.59
+++ b/metadata/md5-cache/www-apache/passenger-4.0.59
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.59.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b831864f00daccc608a078c5a4f42850
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.4 b/metadata/md5-cache/www-apache/passenger-5.0.4
index 70ad6e5382d7..c61db6b1be91 100644
--- a/metadata/md5-cache/www-apache/passenger-5.0.4
+++ b/metadata/md5-cache/www-apache/passenger-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.4.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9a841148f2d40f7a0bf6110ab1e6670
diff --git a/metadata/md5-cache/www-apps/jekyll-2.5.3 b/metadata/md5-cache/www-apps/jekyll-2.5.3
index 94fa0e5aa2f7..db21d786823f 100644
--- a/metadata/md5-cache/www-apps/jekyll-2.5.3
+++ b/metadata/md5-cache/www-apps/jekyll-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/classifier-reborn[ruby_targets_ruby19] d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v2.5.3.tar.gz -> jekyll-2.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b94336c885618c67eb162b37f2bbf1f1
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
index b8c3add2c275..f84b7e18b0cb 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.1.tar.gz -> jekyll-coffeescript-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8061f2092d0b344dc2af6cf4ce4e7dd5
diff --git a/metadata/md5-cache/www-apps/jekyll-gist-1.2.1 b/metadata/md5-cache/www-apps/jekyll-gist-1.2.1
index ebdbeec30eb2..eb8aa61f7fb2 100644
--- a/metadata/md5-cache/www-apps/jekyll-gist-1.2.1
+++ b/metadata/md5-cache/www-apps/jekyll-gist-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-gist/archive/v1.2.1.tar.gz -> jekyll-gist-1.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c636b220dc0d5373753adba46148b607
diff --git a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0 b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
index 133c8e960152..53c1c7eeec7c 100644
--- a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
+++ b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-paginate/archive/v1.1.0.tar.gz -> jekyll-paginate-1.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9df8014bd365ee41cccda29585905e9
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.3.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.3.0
index 194c5d78a91c..ecbac33eb407 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.3.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sass-3.2[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v1.3.0.tar.gz -> jekyll-sass-converter-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a834859150e94dbb0670b6cde16e360
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-0.8.1 b/metadata/md5-cache/www-apps/jekyll-sitemap-0.8.1
index bac177d79b03..d392e3351163 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-0.8.1
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v0.8.1.tar.gz -> jekyll-sitemap-0.8.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5930bd576585163096332e937f461bb5
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-1.2.1 b/metadata/md5-cache/www-apps/jekyll-watch-1.2.1
index b2f62d2d9609..f95257bd83e3 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-1.2.1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-2.7[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v1.2.1.tar.gz -> jekyll-watch-1.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=71adf0377c526a625e510802ef643f2b
diff --git a/metadata/md5-cache/www-apps/nanoc-3.7.5 b/metadata/md5-cache/www-apps/nanoc-3.7.5
index 5a27a168c73b..31b6d7a510c1 100644
--- a/metadata/md5-cache/www-apps/nanoc-3.7.5
+++ b/metadata/md5-cache/www-apps/nanoc-3.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !minimal? ( dev-ruby/mime-types[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-3.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2fb01dbae2147a7f7a43592d01fec96
diff --git a/metadata/md5-cache/www-apps/nanoc-3.7.5-r1 b/metadata/md5-cache/www-apps/nanoc-3.7.5-r1
index c1f062aec8f2..14c95b571197 100644
--- a/metadata/md5-cache/www-apps/nanoc-3.7.5-r1
+++ b/metadata/md5-cache/www-apps/nanoc-3.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !minimal? ( dev-ruby/mime-types[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-3.7.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09dba906502df0758fc4f09989751534
diff --git a/metadata/md5-cache/www-apps/redmine-2.4.6 b/metadata/md5-cache/www-apps/redmine-2.4.6
index 17384aff7317..ea02dfb3bf71 100644
--- a/metadata/md5-cache/www-apps/redmine-2.4.6
+++ b/metadata/md5-cache/www-apps/redmine-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] virtual/rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-2.4.6.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4196819dd18985b9c13d1b97f53c28c
diff --git a/metadata/md5-cache/www-apps/rt-4.2.9-r1 b/metadata/md5-cache/www-apps/rt-4.2.9-r1
index 5d83d4ccc9d7..df5887d25b5a 100644
--- a/metadata/md5-cache/www-apps/rt-4.2.9-r1
+++ b/metadata/md5-cache/www-apps/rt-4.2.9-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/class-returnvalue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/Class-ReturnValue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
 DESCRIPTION=RT is an enterprise-grade ticketing system
 EAPI=5
 HOMEPAGE=http://www.bestpractical.com/rt/
 IUSE=mysql +postgres fastcgi lighttpd vhosts
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/class-returnvalue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
+RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/Apache-Session-1.53 >=dev-perl/CSS-Squish-0.06 >=dev-perl/Class-Accessor-0.34 >=dev-perl/DBI-1.37 >=dev-perl/Date-Extract-0.02 >=dev-perl/DateTime-Format-Natural-0.67 >=dev-perl/dbix-searchbuilder-1.660.0 >=dev-perl/Devel-StackTrace-1.19 >=dev-perl/HTML-FormatText-WithLinks-0.14 >=dev-perl/HTML-Mason-1.43 >=dev-perl/HTML-Scrubber-0.08 >=dev-perl/HTTP-Server-Simple-0.34 >=dev-perl/HTTP-Server-Simple-Mason-0.14 >=dev-perl/MIME-tools-5.425 >=dev-perl/MailTools-1.60 >=dev-perl/Module-Versions-Report-1.05 >=dev-perl/Role-Basic-0.12 >=dev-perl/Symbol-Global-Name-0.04 >=dev-perl/Text-Quoted-2.80.0 >=dev-perl/Text-WikiFormat-0.76 >=dev-perl/Tree-Simple-1.04 >=dev-perl/XML-RSS-1.05 >=dev-perl/Class-ReturnValue-0.40 >=dev-perl/dbix-searchbuilder-1.59 >=dev-perl/locale-maketext-lexicon-0.32 >=dev-perl/Log-Dispatch-2.230.0 >=virtual/perl-CGI-4 >=virtual/perl-Digest-MD5-2.27 >=virtual/perl-File-Spec-0.8 >=virtual/perl-Getopt-Long-2.24 >=virtual/perl-Storable-2.08 >=virtual/perl-Locale-Maketext-1.06 dev-perl/CGI-Emulate-PSGI dev-perl/CGI-PSGI dev-perl/Cache-Simple-TimedExpiry dev-perl/Calendar-Simple dev-perl/Convert-Color dev-perl/Crypt-Eksblowfish dev-perl/Crypt-SSLeay dev-perl/Crypt-X509 dev-perl/DBD-SQLite dev-perl/Data-GUID dev-perl/Data-ICal dev-perl/DateManip dev-perl/Devel-GlobalDestruction dev-perl/Email-Address dev-perl/Email-Address-List dev-perl/File-ShareDir dev-perl/File-Which dev-perl/GD dev-perl/GDGraph dev-perl/GDTextUtil dev-perl/GnuPG-Interface dev-perl/GraphViz dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks-AndTables dev-perl/HTML-Mason-PSGIHandler dev-perl/HTML-Parser dev-perl/HTML-Quoted dev-perl/HTML-RewriteAttributes dev-perl/HTML-Tree dev-perl/IPC-Run3 dev-perl/JSON dev-perl/JavaScript-Minifier dev-perl/MIME-Types dev-perl/Module-Refresh dev-perl/Mozilla-CA dev-perl/Net-CIDR dev-perl/PerlIO-eol dev-perl/Plack dev-perl/Regexp-Common-net-CIDR dev-perl/Regexp-IPv6 dev-perl/String-ShellQuote dev-perl/Starlet dev-perl/TermReadKey dev-perl/Text-Password-Pronounceable dev-perl/Time-modules dev-perl/TimeDate dev-perl/UNIVERSAL-require dev-perl/libwww-perl dev-perl/locale-maketext-fuzzy dev-perl/net-server dev-perl/regexp-common dev-perl/text-autoformat dev-perl/text-template dev-perl/text-wrapper virtual/perl-File-Temp virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes virtual/perl-Digest virtual/perl-libnet fastcgi? ( dev-perl/FCGI dev-perl/FCGI-ProcManager ) !lighttpd? ( dev-perl/Apache-DBI !fastcgi? ( >=www-apache/mod_perl-2 ) ) lighttpd? ( dev-perl/FCGI ) mysql? ( >=dev-perl/DBD-mysql-2.1018 ) postgres? ( >=dev-perl/DBD-Pg-1.43 ) virtual/mta !lighttpd? ( =www-servers/apache-2* ) lighttpd? ( >=www-servers/lighttpd-1.3.13 sys-apps/openrc ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=^^ ( mysql postgres )
 RESTRICT=test
 SLOT=4.2.9-r1
 SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.2.9.tar.gz
 _eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=03eced592154129d721d0d82768252c1
+_md5_=72c609ec851bdf508d963f5a5ff54541
diff --git a/metadata/md5-cache/www-servers/axis-1.4-r1 b/metadata/md5-cache/www-servers/axis-1.4-r1
index eb943124ca49..22df65416a04 100644
--- a/metadata/md5-cache/www-servers/axis-1.4-r1
+++ b/metadata/md5-cache/www-servers/axis-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e22dd2eb6bd58e3de77a100b7fe265dd
diff --git a/metadata/md5-cache/www-servers/gorg-0.7.0 b/metadata/md5-cache/www-servers/gorg-0.7.0
index 86aad154101d..56d7af82e959 100644
--- a/metadata/md5-cache/www-servers/gorg-0.7.0
+++ b/metadata/md5-cache/www-servers/gorg-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.6.16 >=dev-libs/libxslt-1.1.12 fastcgi? ( virtual/h
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gorg/archive/v0.7.0.tar.gz -> gorg-0.7.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4274965d3654f526a565c91005d891a2
diff --git a/metadata/md5-cache/www-servers/gorg-0.7.1 b/metadata/md5-cache/www-servers/gorg-0.7.1
index 42df3468554b..793fa8218289 100644
--- a/metadata/md5-cache/www-servers/gorg-0.7.1
+++ b/metadata/md5-cache/www-servers/gorg-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.6.16 >=dev-libs/libxslt-1.1.12 fastcgi? ( virtual/h
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gorg/archive/v0.7.1.tar.gz -> gorg-0.7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=944015756a390ffa5325a42f0768ffdf
diff --git a/metadata/md5-cache/www-servers/gorg-0.7.2 b/metadata/md5-cache/www-servers/gorg-0.7.2
index 465426acab3e..b981d535c0f9 100644
--- a/metadata/md5-cache/www-servers/gorg-0.7.2
+++ b/metadata/md5-cache/www-servers/gorg-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.6.16 >=dev-libs/libxslt-1.1.12 fastcgi? ( virtual/h
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gorg/archive/v0.7.2.tar.gz -> gorg-0.7.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d21a3ff17a04d1f8a1505e21df230d6
diff --git a/metadata/md5-cache/www-servers/resin-4.0.22 b/metadata/md5-cache/www-servers/resin-4.0.22
index da67b431e5e2..260ce60474e1 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.1.9-r1 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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 69c54dc572a0..69eb8f55926e 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.1.9-r1 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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	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 a0087d5ea7d8..51d34e4aa08b 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.1.9-r1 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	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=568ecff4e881470c0dc48cd61d5d38d4
diff --git a/metadata/md5-cache/www-servers/thin-1.6.3 b/metadata/md5-cache/www-servers/thin-1.6.3
index 94580d9f01cb..fa3d0cf2ff50 100644
--- a/metadata/md5-cache/www-servers/thin-1.6.3
+++ b/metadata/md5-cache/www-servers/thin-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.3.tar.gz -> thin-1.6.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=67001ada47e207dd1c35ffd33711720f
diff --git a/metadata/md5-cache/www-servers/thin-1.6.3-r1 b/metadata/md5-cache/www-servers/thin-1.6.3-r1
index 327e5bf2e932..fa665a946449 100644
--- a/metadata/md5-cache/www-servers/thin-1.6.3-r1
+++ b/metadata/md5-cache/www-servers/thin-1.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.3.tar.gz -> thin-1.6.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0fd1b27073c567cbd3a27cb1a1d93d6
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.41 b/metadata/md5-cache/www-servers/tomcat-6.0.41
index 384da00d9085..f39c180c5acf 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.41
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.41
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.41 extra-webap
 RESTRICT=test
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.41/src/apache-tomcat-6.0.41-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3dc165cf84314c86a6b31d2f700db0fc
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.43 b/metadata/md5-cache/www-servers/tomcat-6.0.43
index 0e31adcd88d9..f21a48537173 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.43
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.43
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:3.7 ~dev-java/tomcat-servlet-api-6.0.43 extra-webap
 RESTRICT=test
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.43/src/apache-tomcat-6.0.43-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a6fc410b0b729d0c5b0f45f91b5addf
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.56 b/metadata/md5-cache/www-servers/tomcat-7.0.56
index 32fe283f329f..002de8352494 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.56
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.56
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.56 extra-webap
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.56/src/apache-tomcat-7.0.56-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66adfaea67c6434751091e1bcb82c40a
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.57 b/metadata/md5-cache/www-servers/tomcat-7.0.57
index 52c9e4d311f4..cff9831f04d9 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.57
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.57
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-7.0.57 extra-webap
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0e5b3feb9b603a41f824ba3b45f26be
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.59 b/metadata/md5-cache/www-servers/tomcat-7.0.59
index 02efafa87138..fd3cdb39c326 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	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c62950440f801b865b8f7cfc4774c646
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.18 b/metadata/md5-cache/www-servers/tomcat-8.0.18
index f9eb4908a350..d7b02964393b 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.18
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.18
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.18 extra-webap
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.18/src/apache-tomcat-8.0.18-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=71a0f99df1fad24d8cf753434f752c69
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.20 b/metadata/md5-cache/www-servers/tomcat-8.0.20
index 7e822bc05ec7..66685c134176 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.20
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.20
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.20 extra-webap
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.20/src/apache-tomcat-8.0.20-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ffe40045abbf75cad804bb487c6c2545
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.21 b/metadata/md5-cache/www-servers/tomcat-8.0.21
index fca34894d973..afff27d95acb 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.21
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.21
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 ~dev-java/tomcat-servlet-api-8.0.21 extra-webap
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.21/src/apache-tomcat-8.0.21-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	d562d1b6cbce43112feccc8b7632f1bf	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba5da41c6ee2a477d32b325c111f504b
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.10-r1 b/metadata/md5-cache/www-servers/uwsgi-1.4.10-r1
index 45781e4513c8..769b1c48eecc 100644
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.10-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.10-r1
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/
 REQUIRED_USE=|| ( cgi erlang lua perl php python ruby ) php? ( || ( php_targets_php5-4 php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.10.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python	3a270b7b1d1e679847ff0faeac25c5a3	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python	3a270b7b1d1e679847ff0faeac25c5a3	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fffa67ae78c7856cde74651bf8aecc0
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.10 b/metadata/md5-cache/www-servers/uwsgi-2.0.10
index d246e906c56a..6936ff864ecb 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.10
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.10
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl lua php python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_router_xmldir? ( xml ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.10.tar.gz -> uwsgi-2.0.10.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d4bfee99dfb051fd7ce90545d9ace69
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.9 b/metadata/md5-cache/www-servers/uwsgi-2.0.9
index 30ccb62b351d..b7c88d8f258d 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.9
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl lua php python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_router_xmldir? ( xml ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.9.tar.gz -> uwsgi-2.0.9.tar.gz
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	java-utils-2	4241a8d9ed765c83041b38ac128505cd	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	php-ext-source-r2	3cb75f17fa8e54d144e2834021e1df5c	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db40e3562276b53f490905a1c3f2d219
diff --git a/metadata/md5-cache/x11-misc/grub2-theme-preview-1.1 b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.1
new file mode 100644
index 000000000000..f7c79cf4a942
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/grub2-theme-preview-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Preview a GRUB 2.x theme using KVM/QEMU
+EAPI=5
+HOMEPAGE=https://github.com/hartwork/grub2-theme-preview
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-emulation/qemu dev-libs/libisoburn sys-boot/grub:2 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/hartwork/grub2-theme-preview/archive/1.1.tar.gz -> grub2-theme-preview-1.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=1fdbc0c4519d34c365bc3d41c42e9371
diff --git a/metadata/md5-cache/x11-misc/lxmed-20110717 b/metadata/md5-cache/x11-misc/lxmed-20110717
index 1cfdc6c93b44..5efc9d89567b 100644
--- a/metadata/md5-cache/x11-misc/lxmed-20110717
+++ b/metadata/md5-cache/x11-misc/lxmed-20110717
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gksu
 SLOT=0
 SRC_URI=mirror://sourceforge/lxmed/lxmed-20110717.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=83a65ee8907c8f363aa7ea1fcd47c53f
diff --git a/metadata/md5-cache/x11-misc/lxmed-20120515 b/metadata/md5-cache/x11-misc/lxmed-20120515
index 2b657f2c8050..aa0b9caf932e 100644
--- a/metadata/md5-cache/x11-misc/lxmed-20120515
+++ b/metadata/md5-cache/x11-misc/lxmed-20120515
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gksu
 SLOT=0
 SRC_URI=mirror://sourceforge/lxmed/lxmed-20120515.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=857206172f32a2c5d73bd133dc8f355d
diff --git a/metadata/md5-cache/x11-wm/subtle-0.10.3008 b/metadata/md5-cache/x11-wm/subtle-0.10.3008
index d084f7829c5b..23b9af76a636 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.10.3008
+++ b/metadata/md5-cache/x11-wm/subtle-0.10.3008
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXineram
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://subforge.org/attachments/download/75/subtle-0.10.3008-nu.tbz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b528307ac114325b9732a3a030c4f703
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3224 b/metadata/md5-cache/x11-wm/subtle-0.11.3224
index 7220527a49ea..d81edc2ecec9 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3224
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3224
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXineram
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=http://subforge.org/attachments/download/81/subtle-0.11.3224-xi.tbz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c72fa16486872e7301fe21ffe375b75
diff --git a/metadata/md5-cache/x11-wm/subtle-9999 b/metadata/md5-cache/x11-wm/subtle-9999
index 1801cade0a2b..7f609d65415f 100644
--- a/metadata/md5-cache/x11-wm/subtle-9999
+++ b/metadata/md5-cache/x11-wm/subtle-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby19? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8f4127eaee79040ecb5e8d8a528d7084	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	4241a8d9ed765c83041b38ac128505cd	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e7fdf6b7ac35fa396455e8d84c892c5
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 304b809b231a..94a1abc19465 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 02 May 2015 06:37:01 +0000
+Sun, 03 May 2015 19:36:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 063eac15b75c..e8713ec461aa 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat May  2 06:36:57 UTC 2015
+Sun May  3 19:36:49 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 52e46d8113ce..ce3c03a7165b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 02 May 2015 07:00:01 +0000
+Sun, 03 May 2015 20:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c7a0e8339792..cd21beefc1d5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1430548501 Sat 02 May 2015 06:35:01 AM UTC
+1430681701 Sun 03 May 2015 07:35:01 PM UTC
diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
index 010ef0c480e0..49a4eed338c7 100644
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -68,12 +68,14 @@ stop() {
 }
 
 reload() {
-    ebegin "Checking icinga2 configuration"
-    "$DAEMON" daemon --validate >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        eerror "Icinga2 detected configuration errors, run '$DAEMON daemon --validate' for details"
-        return 1
-    fi
+    checkconfig || return 1
+
     ebegin "Reloading icinga2"
     start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error reloading icinga2."
+    fi
+    eend $retval
 }
diff --git a/net-analyzer/vnstat/vnstat-1.13.ebuild b/net-analyzer/vnstat/vnstat-1.13.ebuild
index 46eff954aa5b..39cbbb2456ba 100644
--- a/net-analyzer/vnstat/vnstat-1.13.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.13.ebuild,v 1.1 2015/01/20 16:51:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.13.ebuild,v 1.2 2015/05/02 09:26:13 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs user
@@ -11,7 +11,7 @@ SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="gd selinux test"
 
 COMMON_DEPEND="
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
index d6e9e69aec0d..5c95fa77033d 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-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-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.6 2015/04/18 15:54:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild,v 1.7 2015/05/02 09:27:48 jer Exp $
 
 EAPI=5
 inherit eutils pam
@@ -11,7 +11,7 @@ SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE="nls pam php"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index c955900010be..3e30da675c12 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,3 +1,6 @@
 DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
 DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
 DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
+DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858afc62cffa3c48cf69021eccc198d3e764f9 SHA512 bcf48ae1e4f12a758adf3f64b60738cce6853501d66dce594df75d28687e939b2f369b485e27fbe116bd14816277c39ebe213f65f20c9ca6ab76946742ee18f8 WHIRLPOOL 6d8f5a2e602d4388dfca8634b7f5a8545bb39e5859b012700e0a361b4d7151eb8a6493e7a18f408a1ab54f083dfc4b0e8ca310c7772f5144dd0083af5b7488af
+DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522
+DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild
new file mode 100644
index 000000000000..b7ab692485a7
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.11.1.ebuild,v 1.1 2015/05/03 14:34:58 bircoph Exp $
+
+EAPI="5"
+
+inherit autotools eutils linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20150503"
+
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	http://dev.gentoo.org/~bircoph/patches/${MY_PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is ge 4 1 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: <4.1"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# do not tamper with CFLAGS for the kernel module
+	EPATCH_EXCLUDE="040_all_flags.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	epatch_user
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	local myconf=""
+	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+		myconf="--enable-linux-d_splice_alias-extra-iput"
+	fi
+
+	ARCH="$(tc-arch-kernel)" \
+	econf \
+		--with-linux-kernel-headers=${KV_DIR} \
+		--with-linux-kernel-build=${KV_OUT_DIR} \
+		${myconf}
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postrm
+}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index c955900010be..3e30da675c12 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,3 +1,6 @@
 DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
 DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
 DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
+DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858afc62cffa3c48cf69021eccc198d3e764f9 SHA512 bcf48ae1e4f12a758adf3f64b60738cce6853501d66dce594df75d28687e939b2f369b485e27fbe116bd14816277c39ebe213f65f20c9ca6ab76946742ee18f8 WHIRLPOOL 6d8f5a2e602d4388dfca8634b7f5a8545bb39e5859b012700e0a361b4d7151eb8a6493e7a18f408a1ab54f083dfc4b0e8ca310c7772f5144dd0083af5b7488af
+DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522
+DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf
diff --git a/net-fs/openafs/openafs-1.6.11.1.ebuild b/net-fs/openafs/openafs-1.6.11.1.ebuild
new file mode 100644
index 000000000000..37e01a946e07
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.11.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.11.1.ebuild,v 1.1 2015/05/03 14:35:52 bircoph Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20150503"
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	http://dev.gentoo.org/~bircoph/patches/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
+
+IUSE="doc kerberos +modules pam"
+
+CDEPEND="
+	sys-libs/ncurses
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_EXCLUDE="050_all_job_server.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	epatch_user
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		--enable-supergroups \
+		$(use_enable pam) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5)
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
+
+	# documentation package
+	if use doc ; then
+		dodoc -r doc/{arch,examples,protocol,txt}
+		dohtml -r doc/xml/*
+	fi
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+
+	# used directories: client
+	keepdir /etc/openafs
+	keepdir /var/cache/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+}
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 73a6239283dd..5154d3e1a14b 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1 +1 @@
-DIST gftp-2.0.19.tar.bz2 1687167 RMD160 74c272b8cb2dfa6561bb9e0dc9ef0b81d079dc07 SHA1 a5516403edf199e31194806478d4d8ac00daf828 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
+DIST gftp-2.0.19.tar.bz2 1687167 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172 WHIRLPOOL 511572735b97d504e660cc6db2acc9898cb75bf4ef00304b9c225a2340aa4378ad1aa341a83db1c5c0ad637c4645655616effca901fc6990632c2c8a401df1b2
diff --git a/net-ftp/gftp/gftp-2.0.19-r2.ebuild b/net-ftp/gftp/gftp-2.0.19-r2.ebuild
new file mode 100644
index 000000000000..6dbce99846ad
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.19-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.19-r2.ebuild,v 1.1 2015/05/02 15:58:12 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ssl"
+
+RDEPEND="dev-libs/glib:2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline:0
+		 gtk? ( x11-libs/gtk+:2 )
+		 ssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+src_prepare() {
+	# Fix SIGSEGV for gftp_expand_path function
+	epatch "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
+}
+
+src_configure() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
+}
diff --git a/net-ftp/gftp/gftp-9999.ebuild b/net-ftp/gftp/gftp-9999.ebuild
deleted file mode 100644
index 96fb2f33566b..000000000000
--- a/net-ftp/gftp/gftp-9999.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/net-ftp/gftp/gftp-9999.ebuild,v 1.3 2012/05/03 05:37:17 jdhore Exp $
-
-EAPI="1"
-
-inherit autotools eutils subversion
-
-DESCRIPTION="Gnome based FTP Client"
-ESVN_REPO_URI="http://svn.gnome.org/svn/${PN}/trunk"
-#SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="gtk ssl"
-
-RDEPEND="dev-libs/glib:2
-		 sys-libs/ncurses
-		 sys-libs/readline
-		 gtk? ( x11-libs/gtk+:2 )
-		 ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/intltool-0.35.5
-		virtual/pkgconfig"
-
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
-
-	# remove annoying/deprecated macros
-	sed -i -e "s/^\(AC_AIX\|AC_MINIX\)//g" configure.in
-	sed -i -e "s/AM_PATH_\(GLIB\|GTK\).*/AC_DEFINE(dummy, 1, [dummy])/g" configure.in
-
-	# Switching gettext to intltool
-	sed -i "s/AM_GNU_GETTEXT/IT_PROG_INTLTOOL(0.35.5)\nGETTEXT_PACKAGE=gftp\nAC_SUBST(GETTEXT_PACKAGE)\nAM_GLIB_GNU_GETTEXT/" configure.in
-	sed -i "s:intl/Makefile::" configure.in
-	sed -i "s:intl::g" Makefile.am
-	sed -i "s:LIBINTL:INTLLIBS:g" src/{gtk,text}/Makefile.am
-
-	intltoolize --force || die "intltoolize failed"
-	AT_M4DIR="." eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable gtk gtkport) \
-		$(use_enable gtk gtk20) \
-		$(use_enable ssl) \
-		--enable-textport || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
-}
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index 0ef94364cc7f..0cb943513189 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -1 +1 @@
-DIST gproftpd-8.3.2.tar.gz 605797 RMD160 7807f1aabdb2beb957788bd50fd768a520151291 SHA1 d1e0a3ba3963e0e13674dfd188e10b6225948fd7 SHA256 6afd290ea8b68c3258f5c355144a8c6adbeb9c2c88ff85a2563916c2f1e3b468
+DIST gproftpd-8.3.2.tar.gz 605797 SHA256 6afd290ea8b68c3258f5c355144a8c6adbeb9c2c88ff85a2563916c2f1e3b468 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59 WHIRLPOOL d6929a981b5a44815daae0e4d2d4cce7e5a54e998b663f65cbcc237f215c0cf2882169d4805acdefcc0877c43dba88b4dbb0cc4d746fe8267b68cab0de200814
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
new file mode 100644
index 000000000000..76229d228346
--- /dev/null
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild,v 1.1 2015/05/02 15:34:44 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="GTK frontend to proftpd"
+HOMEPAGE="http://mange.dynup.net/linux.html"
+SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+
+IUSE="gnome ssl"
+
+# Requiring ProFTPD 1.2.9 due to security fixes
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/glib:2
+	>=x11-libs/pango-1.0
+	>=dev-libs/atk-1.0
+	>=media-libs/freetype-2.0
+	ssl? ( >=dev-libs/openssl-0.9.6f )
+	>=net-ftp/proftpd-1.2.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local modules includes myconf
+
+	#location of proftpd.conf
+	myconf="/etc/proftpd"
+
+	if use ssl; then
+		# enable mod_tls
+		modules="${modules}:mod_tls"
+		includes="${include}:/usr/kerberos/include"
+	fi
+
+	econf --sysconfdir=${myconf} \
+		--localstatedir=/var \
+		--with-modules=${modules} \
+		--with-includes=${includes}
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+#         Add the Gnome menu entry
+	if use gnome; then
+		insinto /usr/share/gnome/apps/Internet/
+		doins "${S}"/desktop/net-gproftpd.desktop
+	fi
+
+	dodoc AUTHORS ChangeLog README
+
+	rm -r "${D}/usr/share/doc/gproftpd" || die
+}
+
+pkg_postinst() {
+	elog "gproftpd looks for your proftpd.conf file in /etc/proftpd"
+	elog "run gproftpd with the option -c to specify an alternate location"
+	elog "ex: gproftpd -c /etc/proftpd.conf"
+	elog "Do NOT edit /etc/conf.d/proftpd with this program"
+}
diff --git a/net-libs/aqbanking/aqbanking-5.5.1.ebuild b/net-libs/aqbanking/aqbanking-5.5.1.ebuild
index d0c99f246fbe..3cb6175e5c4a 100644
--- a/net-libs/aqbanking/aqbanking-5.5.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-5.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-5.5.1.ebuild,v 1.1 2015/01/04 19:04:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/aqbanking/aqbanking-5.5.1.ebuild,v 1.2 2015/05/02 10:12:02 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug doc ebics examples gtk ofx"
 
 RDEPEND=">=app-misc/ktoblzcheck-1.48
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index f7ae20a6fbfb..74b94912a489 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -1,5 +1,4 @@
-DIST axTLS-1.4.8.tar.gz 1298539 SHA256 e2679c8b42a840a9df8fef03a306b65fe06b43f72b2f6ef9acc181488e145cdf SHA512 7294b03d546263dd904df7cc9c080e496562838165ffef23f336eb77e1b5f45b65fada418a59f07d2171177deafa844d70a9a92970443e607d565493678a242c WHIRLPOOL 49eece3ce09207df9fd7c3baa40f7a983a2e7aedef9967dfffee2aba5e585236e669c12cfb2a16310d8e679567e36261b42f594d97a6f65b7b23bba732d27a86
-DIST axTLS-1.4.9.tar.gz 1300593 SHA256 9bc08f4c7a6bda3079af8e3f5ceee6b2ee92af34e8efbc9acfeee6c27b1f7cc3 SHA512 006a8c08c29f22e3992df9ccd94e19d5e98a6a350cf23c53710d72d3aba9f7375bad74124e5f09864c1cf193c592013dfccff3ba86ece496e5c0b85a771acef4 WHIRLPOOL a3c3d3ffa89a72f49ba7c8c3b11b471668253f9e3e07865558634c3b4dc7cb15f4bb4e7bbee34a4b3e9602dda13b31482082c367ff4cea97b3edec2a7cb973e1
 DIST axTLS-1.5.0.tar.gz 1302393 SHA256 7ff27d1eb1ad1630e1a3431278d72857c1124edd9a15a07a79709bc77d8bb710 SHA512 526e3c408c960e7e48dd791c6cf94a3dbc62a36c0453e4705529490160cacd5ca1c663fab153a899618e78516714e3afb7a93dae075d2717eb9a91e63f3e9c04 WHIRLPOOL 5fc0e9f4d3f8994dc2909f85261aac538b9563b3dee787d8d6a0942f087041893217a0b9237d5c0824c3a64bb8272bb30d2c4fcdbd11a879107f20892c8f180f
 DIST axTLS-1.5.1.tar.gz 1305575 SHA256 860a2754c497109854889e78eb2efdf00661f3b5dbb5e130bd5d8441a2f6ea50 SHA512 4b35e151d222496f5e4ab9c849ca9b14a245590a07f07132eab2fa633dac4cf7abfe29344f643fa182c9c443a139d3230d4b3554d3ff0932410ab36ae3666d92 WHIRLPOOL c1072aa94a7916db38d26902bac175d17e4f8fe1a431956d0b366f9cd913c89c145d119c823d9c1bfa51d54aa191ca43386b4312bea3a16f61d9df4ff2eb6b68
 DIST axTLS-1.5.2.tar.gz 1309632 SHA256 c4568cdf3e326c6fee2d7d16b4e13e05a29cecf49c1774c7858fe83cde01f8bb SHA512 138c1134c949fb85335454907c8fa74f18860d16371aba7d4d46faa4fb0e9cbf41d259cf72389f439d8d6436dc200951001a53e996793ba59254f5ddefe99999 WHIRLPOOL 36b889c4aa5e3c2c0da20a189ec7342db86b757acbb5c9c8a12262d95ceabb490ac97fa608efd66757e74e6347e0f5ff5bd5c76ac453d9dbdc115c45b8e35ad4
+DIST axTLS-1.5.3.tar.gz 1309853 SHA256 367ce7918b9e7738d853d5eaaa9d4fbdb362c5b323d4c0622a72d891f6b8d8e6 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281 WHIRLPOOL 92de1a06da740adf0238550d36a75216bace6c7fb867e82d38f2ca2362dcf0e41810191933aa788ffda080367b6beb312f1a9a240ab687a6c4f324988d36a81c
diff --git a/net-libs/axtls/axtls-1.4.8.ebuild b/net-libs/axtls/axtls-1.4.8.ebuild
deleted file mode 100644
index 3c5b5ea07a42..000000000000
--- a/net-libs/axtls/axtls-1.4.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.8.ebuild,v 1.8 2012/09/23 08:09:43 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit eutils multilib savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export CC
-
-	epatch "${FILESDIR}/explicit-libdir.patch"
-
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		"${S}"/Makefile
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		"${S}"/config/Rules.mak
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' \
-		"${S}"/config/Rules.mak
-	sed -i -e 's: -g::' \
-		"${S}"/config/makefile.conf
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config "${S}"/config/.config
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		"${S}"/config/.config
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		"${S}"/config/.config
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				"${S}"/config/.config
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				"${S}"/config/.config
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' "${S}"/config/.config
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				"${S}"/config/.config
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			"${S}"/config/.config
-	fi
-
-	yes "n" | emake -j1 oldconfig > /dev/null
-}
-
-src_configure() {
-	tc-export CC
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [ -f config/.config ]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config "${S}"/config/.config
-		fi
-		yes "" | emake -j1 oldconfig > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-src_compile() {
-	default
-	if use doc; then
-		emake docs
-		mv www README
-	fi
-}
-
-src_install() {
-	if use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a
-	fi
-
-	if [ -f "${ED}"/usr/bin/htpasswd ]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc -r README
-
-	if use doc; then
-		dodoc -r docsrc/html
-	fi
-}
diff --git a/net-libs/axtls/axtls-1.4.9.ebuild b/net-libs/axtls/axtls-1.4.9.ebuild
deleted file mode 100644
index d414c961412f..000000000000
--- a/net-libs/axtls/axtls-1.4.9.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.9.ebuild,v 1.9 2013/03/03 09:29:54 vapier Exp $
-
-EAPI="4"
-
-inherit eutils multilib savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export CC
-
-	epatch "${FILESDIR}/explicit-libdir.patch"
-
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		"${S}"/Makefile
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		"${S}"/config/Rules.mak
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' \
-		"${S}"/config/Rules.mak
-	sed -i -e 's: -g::' \
-		"${S}"/config/makefile.conf
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config "${S}"/config/.config
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		"${S}"/config/.config
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		"${S}"/config/.config
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				"${S}"/config/.config
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				"${S}"/config/.config
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' "${S}"/config/.config
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				"${S}"/config/.config
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			"${S}"/config/.config
-	fi
-
-	yes "n" | emake -j1 oldconfig > /dev/null
-}
-
-src_configure() {
-	tc-export CC
-	tc-export AR
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [ -f config/.config ]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config "${S}"/config/.config
-		fi
-		yes "" | emake -j1 oldconfig > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	if use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a
-	fi
-
-	if [ -f "${ED}"/usr/bin/htpasswd ]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc -r README
-
-	if use doc; then
-		dodoc -r docsrc/html
-	fi
-}
diff --git a/net-libs/axtls/axtls-1.4.9-r1.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
similarity index 95%
rename from net-libs/axtls/axtls-1.4.9-r1.ebuild
rename to net-libs/axtls/axtls-1.5.3.ebuild
index ff000c3d8274..d7ea0380aa1f 100644
--- a/net-libs/axtls/axtls-1.4.9-r1.ebuild
+++ b/net-libs/axtls/axtls-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.9-r1.ebuild,v 1.9 2014/10/21 14:20:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.5.3.ebuild,v 1.1 2015/05/03 15:53:48 blueness Exp $
 
 EAPI="5"
 
@@ -37,11 +37,11 @@ MY_PN=${PN/tls/TLS}
 DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
 HOMEPAGE="http://axtls.sourceforge.net/"
 SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}"
+S="${WORKDIR}/${PN}-code"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
 
 IUSE="httpd cgi-lua cgi-php static static-libs doc"
 
@@ -72,6 +72,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	tc-export AR CC
+
 	epatch "${FILESDIR}/explicit-libdir-r1.patch"
 
 	#We want CONFIG_DEBUG to avoid stripping
@@ -120,8 +122,6 @@ use_flag_config() {
 }
 
 multilib_src_configure() {
-	tc-export AR CC
-
 	#Per-ABI substitutions.
 	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
 		Makefile || die
diff --git a/net-libs/axtls/files/explicit-libdir.patch b/net-libs/axtls/files/explicit-libdir.patch
deleted file mode 100644
index 9a1bc7e250dc..000000000000
--- a/net-libs/axtls/files/explicit-libdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur axTLS.orig//Makefile axTLS/Makefile
---- axTLS.orig//Makefile	2011-01-07 08:16:40.000000000 -0500
-+++ axTLS/Makefile	2012-06-17 16:55:04.000000000 -0400
-@@ -60,6 +60,8 @@
- 	$(MAKE) -C samples
- endif
- 
-+LIBDIR = $(PREFIX)/lib
-+
- $(STAGE) : ssl/version.h
- 	@mkdir -p $(STAGE)
- 
-@@ -68,7 +70,7 @@
- 	@echo "#define AXTLS_VERSION    \"(no version)\"" > ssl/version.h
- 
- $(PREFIX) :
--	@mkdir -p $(PREFIX)/lib
-+	@mkdir -p $(LIBDIR)
- 	@mkdir -p $(PREFIX)/bin
- 
- release:
-@@ -89,8 +91,8 @@
- 	$(MAKE) win32releaseconf
- 
- install: $(PREFIX) all
--	cp --no-dereference $(STAGE)/libax* $(PREFIX)/lib
--	chmod 755 $(PREFIX)/lib/libax* 
-+	cp --no-dereference $(STAGE)/libax* $(LIBDIR)
-+	chmod 755 $(LIBDIR)/libax* 
- ifdef CONFIG_SAMPLES
- 	install -m 755 $(STAGE)/ax* $(PREFIX)/bin 
- endif
-@@ -112,7 +114,7 @@
- 	install -m 644 config/config.h $(PREFIX)/include/axTLS
- 
- installclean:
--	-@rm $(PREFIX)/lib/libax* > /dev/null 2>&1
-+	-@rm $(LIBDIR)/libax* > /dev/null 2>&1
- 	-@rm $(PREFIX)/bin/ax* > /dev/null 2>&1
- 	-@rm $(PREFIX)/bin/axhttpd* > /dev/null 2>&1
- 	-@rm `perl -e 'use Config; print $$Config{installarchlib};'`/axtlsp.pm > /dev/null 2>&1
diff --git a/net-libs/courier-unicode/courier-unicode-1.1.ebuild b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
index 5d4d71116801..00e58107cd8a 100644
--- a/net-libs/courier-unicode/courier-unicode-1.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-unicode/courier-unicode-1.1.ebuild,v 1.5 2015/05/01 04:30:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-unicode/courier-unicode-1.1.ebuild,v 1.6 2015/05/03 07:15:55 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm hppa ppc64 ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6b0ec2c007d0..ada22fc65fd0 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,4 +2,5 @@ DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd5
 DIST gnutls-3.3.10.tar.xz 6173572 SHA256 e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219 SHA512 3f73af238c48322d1df59b8c27c2bcc5e03f25e632792279a1e25a3712d71108f83b6e135bf1766917e84ec9499f4419c266c2a43a8e2ccd8dd9efd6f15d85ec WHIRLPOOL 1ef664b763acaff9292f96db86f5ad441a4c49141d1d3529ea970cba67fc5714b509be1350250bb01bfd7a863e466b7f4d5590caa5236dddc680b6ca709ec93e
 DIST gnutls-3.3.12.tar.xz 6185624 SHA256 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b SHA512 71c5ed7dee6c14581f675137b587173065c896040cb023b2910a3503a0f644abedc1f43c4e90c7a47ad4482215426788e272ba4b0b81c0475c2adcd62c4301a7 WHIRLPOOL 2e405e7edd52a828d16ae858d791809905ea02f27ee518847e43c3e56c5e92876d58e210513176c9424703dd65c8834a7516826db55e0eec5039a3d63b25b26e
 DIST gnutls-3.3.14.tar.xz 6286196 SHA256 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 SHA512 68f144baaf52c156a9b597701ac1afe04de8a6a646bcd48bb28be4ef33d259d1ade55bec6984d40c0ed5944ca3f8c9ce6243a617961e1de0a94b538e38230fed WHIRLPOOL f140d47d2b7eb2678245394efbb57e47eab58acceddb710b688b407792299d3e139afbd5946bfd5e10ceebae3892516d15753ca4bef17485c46aea07c1185584
-DIST gnutls-3.4.0.tar.xz 6453932 SHA256 b422544431bfb5c4e24a605b6c793ee34792cc791c1060562ab46eaf77f3472e SHA512 ab11bb46e69a689f275cc158d8bc031bb09287a2193a2d9ccb36c04a8e106d9204754bd148c67417e6d63ed0c75750bbe7b602424bb7dcd9af2e25d9275ef02d WHIRLPOOL 5871564934d1d13ad777bc47dc6ab2f04a916470030e8b844d9f376c049072277fbf351fad4bfb42b8680a6e01ffc79ebb9459887342e92a0af11569c105c47d
+DIST gnutls-3.3.15.tar.xz 6286288 SHA256 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b SHA512 0d112f20fd1a010c278ecc5c0e9e22a040c5a765073ea722329e9d5d7b4c661c6bd2fc6749903ea562fe44caf9a1643c6d95e2e193bb8c444e2e6418f73d5445 WHIRLPOOL 4a7b28952bcbe837d4f9e9b62b9254a43510363634daa1c9dc61bf07c7734699011bf5963d4556d3f53c45f63cdf6d2447f7b101e026d0d21c94d827bff9c6dc
+DIST gnutls-3.4.1.tar.xz 6469756 SHA256 e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e SHA512 8fd386b66c9bc42f2beaec93b503f83dad9736ba25673aac34a2cc7adc1b5467ae21b859406743df9d698fcf06237bb61404a1f33a8d8ec0da536cc088bf98e0 WHIRLPOOL ae39c0a3397519b78c2c7f07a22cb912e79871c97b3b1729ef17c0bb4fad12a001644bfed9528cfc1bc98bae267bd0aa62c6c9c25e55104061281ba574e76a9f
diff --git a/net-libs/gnutls/files/gnutls-3.4.0-build.patch b/net-libs/gnutls/files/gnutls-3.4.0-build.patch
deleted file mode 100644
index 1962cc3f2432..000000000000
--- a/net-libs/gnutls/files/gnutls-3.4.0-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
-index 8e793d3..1bce3f5 100644
---- a/doc/manpages/Makefile.am
-+++ b/doc/manpages/Makefile.am
-@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
- APIMANS += gnutls_certificate_get_peers_subkey_id.3
- APIMANS += gnutls_certificate_get_trust_list.3
- APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_verify_flags.3
--APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_crt.3
- APIMANS += gnutls_certificate_get_x509_key.3
--APIMANS += gnutls_certificate_get_x509_key.3
- APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
- APIMANS += gnutls_certificate_server_set_request.3
- APIMANS += gnutls_certificate_set_dh_params.3
diff --git a/net-libs/gnutls/gnutls-3.3.15.ebuild b/net-libs/gnutls/gnutls-3.3.15.ebuild
new file mode 100644
index 000000000000..b865e19dac42
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.15.ebuild
@@ -0,0 +1,175 @@
+# 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.1 2015/05/03 19:08:41 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 doc gtk-doc-pdf) \
+		$(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
+		dodoc doc/gnutls.pdf
+		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.4.0.ebuild b/net-libs/gnutls/gnutls-3.4.1.ebuild
similarity index 96%
rename from net-libs/gnutls/gnutls-3.4.0.ebuild
rename to net-libs/gnutls/gnutls-3.4.1.ebuild
index 097c44981f2a..8738e2642de5 100644
--- a/net-libs/gnutls/gnutls-3.4.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.0.ebuild,v 1.2 2015/04/10 08:30:28 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.1.ebuild,v 1.1 2015/05/03 19:08:41 alonbl Exp $
 
 EAPI=5
 
@@ -69,8 +69,6 @@ src_prepare() {
 		rm "${file}" || die
 	done
 
-	epatch "${FILESDIR}/${P}-build.patch"
-
 	# support user patches
 	epatch_user
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 762da908f520..a2bd0b51b184 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,3 +1,4 @@
 DIST webkitgtk-2.4.8.tar.xz 9827632 SHA256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 SHA512 31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de WHIRLPOOL 851e3973c00096dd3a98e64bfa9f9f0f278c3513656af9a9aa72442cd6c594119adefafa6c06d05e431ec77bf6e9f1e10432e9b6895d777adfe2952843602ef2
 DIST webkitgtk-2.6.4.tar.xz 9996524 SHA256 beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b SHA512 242ab90ceff5b83978dd5bb8f0b8e05a7daa1fbbe87657ef0404facb17b873f3d703aed838f364bc042f2848b8cca300f1126f4d6979fed34235efa40e44d5d8 WHIRLPOOL 12f74b6e7188a92a2c5b656720e99937ac0c3f941ff83bdde5cf1cf671c61b8dc248d45a216dd1d821c684364bda0a43b38964efc3c0cb16ce2a1674963d95ee
 DIST webkitgtk-2.6.5.tar.xz 10000124 SHA256 b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593 SHA512 b8097e16ccfe10c75e43d81a965a14bde19dcefa6f1ac6ef52c075afeb4c603289c3e7cad05b02af053728df16b5681aafa248e5974319849a0967364bca1f19 WHIRLPOOL 60b0cfccefef0f90ba66f3e89819239574f06e42d2508055843addcf20292747d82d258332bb95ae2730a3c11a2acd74ca595f3f2a3cd54230013e4320a6b6d8
+DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
new file mode 100644
index 000000000000..32ff62ee41aa
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.1 2015/05/02 16:18:20 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
+# gles2 wayland X
+# bugs 372493, 416331
+REQUIRED_USE="
+	geoloc? ( introspection )
+	introspection? ( gstreamer )
+	webgl? ( opengl )
+"
+#	gles2? ( egl )
+#	webgl? ( ^^ ( gles2 opengl ) )
+#	!webgl? ( ?? ( gles2 opengl ) )
+#	|| ( wayland X )
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
+# gtk3-3.10 required for wayland
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	virtual/jpeg:0=
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	>=dev-libs/icu-3.8.1-r1:=
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=[X]
+	>=x11-libs/gtk+-3.6.0:3[X,introspection?]
+	dev-db/sqlite:3=
+	>=x11-libs/pango-1.30.0.0
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libX11
+
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+	libsecret? ( app-crypt/libsecret )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+#	gles2? ( media-libs/mesa[gles2] )
+#	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-lang/perl-5.10
+	|| (
+		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby21]
+		virtual/rubygems[ruby_targets_ruby22]
+		virtual/rubygems[ruby_targets_ruby19]
+	)
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.34
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+		check-reqs_pkg_pretend
+	fi
+
+	if ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It doesn't compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="RUBY=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		ruby_interpreter="RUBY=$(type -P ruby20)"
+	else
+		ruby_interpreter="RUBY=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm + libcxxabi
+	# $(cmake-utils_use_enable wayland WAYLAND_TARGET)
+	# $(cmake-utils_use_enable X X11_TARGET)
+	# $(cmake-utils_use_find_package gles2 OpenGLES2)
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test API_TESTS)
+		$(cmake-utils_use_enable doc GTKDOC)
+		$(cmake-utils_use_enable geoloc GEOLOCATION)
+		$(cmake-utils_use_enable gstreamer VIDEO)
+		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
+		$(cmake-utils_use_enable introspection)
+		$(cmake-utils_use_enable jit)
+		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
+		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
+		$(cmake-utils_use_enable webgl WEBGL)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DCMAKE_BUILD_TYPE=Release
+		-DENABLE_X11_TARGET=ON
+		-DPORT=GTK
+		-DENABLE_PLUGIN_PROCESS_GTK2=ON
+		${ruby_interpreter}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 6f208ef5d3a9..a1ba15db7137 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,3 @@
 DIST apt-cacher-ng_0.8.1.orig.tar.xz 506356 SHA256 fb628716079c2c5330aff3fcfc878682c42426906a8cc6376f2d77c0fecf50db SHA512 638db85b5ec69cacc8c4f6d1e86741fe00ac47deca681963fc79ead352bafce065d21fdf4d8209d279bbf688fea56cbabec4cc256ee29480c30db85616896cf2 WHIRLPOOL 141e02dc5607be3b1d51cfd6abc9cd31d29e7b230fc39bb7c1bc5acc2dc2074764fc5fed92fe7eded94230c3bcd522fdb27b2fe20d2ee9663c8911c5e8b02c58
 DIST apt-cacher-ng_0.8.2.orig.tar.xz 292512 SHA256 1ea9fa39cccf3832c12586bca2921d1a90cfb3d89a93644dd06f3cbc11c84826 SHA512 521faf31e52327e5b71d012794475b6889e21ef6569b1ce8d7a2461a81fd5f0dbb642843966f7daa6391dda6cb2794ded0fbbad0959b2a8d54f8fc434cea900a WHIRLPOOL 7b89f0c57fb04d10731721b62e7972eb10f16190e99ce55c72eeab68dbc1e0a187ce9d856335eacbd8fa8f4d3c1922a3871ccde20b4b61839063327b0952adb0
+DIST apt-cacher-ng_0.8.3.orig.tar.xz 294116 SHA256 d86a6616b56094b6888a10ff40ae374beac2bc3525ab7b9e7159c4f4dfd00c49 SHA512 dbccec0ba44af34870bdf5650ae594552a7816d1203210f9a09826c0dec6d74f24c07bd0d18ab3df6f9068f15c601e54aa0892e68f6bfca4b59ae300c4313210 WHIRLPOOL 0fee51e0834f1e18ff020c933a52c7745fd23ccb3cde50ea71a10662643ccf55710f77314c344e18b07b534c9346bb010b14229fd9cf9afc0202a53baad2e84f
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild
new file mode 100644
index 000000000000..921b63e8dde9
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.8.3.ebuild,v 1.1 2015/05/03 07:57:53 jer Exp $
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs user
+
+DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+HOMEPAGE="
+	http://www.unix-ag.uni-kl.de/~bloch/acng/
+	http://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) = 4 ]]; then
+		if [[ $(gcc-minor-version) -lt 8 ]]; then
+			die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+		fi
+	else
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
+	if use fuse; then
+		mycmakeargs="-DHAVE_FUSE_25=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_FUSE_25=no ${mycmakeargs}"
+	fi
+	if use tcpd; then
+		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+		dohtml doc/html/*
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}
diff --git a/net-misc/curl/curl-7.42.1.ebuild b/net-misc/curl/curl-7.42.1.ebuild
index 2b6299c812fa..9b7fae62d53c 100644
--- a/net-misc/curl/curl-7.42.1.ebuild
+++ b/net-misc/curl/curl-7.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.42.1.ebuild,v 1.1 2015/04/29 10:47:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.42.1.ebuild,v 1.3 2015/05/03 06:14:25 jer Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE="${IUSE} elibc_Winnt"
diff --git a/net-misc/radvd/files/radvd.service b/net-misc/radvd/files/radvd.service
index 16b6a275a3c1..d9095f625a9c 100644
--- a/net-misc/radvd/files/radvd.service
+++ b/net-misc/radvd/files/radvd.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/radvd --username radvd --logmethod stderr --debug 1
+ExecStart=/usr/sbin/radvd --username radvd --logmethod stderr --debug 0
 ExecReload=/usr/sbin/radvd --configtest ; \
            /bin/kill -HUP $MAINPID
 CPUSchedulingPolicy=idle
diff --git a/net-misc/sstp-client/sstp-client-1.0.9.ebuild b/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild
similarity index 66%
rename from net-misc/sstp-client/sstp-client-1.0.9.ebuild
rename to net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild
index aac071862c90..5af73cffcab6 100644
--- a/net-misc/sstp-client/sstp-client-1.0.9.ebuild
+++ b/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/net-misc/sstp-client/sstp-client-1.0.9.ebuild,v 1.1 2013/03/09 20:35:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sstp-client/sstp-client-1.0.9-r1.ebuild,v 1.2 2015/05/03 09:24:00 pinkbyte Exp $
 
 EAPI=5
 
-inherit eutils linux-info user
+inherit eutils linux-info multilib user
 
 DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
 HOMEPAGE="http://sstp-client.sourceforge.net/"
@@ -15,10 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static"
 
-DEPEND=">=dev-libs/libevent-2.0.10
+RDEPEND=">=dev-libs/libevent-2.0.10
 	dev-libs/openssl:0
-	net-dialup/ppp"
-RDEPEND="${DEPEND}"
+	net-dialup/ppp:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 CONFIG_CHECK="~NETFILTER_NETLINK"
 DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING )
@@ -31,13 +32,19 @@ pkg_setup() {
 src_prepare() {
 	# set proper examples dir, --docdir overriding is src_configure does not work
 	sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.in || die 'sed on Makefile.in failed'
+
+	epatch_user
 }
 
 src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
 	econf \
 		--enable-ppp-plugin \
 		--enable-group=sstpc \
 		--enable-user=sstpc \
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
 		$(use_enable static)
 }
 
@@ -45,8 +52,3 @@ src_install() {
 	default
 	prune_libtool_files --modules
 }
-
-pkg_postinst() {
-	ewarn "If sstp clients fails to work after net-dialup/ppp update,"
-	ewarn "please rebuild it before filing bugs."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.04.03.ebuild b/net-misc/youtube-dl/youtube-dl-2015.04.03.ebuild
index 1bdef71eaefc..aacc831bfaaf 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.04.03.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.04.03.ebuild
@@ -1,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/youtube-dl/youtube-dl-2015.04.03.ebuild,v 1.7 2015/05/01 15:42:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.04.03.ebuild,v 1.8 2015/05/02 09:14:51 jer Exp $
 
 EAPI=5
 
@@ -25,9 +25,6 @@ DEPEND="
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-
-	epatch_user
-
 	if ! use offensive; then
 		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
 			youtube_dl/version.py || die
@@ -53,6 +50,8 @@ src_prepare() {
 			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
 			test/test_age_restriction.py || die
 	fi
+
+	epatch_user
 }
 
 src_compile() {
diff --git a/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild
index 68a4421c6065..f24e7dcee4f1 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild,v 1.2 2015/05/01 15:42:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.04.26.ebuild,v 1.3 2015/05/02 09:14:51 jer Exp $
 
 EAPI=5
 
@@ -25,9 +25,6 @@ DEPEND="
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-
-	epatch_user
-
 	if ! use offensive; then
 		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
 			youtube_dl/version.py || die
@@ -53,6 +50,8 @@ src_prepare() {
 			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
 			test/test_age_restriction.py || die
 	fi
+
+	epatch_user
 }
 
 src_compile() {
diff --git a/net-misc/youtube-dl/youtube-dl-2015.04.28.ebuild b/net-misc/youtube-dl/youtube-dl-2015.04.28.ebuild
index f8847fb9a853..23a890bdc394 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.04.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.04.28.ebuild
@@ -1,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/youtube-dl/youtube-dl-2015.04.28.ebuild,v 1.2 2015/05/01 15:42:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.04.28.ebuild,v 1.3 2015/05/02 09:14:51 jer Exp $
 
 EAPI=5
 
@@ -25,9 +25,6 @@ DEPEND="
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-
-	epatch_user
-
 	if ! use offensive; then
 		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
 			youtube_dl/version.py || die
@@ -53,6 +50,8 @@ src_prepare() {
 			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
 			test/test_age_restriction.py || die
 	fi
+
+	epatch_user
 }
 
 src_compile() {
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index 2defc0ac2b3f..733adc34b81e 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1 +1 @@
-DIST mktorrent-1.0.tar.gz 23089 RMD160 ad8e2fb603635356b01b9d5eb30c57a6f01b0656 SHA1 f9b1bbf9d19911b6c8994dbec6208530c7d929ad SHA256 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f
+DIST mktorrent-1.0.tar.gz 23089 SHA256 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de WHIRLPOOL 2a907fe846ae5a35dbb38fbd6707a89121d34b9658f1afa682db14da9254cc58ed376fc23c834753409769643868294b0f1354fd7d9d567ec0cff49ee713b163
diff --git a/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild b/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
new file mode 100644
index 000000000000..4bd8daa1c996
--- /dev/null
+++ b/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/mktorrent-1.0-r1.ebuild,v 1.2 2015/05/02 15:39:37 dilfridge Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
+HOMEPAGE="http://mktorrent.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads +ssl debug"
+
+RDEPEND="ssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+	MAKEPARAM="USE_LONG_OPTIONS=1"
+	MAKEPARAM="${MAKEPARAM} USE_LARGE_FILES=1"
+	use debug && MAKEPARAM="${MAKEPARAM} DEBUG=1"
+	use ssl && MAKEPARAM="${MAKEPARAM} USE_OPENSSL=1"
+	use threads && MAKEPARAM="${MAKEPARAM} USE_PTHREADS=1"
+
+	emake ${MAKEPARAM}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-proxy/dante/dante-1.4.0-r2.ebuild b/net-proxy/dante/dante-1.4.0-r2.ebuild
index 63e4d36d25fe..2b186eb9fadc 100644
--- a/net-proxy/dante/dante-1.4.0-r2.ebuild
+++ b/net-proxy/dante/dante-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r2.ebuild,v 1.2 2014/11/02 09:29:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.0-r2.ebuild,v 1.4 2015/05/03 06:59:44 jer Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 CDEPEND="pam? ( virtual/pam )
@@ -35,7 +35,8 @@ src_prepare() {
 	epatch	\
 		"${FILESDIR}"/${PN}-1.4.0-socksify.patch \
 		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \
-		"${FILESDIR}"/${PN}-1.4.0-cflags.patch
+		"${FILESDIR}"/${PN}-1.4.0-cflags.patch \
+		"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
diff --git a/net-proxy/dante/dante-1.4.1.ebuild b/net-proxy/dante/dante-1.4.1.ebuild
index 8974ce46e26f..9a97b1dc8d94 100644
--- a/net-proxy/dante/dante-1.4.1.ebuild
+++ b/net-proxy/dante/dante-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.1.ebuild,v 1.2 2014/11/02 09:29:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.4.1.ebuild,v 1.3 2015/05/03 06:58:26 jer Exp $
 
 EAPI="5"
 
@@ -35,7 +35,8 @@ src_prepare() {
 	epatch	\
 		"${FILESDIR}"/${PN}-1.4.0-socksify.patch \
 		"${FILESDIR}"/${PN}-1.4.0-osdep-format-macro.patch \
-		"${FILESDIR}"/${PN}-1.4.0-cflags.patch
+		"${FILESDIR}"/${PN}-1.4.0-cflags.patch \
+		"${FILESDIR}"/${PN}-1.4.0-HAVE_SENDBUF_IOCTL.patch
 
 	sed -i \
 		-e 's:/etc/socks\.conf:"${EPREFIX}"/etc/socks/socks.conf:' \
diff --git a/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch
new file mode 100644
index 000000000000..d8e2c220ce92
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.4.0-HAVE_SENDBUF_IOCTL.patch
@@ -0,0 +1,11 @@
+--- a/libscompat.m4
++++ b/libscompat.m4
+@@ -373,7 +373,7 @@
+ 
+ 	return 0;
+ }], [AC_MSG_RESULT(yes)
+-     AC_DEFINE(HAVE_SENDBUF_IOCTL, TIOCOUTQ, [send buffer data])
++     AC_DEFINE(HAVE_SENDBUF_IOCTL, 1, [send buffer data])
+      AC_DEFINE(SENDBUF_IOCTLVAL, TIOCOUTQ, [send buffer ioctl])],
+     [AC_MSG_RESULT(no)])],
+     [dnl assume no when cross-compiling
diff --git a/net-proxy/squid/squid-3.5.4.ebuild b/net-proxy/squid/squid-3.5.4.ebuild
index 2423df86d677..2c2ac3cc892e 100644
--- a/net-proxy/squid/squid-3.5.4.ebuild
+++ b/net-proxy/squid/squid-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.1 2015/05/01 20:55:55 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.4.ebuild,v 1.2 2015/05/03 07:13:59 jer Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-proxy/sshuttle/sshuttle-0.61-r2.ebuild b/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
similarity index 88%
rename from net-proxy/sshuttle/sshuttle-0.61-r2.ebuild
rename to net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
index 37498e1cd903..1b1093c94404 100644
--- a/net-proxy/sshuttle/sshuttle-0.61-r2.ebuild
+++ b/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild
@@ -1,12 +1,11 @@
 # 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-r2.ebuild,v 1.1 2015/04/15 14:47:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/sshuttle/sshuttle-0.61-r3.ebuild,v 1.2 2015/05/03 03:17:38 radhermit Exp $
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit linux-info python-single-r1
+inherit eutils linux-info python-single-r1
 
 DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
 HOMEPAGE="https://github.com/apenwarr/sshuttle/"
@@ -34,7 +33,7 @@ src_install() {
 	python_domodule *.py compat
 	python_optimize
 
-	make_wrapper ${PN} "${EPYTHON} $(python_get_sitedir)/${PN}/main.py"
+	make_wrapper ${PN} "${EPYTHON} $(python_get_sitedir)/${PN}/main.py ${EPYTHON}"
 
 	dodoc README.md
 	doman Documentation/${PN}.8
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index ac43c0574bb1..e6a582525536 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,34 +1,29 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.27 2015/03/19 21:51:22 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.29 2015/05/03 19:10:49 zerochaos Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
 
-inherit multilib distutils cmake-utils udev
+inherit multilib distutils-r1 cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +dfu +specan +pcap +python +ubertooth1-firmware +udev"
-REQUIRED_USE="dfu? ( python )
-		specan? ( python )
-		ubertooth1-firmware? ( dfu )
-		python? ( || ( dfu specan ) )"
+IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
+REQUIRED_USE="	specan? ( ${PYTHON_REQUIRED_USE} )"
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=
 	pcap? ( net-libs/libbtbb[pcap] )
+	specan? ( ${PYTHON_DEPS} )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
 	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2
-		>=dev-python/numpy-1.3
-		>=dev-python/pyusb-1.0.0_alpha1 )
-	dfu? ( >=dev-python/pyusb-1.0.0_alpha1 )
+		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -41,7 +36,6 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/${PN}-${MY_PV}/host"
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	#re-add arm keyword after making a lib-only target
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
@@ -49,30 +43,19 @@ DESCRIPTION="An open source wireless development platform suitable for Bluetooth
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
-pkg_setup() {
-	if use python; then
-		python_pkg_setup;
-		DISTUTILS_SETUP_FILES=()
-		if use dfu; then
-			DISTUTILS_SETUP_FILES+=("${S}/python/usb_dfu|setup.py")
-			PYTHON_MODNAME="dfu"
-		fi
-		if use specan; then
-			DISTUTILS_SETUP_FILES+=("${S}/python/specan_ui|setup.py")
-			PYTHON_MODNAME+=" specan"
-		fi
-	fi
-}
-
 src_prepare() {
 	cmake-utils_src_prepare
-	use python && distutils_src_prepare
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_prepare
+		popd
+	fi
 }
 
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_enable bluez USE_BLUEZ)
-		$(cmake-utils_use_enable pcap USE_PCAP)
+		$(cmake-utils_use pcap USE_PCAP)
 		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
 		-DDISABLE_PYTHON=true
 	)
@@ -88,31 +71,32 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	use python && distutils_src_compile
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_compile
+		popd
+	fi
 }
 
 src_install() {
 	cmake-utils_src_install
 
 	insinto /usr/share/${PN}
-	cd "${WORKDIR}/${PN}-${MY_PV}" || die
+	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
 	if [[ ${PV} == "9999" ]] ; then
 		ewarn "Firmware isn't available for git releases, we assume you are already"
 		ewarn "on the latest and/or can build your own."
 	else
 	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
 	fi
+	popd
 
-	use python && distutils_src_install
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_install
+		popd
+	fi
 
 	elog "Everyone can read from the ubertooth, but to talk to it"
 	elog "your user needs to be in the usb group."
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index df59c00c47f1..5c7849c847f1 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.183 2015/03/17 01:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.184 2015/05/03 05:07:35 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# media-libs/rubberband lacks alpha keyword, bug #548446
+media-video/mpv rubberband
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet tested #499974
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index 44c5a12aab37..0961ee42b68b 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -1,6 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use,v 1.4 2014/12/14 09:07:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use,v 1.5 2015/05/03 05:15:22 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# Enable luajit (for OSC) by default
+media-video/mpv lua luajit
 
 # Michał Górny <mgorny@gentoo.org> (28 Jun 2014)
 # Packages that should be multilib by default.
diff --git a/profiles/arch/arm/package.use b/profiles/arch/arm/package.use
new file mode 100644
index 000000000000..ba66d3bf06f9
--- /dev/null
+++ b/profiles/arch/arm/package.use
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use,v 1.1 2015/05/03 05:15:22 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# Enable luajit (for OSC) by default
+media-video/mpv lua luajit
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 36fe046cbe69..cb4912d03f85 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.252 2015/04/20 03:01:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/arm/package.use.mask,v 1.253 2015/05/03 05:07:35 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# media-libs/rubberband lacks arm keyword, bug 548446
+media-video/mpv rubberband
 
 # Patrick Lauer <patrick@gentoo.org> (20 Apr 2015)
 # qt5/kf5 not keyworded on arm
diff --git a/profiles/arch/powerpc/ppc32/package.use b/profiles/arch/powerpc/ppc32/package.use
new file mode 100644
index 000000000000..f6522bfef500
--- /dev/null
+++ b/profiles/arch/powerpc/ppc32/package.use
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc32/package.use,v 1.1 2015/05/03 05:15:22 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# Enable luajit (for OSC) by default
+media-video/mpv lua luajit
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 4310a5f88ad4..2efb266b159e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/package.use.mask,v 1.64 2015/04/26 16:36:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/package.use.mask,v 1.65 2015/05/03 05:07:35 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# media-libs/rubberband lacks ppc64 keyword, bug #548446
+media-video/mpv rubberband
 
 # Jeroen Roovers <jer@gentoo.org> (26 Apr 2015)
 # Needs the entire LXDE to be useful (bug #520296)
@@ -40,7 +44,7 @@ gnome-extra/sushi office
 net-misc/networkmanager wimax
 
 # Kacper Kowalik <xarthisius@gentoo.org> (09 Mar 2012)
-# Mask media-video/ffmpeg[vpx] and media-video/mplayer[vpx] 
+# Mask media-video/ffmpeg[vpx] and media-video/mplayer[vpx]
 # on ppc64 as there is no stable version yet
 media-video/ffmpeg vpx
 
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 484edaacaeae..d2dbc9978b14 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.192 2015/04/01 11:00:24 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.193 2015/05/03 05:07:35 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# media-libs/rubberband lacks sparc keyword, bug #548446
+media-video/mpv rubberband
 
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
@@ -90,20 +94,20 @@ net-misc/modemmanager mbim
 # Sigbuses
 net-misc/openssh hpn
 
-# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)  
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)
 # Missing keywords, bug #478254
 gnome-base/gnome classic extras
 
-# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)  
-sys-kernel/dracut -dracut_modules_systemd 
+# Pacho Ramos <pacho@gentoo.org> (19 Jan 2014)
+sys-kernel/dracut -dracut_modules_systemd
 
-# Pacho Ramos <pacho@gentoo.org> (02 Dec 2013)        
+# Pacho Ramos <pacho@gentoo.org> (02 Dec 2013)
 # Missing keywords, bug #493156
 media-libs/libgphoto2 serial
 
 # Pacho Ramos <pacho@gentoo.org> (28 Nov 2013)
 # Missing keywords, bug #492820
-net-im/telepathy-connection-managers sipe     
+net-im/telepathy-connection-managers sipe
 
 # Mark Wright <gienah@gentoo.org> (26 Oct 2013)
 # template-haskell not yet available
diff --git a/profiles/arch/x86/package.use b/profiles/arch/x86/package.use
index 293b86ac094f..a39329f7b7f5 100644
--- a/profiles/arch/x86/package.use
+++ b/profiles/arch/x86/package.use
@@ -1,6 +1,10 @@
-# 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/profiles/arch/x86/package.use,v 1.2 2012/11/05 15:51:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use,v 1.3 2015/05/03 05:15:22 yngwin Exp $
+
+# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
+# Enable luajit (for OSC) by default
+media-video/mpv lua luajit
 
 # Doug Goldstein <cardoe@gentoo.org> (29 Oct 2012)
 # Enable the native arch as the default qemu target
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2b9f449d98b5..86cfb2f22750 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,14 @@
 # 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.669 2015/04/19 20:04:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.671 2015/05/03 16:43:10 jauhien Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Matthias Maier <tamiko@gentoo.org> (03 May 2015)
+# mask use flag until #546126 is resolved
+>=app-emulation/libvirt-1.2.14 wireshark-plugins
+
 # James Le Cuirot <chewi@gentoo.org> (05 Apr 2015)
 # dev-java/sun-j2me-bin is going away.
 dev-java/proguard j2me
@@ -58,10 +62,6 @@ x11-libs/cairo openvg
 # is implemented. Masking for testing and evaluation.
 app-admin/clsync cluster mhash
 
-# Jauhien Piatlicki <jauhien@gentoo.org> (10 Feb 2015)
-# Mask until sys-devel/llvm-3.6 is in the tree
-dev-lang/rust system-llvm
-
 # Ben de Groot <yngwin@gentoo.org> (07 Feb 2015)
 # Mask for all arches, can be unmasked on arm once keyworded there
 games-board/stockfish armv7
diff --git a/profiles/package.mask b/profiles/package.mask
index 0553d121d306..9252e362a6a8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16513 2015/04/30 20:05:30 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16516 2015/05/03 08:08:23 graaff Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (3 May 2015)
+# dev-ruby/fssm is deprecated by its author and nothing
+# in the tree depends on it anymore. Use dev-ruby/listen
+# as an alternative. Masked for removal in 30 days.
+dev-ruby/fssm
+
 # Brian Evans <grknight@gentoo.org> (30 Apr 2015)
 # It is unclear if dev-php/smarty-2* is affected by
 # security bug 526542.  Masked for removal in 30 days
@@ -156,13 +162,6 @@ sci-libs/libecwj2
 # masked for removal on 20150508
 games-arcade/mtp-target-bin
 
-# Andreas K. Huettel <dilfridge@gentoo.org) (07 Apr 2015)
-# EAPI=1, last upstream release 2007, last significant
-# ebuild commit 2007. Masked for removal in 30 days.
-# Bug 540796 and bug 540812
-app-laptop/gtkpbbuttons
-app-laptop/gkrellm-pmu
-
 # Aaron Bauman <bman@gentoo.org> (6 Apr 2015)
 # Superseded by net-misc/gns3-gui and net-misc/gns3-server.
 # Removal in 30 days.
@@ -192,12 +191,6 @@ dev-java/sun-j2me-bin
 # Masked for removal in 30 days.
 dev-perl/Apache-AuthTicket
 
-# Matthew Thode <prometheanfire@gentoo.org> (2 Apr 2015)
-# removing firmware package I accidently added
-# people should move to linux-firmware
-# Masked for removal in 30 days
-sys-firmware/iwl7265-ucode
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2 Apr 2015)
 # Ancient, dead upstream. File collisions (bug 535700)
 # and build failures (bug 277670). Masked for removal in
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 06fa02ca6164..7d23658e0bfb 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -22,7 +22,6 @@ imagemagick	http://mirrors-au.go-parts.com/mirrors/ImageMagick/ ftp://mirrors-au
 jpackage	ftp://mirrors.dotsrc.org/jpackage ftp://jpackage.hmdc.harvard.edu/JPackage http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/jpackage ftp://ftp.pbone.net/pub/jpackage http://sunsite.rediris.es/mirror/jpackage ftp://gsa10.eps.cdf.udc.es/jpackage http://www.mirrorservice.org/sites/jpackage.org
 kde		http://download.kde.org ftp://ftp.kde.org/pub/kde http://mirror.csclub.uwaterloo.ca/kde ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net 
 kernel		http://www.kernel.org/pub
-liflg		http://liflg.death-row.org/files/final http://home.coc-ag.de/dressler-ro/liflg/files/final
 lokigames	http://updates.lokigames.com
 mplayer		http://www1.mplayerhq.hu/MPlayer http://www2.mplayerhq.hu/MPlayer http://www3.mplayerhq.hu/MPlayer http://www4.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer
 mysql		http://gd.tuwien.ac.at/db/mysql/ ftp://gd.tuwien.ac.at/db/mysql/ http://mysql.mirror.kangaroot.net/ ftp://mysql.mirror.kangaroot.net/pub/mysql/ http://mysql.blic.net/ http://mysql.online.bg/ ftp://mysql.online.bg/ http://mysql.linux.cz/ ftp://ftp.fi.muni.cz/pub/mysql/ http://mirrors.dotsrc.org/mysql/ ftp://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/ ftp://mirrors.ircam.fr/pub/mysql/ http://sunsite.informatik.rwth-aachen.de/mysql/ ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/ http://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.fu-berlin.de/unix/databases/mysql/ http://mysql.mirrors.ovh.net/ftp.mysql.com/ ftp://mysql.mirrors.ovh.net/ftp.mysql.com/ http://ftp.ntua.gr/pub/databases/mysql/ ftp://ftp.ntua.gr/pub/databases/mysql/ http://mysql.mirrors.crysys.hit.bme.hu/ ftp://ftp.crysys.hu/pub/mysql/ http://ftp.heanet.ie/mirrors/www.mysql.com/ ftp://ftp.heanet.ie/mirrors/www.mysql.com/ http://na.mirror.garr.it/mirrors/MySQL/ ftp://na.mirror.garr.it/mirrors/MySQL/ http://mirror.leaseweb.com/mysql/ ftp://mirror.leaseweb.com/mysql/ http://sunsite.icm.edu.pl/mysql/ ftp://sunsite.icm.edu.pl/pub/unix/mysql/ http://mysql.nfsi.pt/ ftp://ftp.nfsi.pt/pub/mysql/ http://mirrors.xservers.ro/mysql/ http://ftp.arnes.si/mysql/ ftp://ftp.arnes.si/packages/mysql/ http://ftp.sunet.se/pub/unix/databases/relational/mysql/ ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/ http://mirror.switch.ch/ftp/mirror/mysql/ ftp://mirror.switch.ch/mirror/mysql/ http://ftp.itu.edu.tr/Mirror/Mysql/ ftp://ftp.itu.edu.tr/Mirror/Mysql/ http://www.mirrorservice.org/sites/ftp.mysql.com/ ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/ http://mirrors.dedipower.com/www.mysql.com/ http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/ ftp://mirrors.ukfast.co.uk/ftp.mysql.com/ http://mirror.csclub.uwaterloo.ca/mysql/ ftp://mirror.csclub.uwaterloo.ca/mysql/ http://mysql.mirror.rafal.ca/ ftp://mysql.mirror.rafal.ca/pub/mysql/ http://opensource.become.com/mysql/ http://mysql.mirrors.hoobly.com/ http://mysql.he.net/ http://mirror.trouble-free.net/mysql_mirror/ http://mysql.llarian.net/ ftp://mysql.llarian.net/pub/mysql ftp://mirror.anl.gov/pub/mysql/ http://mysql.mirrors.pair.com/ ftp://ftp.linorg.usp.br/mysql/ http://linorg.usp.br/mysql ftp://linorg.usp.br/mysql http://mysql.mirrors.arminco.com/ http://mysql.spd.co.il/ http://ftp.iij.ad.jp/pub/db/mysql/ ftp://ftp.iij.ad.jp/pub/db/mysql/ http://ftp.jaist.ac.jp/pub/mysql/ ftp://ftp.jaist.ac.jp/pub/mysql/ http://mysql.cdpa.nsysu.edu.tw/ ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/ http://mysql.mirrors.ilisys.com.au/ http://mysql.inspire.net.nz/ ftp://mysql.inspire.net.nz/mysql/
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 192a734c37db..ef15b5142bfe 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -10,3 +10,4 @@ slotmove =dev-lang/scala-2.11* 0 2.11
 move dev-perl/Cgi-Simple dev-perl/CGI-Simple
 move net-mail/git-mailz dev-vcs/git-mailz
 move dev-perl/extutils-depends dev-perl/ExtUtils-Depends
+move dev-perl/class-returnvalue dev-perl/Class-ReturnValue
diff --git a/sci-mathematics/maxima/maxima-5.36.1.ebuild b/sci-mathematics/maxima/maxima-5.36.1.ebuild
index b171df3cc619..fcfd5b493ba9 100644
--- a/sci-mathematics/maxima/maxima-5.36.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.36.1.ebuild,v 1.1 2015/05/01 15:16:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.36.1.ebuild,v 1.2 2015/05/03 04:19:28 grozin Exp $
 
 EAPI=5
 
@@ -116,9 +116,6 @@ src_prepare() {
 		fi
 	done
 
-	# this file is wrong in 5.35.1
-	rm -f src/sys-proclaim.lisp
-
 	# bug #343331
 	rm share/Makefile.in || die
 	rm src/Makefile.in || die
@@ -147,8 +144,7 @@ src_configure() {
 		done
 	fi
 
-	# re-generate sys-proclaim.lisp (only affects gcl)
-	econf ${CONFS} --enable-sys-proclaim $(use_with tk wish) --with-lispdir="${SITELISP}"/${PN}
+	econf ${CONFS} $(use_with tk wish) --with-lispdir="${SITELISP}"/${PN}
 }
 
 src_install() {
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 31f59b152392..c8f4cc743d61 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -2,3 +2,4 @@ DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e0
 DIST lammps-16Apr15.tar.gz 63842472 SHA256 65aecf6f25a055734ef113890a86ecbf7f8478105238c507e5f9bcbeb657bc99 SHA512 95639145db66e76bd27a865849dc0ad15d3920f7ca9f1fb9a426e457376d0c939c57440e89fa6903d1989ca5e5c6c97d8d283928e1dbf33dd94ba88dbb05a252 WHIRLPOOL 422f6814093f22820cfd8fada1d97735c1a8f0388b34e6bad49e361e411b254ea89e6bf7afa8390c0cba1371a6d038fa84cf93583568c5223e42d95210f13515
 DIST lammps-18Apr15.tar.gz 63883297 SHA256 4ce74978da738383a1d808a37481c3c43d4f8f44d919770b3f2cdd4fcf03345b SHA512 be088ec59b7fe495fff3cdfcc5ccb52d2705eec20deb5c8694a215943786652c9dc22a81ba48324707495c3f56c0c347af964d1952ae077c8db02258cf31387a WHIRLPOOL c90403147cc4eda5b4f581cd1bd18bcc8f45a73b1d0e51dcd64c52fc636116c9d57337b89b5753c86e1bbf386f8a2391a9813a6e32154a819f3e35cfc816b5e2
 DIST lammps-28Apr15.tar.gz 63883556 SHA256 6e7c32690cf8bb5a4fb147bab6029cc1d03594ec7b3ea3833e7dc89acc596d8a SHA512 414c786e8666cddd31a3200baedc76974371280dc219636914dd7863f03e32e11f637a9c184af78d8d4da22afe4cf734b6a0eb32c78d6f53ee95d796a3e080c0 WHIRLPOOL c57a91f9d5e977d26cdb2076b5bbd2f3b5791396c23b5326f16cc609b9646e80c602a492b312b4e5f78d1d638c4a6b66e9a49b1ced02274ad7202821a2884975
+DIST lammps-30Apr15.tar.gz 63892754 SHA256 d4a193fd5aa9417ec9d15a3be1e2b149302aacf3d9321886a806b0f4ca91611e SHA512 889fc315719e6f50f802b72a8a0c6e6d7eedb84b67e8b39ae9ea93feb2d526914639848cbfbcbb6dd8b8718c3b332f617f001c6ef04fe14d0685106fcac821bd WHIRLPOOL a681662a0c37fcb701ced8f2cd4f085dfd0ff250faac2c62abd07b718e3bf12ddbf366f725fbc21bc4547e6ef3ca3042ee84571a1fa0277a4c3d7d273ccaa099
diff --git a/sci-physics/lammps/lammps-20150430.ebuild b/sci-physics/lammps/lammps-20150430.ebuild
new file mode 100644
index 000000000000..8ef9bc251b1b
--- /dev/null
+++ b/sci-physics/lammps/lammps-20150430.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150430.ebuild,v 1.1 2015/05/03 02:52:39 nicolasbock Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	case $1 in
+		01) echo Jan
+			;;
+		02) echo Feb
+			;;
+		03) echo Mar
+			;;
+		04) echo Apr
+			;;
+		05) echo May
+			;;
+		06) echo Jun
+			;;
+		07) echo Jul
+			;;
+		08) echo Aug
+			;;
+		09) echo Sep
+			;;
+		10) echo Oct
+			;;
+		11) echo Nov
+			;;
+		12) echo Dec
+			;;
+		*)  echo unknown
+			;;
+	esac
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi "" "-I../STUBS") \
+		MPI_PATH=$(usex mpi "" "-L../STUBS") \
+		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	lmp_emake -C src yes-asphere
+	lmp_emake -C src yes-body
+	lmp_emake -C src yes-class2
+	lmp_emake -C src yes-colloid
+	lmp_emake -C src yes-coreshell
+	lmp_emake -C src yes-dipole
+	lmp_emake -C src yes-fld
+	#lmp_emake -C src yes-gpu
+	lmp_emake -C src yes-granular
+	# Need OpenKIM external dependency.
+	#lmp_emake -C src yes-kim
+	# Need Kokkos external dependency.
+	#lmp_emake -C src yes-kokkos
+	lmp_emake -C src yes-kspace
+	lmp_emake -C src yes-manybody
+	lmp_emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -C src yes-misc
+	lmp_emake -C src yes-molecule
+	#lmp_emake -C src yes-mpiio
+	lmp_emake -C src yes-opt
+	lmp_emake -C src yes-peri
+	lmp_emake -C src yes-poems
+	lmp_emake -C src yes-qeq
+	lmp_emake -C src yes-reax
+	lmp_emake -C src yes-replica
+	lmp_emake -C src yes-rigid
+	lmp_emake -C src yes-shock
+	lmp_emake -C src yes-snap
+	lmp_emake -C src yes-srd
+	lmp_emake -C src yes-voronoi
+	lmp_emake -C src yes-xtc
+
+	if use mpi; then
+		lmp_emake -C src yes-user-atc
+	fi
+	lmp_emake -C src yes-user-eff
+	lmp_emake -C src yes-user-fep
+	use mpi && lmp_emake -C src yes-user-lb
+	lmp_emake -C src yes-user-phonon
+	lmp_emake -C src yes-user-sph
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
index 31a6e28afc85..f1b939db809d 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild,v 1.1 2015/03/21 12:01:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild,v 1.2 2015/05/03 12:15:38 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="sensord static-libs"
 
 RDEPEND="
diff --git a/sys-cluster/swift/swift-2.3.0.ebuild b/sys-cluster/swift/swift-2.3.0.ebuild
index 785a5ab43fbb..435aa1bceb31 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.1 2015/04/30 19:40:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild,v 1.2 2015/05/02 20:46:02 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -57,7 +57,6 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
 ~ZFS"
 
 PATCHES=(
-"${FILESDIR}/cve-2015-1856-master-kilo.patch"
 )
 
 pkg_setup() {
diff --git a/sys-firmware/iwl7265-ucode/Manifest b/sys-firmware/iwl7265-ucode/Manifest
deleted file mode 100644
index 16cf725cf05b..000000000000
--- a/sys-firmware/iwl7265-ucode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iwl7265-ucode-0.10.13.23.tgz 724292 SHA256 8788852e2a754008671017c4f33a1d389dfbb41ebefb8f2d04d6f6fd37eb8dcc SHA512 72989039b62f9cf33b8f7259b467c0e1bc0802033784ea29f23b0520d42651a05149b8ecf191a73190eadc5e1c117a661f5557b55c2736c080da8ee47b83dece WHIRLPOOL 173fe050d6bb88a6e22d70eae66486dcc48a1177ed632e8f4e7f4cf32e489b3932674c1e74cc9cd79d2ae45d2d893a87bd564180cb0208477e1de9217b7aa3ee
-DIST iwl7265-ucode-0.8.24.22.tgz 356862 SHA256 e94a1ec429c160f1ee6e1f55aef83fa68d38bc00fd21d9fe54c264ff506175df SHA512 59923a005cbe1127ccafd139625930aa21475e37c0a9e4b0f873ec687ef32c77e1cbb2a1b81b2b76731579818629f92b01076e4b7c9cc7dcf6782d364292e477 WHIRLPOOL 24010ef4d51b1282d7964579025826ba075074f020888551f015c1677cb8c17e38f053340285bdcf93617da8869e982f6a384a555f8537ae0035c28c20bc6fcd
-DIST iwl7265-ucode-0.9.228.25.tgz 365335 SHA256 e89bb8664a9a8c160438127d3c9f6ee2da6629973d2fa8f48b6d1b1da25a69b7 SHA512 759cc05f1c68a49827ce5629828e9e9fa36d72628407cd6c6be37aa86111b2360f10a387637ab4f4119400272a548b6b0a7d4aba67572bde89e6bda61c37e7b2 WHIRLPOOL bfd98e9237ad3cd0763ad1e16dfd32e72d7b9d89022596ed373e9cde0565e99d2f4eabffbeef95776729f66c8088a1ed2865b038187111b3c880a837dd140176
diff --git a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.10.13.23.ebuild b/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.10.13.23.ebuild
deleted file mode 100644
index bec91ce57126..000000000000
--- a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.10.13.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.10.13.23.ebuild,v 1.2 2015/02/23 03:34:53 prometheanfire Exp $
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="17"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.8.24.22.ebuild b/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.8.24.22.ebuild
deleted file mode 100644
index 7b6418ddc685..000000000000
--- a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.8.24.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.8.24.22.ebuild,v 1.2 2015/02/23 03:34:53 prometheanfire Exp $
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="13"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.9.228.25.ebuild b/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.9.228.25.ebuild
deleted file mode 100644
index 99d1ef41c51a..000000000000
--- a/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.9.228.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/iwl7265-ucode/iwl7265-ucode-0.9.228.25.ebuild,v 1.2 2015/02/23 03:34:53 prometheanfire Exp $
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="14"
-DV_PATCH="9"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="http://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7265-ucode/metadata.xml b/sys-firmware/iwl7265-ucode/metadata.xml
deleted file mode 100644
index 474bf15a873a..000000000000
--- a/sys-firmware/iwl7265-ucode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <description>Feel free to bump and add yourself to the maintainer list.</description>
-  </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch b/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
deleted file mode 100644
index 0c27095fff16..000000000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: encfs/base64.cpp
-===================================================================
---- encfs/base64.cpp	(revision 68)
-+++ encfs/base64.cpp	(revision 69)
-@@ -80,7 +80,7 @@
-     }
- 
-     // we have at least one value that can be output
--    char outVal = work & mask;
-+    unsigned char outVal = work & mask;
-     work >>= dst2Pow;
-     workBits -= dst2Pow;
- 
-@@ -96,8 +96,15 @@
- 	*outLoc++ = outVal;
- 
- 	// we could have a partial value left in the work buffer..
--	if(workBits && outputPartialLastByte)
--	    *outLoc = work & mask;
-+        if(outputPartialLastByte)
-+        {
-+            while(workBits > 0)
-+            {
-+                *outLoc++ = work & mask;
-+                work >>= dst2Pow;
-+                workBits -= dst2Pow;
-+            }
-+        }
-     }
- }
- 
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index ab10fd3e6094..4d15df900375 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -1,2 +1,3 @@
-DIST mac-fdisk_0.1-13.diff.gz 19615 RMD160 cc6ddbdee6c8bac9d03d6ae50fc6d23e29a21188 SHA1 725d13418c087059cba76cc8b227e72d7b99ada2 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644
-DIST mac-fdisk_0.1.orig.tar.gz 55817 RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 SHA1 47013d3d74892d53c31a73e75c32fda2bf173252 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66
+DIST mac-fdisk_0.1-13.diff.gz 19615 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644 SHA512 adc34f20e73ae91c39acb073f70f0041a4a0726985fc5e5de34ae433996b3f719ca4193cce51efc6599ba1773ad63fee045a8d72b6bd8a036c188d762626fe57 WHIRLPOOL 9badaa6a514eb95623bf6dfc1815935a2510a0a8ef9b2546aa0c0e3816c9b9ab584ac3136f28988d3f6768dfaec7ed9d49cac6fbfa1384e029128a565743e983
+DIST mac-fdisk_0.1-16.diff.gz 19896 SHA256 0ab4247a80734cffcebd439b2c6021a5560daf4d5bb246af3ee0a75d52bfd486 SHA512 deb44217afae097594e14dea6cd128f6cb1e8ed6e62e646d2aa311508ea27d164c94187e8eb1f1d018ee6044346f6785770981a655b6ad536dbbce550df13359 WHIRLPOOL 5f34bdc9ef8e0b823e5113cf79ddc2e9007f5e18c90c7c162e025e65c349407baf7f0da9aae4a5d1615af87ab3b2cade65265aef88d7413625a44c8a531b426c
+DIST mac-fdisk_0.1.orig.tar.gz 55817 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120 WHIRLPOOL 3a25aba4950933c677d56a1f8c8aa000520818cf413c3cf3f418be5ec2ad520f9d9542771b61b2e53ad58e4dfa3298acab551eef8fb1a0cbac93a390f9968bb4
diff --git a/sys-fs/mac-fdisk/files/big_pt.patch b/sys-fs/mac-fdisk/files/big_pt.patch
index f8951412516b..fe9e78ec73de 100644
--- a/sys-fs/mac-fdisk/files/big_pt.patch
+++ b/sys-fs/mac-fdisk/files/big_pt.patch
@@ -1,5 +1,5 @@
---- partition_map.c	2009-07-22 15:06:58.739072858 +0000
-+++ /home/jjezak/partition_map.c	2009-07-22 15:10:01.069051603 +0000
+--- a/partition_map.c
++++ b/partition_map.c
 @@ -25,6 +25,11 @@
   * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
   */
diff --git a/sys-fs/mac-fdisk/files/largerthan2gb.patch b/sys-fs/mac-fdisk/files/largerthan2gb.patch
index 4a7e2e83e3bd..b33487ca9e97 100644
--- a/sys-fs/mac-fdisk/files/largerthan2gb.patch
+++ b/sys-fs/mac-fdisk/files/largerthan2gb.patch
@@ -1,5 +1,5 @@
---- fdisk.h-orig	1997-01-14 21:34:13.000000000 +0100
-+++ fdisk.h	2004-12-13 15:36:42.575004576 +0100
+--- a/fdisk.h
++++ b/fdisk.h
 @@ -2,6 +2,11 @@
     fdisk.h
  */
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch
index 5ca1f6e42fb7..2ac7eaf41538 100644
--- a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch
@@ -1,7 +1,7 @@
 Include a lot more headers and remove a bunch of braindead __linux__ checks
 
---- mac-fdisk-0.1/dump.c
-+++ mac-fdisk-0.1/dump.c
+--- a/dump.c
++++ b/dump.c
 @@ -30,10 +30,8 @@
   */
  
@@ -13,8 +13,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
  #include <string.h>
  #include <errno.h>
  #include <fcntl.h>
---- mac-fdisk-0.1/errors.c
-+++ mac-fdisk-0.1/errors.c
+--- a/errors.c
++++ b/errors.c
 @@ -26,9 +26,7 @@
   */
  
@@ -47,8 +47,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
      } else {
  	fprintf(stderr, "\n");
      }
---- mac-fdisk-0.1/fdisk.c
-+++ mac-fdisk-0.1/fdisk.c
+--- a/fdisk.c
++++ b/fdisk.c
 @@ -62,6 +62,7 @@
  #include <unistd.h>
  #include <stdio.h>
@@ -57,8 +57,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
  #include <fcntl.h>
  #include <ctype.h>
  #include <setjmp.h>
---- mac-fdisk-0.1/fdisklabel.c
-+++ mac-fdisk-0.1/fdisklabel.c
+--- a/fdisklabel.c
++++ b/fdisklabel.c
 @@ -38,6 +38,7 @@
  #include <unistd.h>
  #include <stdio.h>
@@ -67,8 +67,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
  #include <fcntl.h>
  #include <ctype.h>
  #include <setjmp.h>
---- mac-fdisk-0.1/io.c
-+++ mac-fdisk-0.1/io.c
+--- a/io.c
++++ b/io.c
 @@ -26,9 +26,9 @@
   */
  
@@ -80,8 +80,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
  #include <SCSI.h>
  #else
  #ifdef __GLIBC__
---- mac-fdisk-0.1/partition_map.c
-+++ mac-fdisk-0.1/partition_map.c
+--- a/partition_map.c
++++ b/partition_map.c
 @@ -26,10 +26,9 @@
   */
  
@@ -94,8 +94,8 @@ Include a lot more headers and remove a bunch of braindead __linux__ checks
  #include <errno.h>
  
  #include <fcntl.h>
---- mac-fdisk-0.1/pdisk.c
-+++ mac-fdisk-0.1/pdisk.c
+--- a/pdisk.c
++++ b/pdisk.c
 @@ -32,10 +32,11 @@
  #include <getopt.h>
  #include <stddef.h>
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch
index d4655f77e360..4fb1617eec8e 100644
--- a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-r6-ppc64.patch
@@ -1,6 +1,5 @@
-diff -Nur mac-fdisk-0.1.orig/bitfield.c mac-fdisk-0.1/bitfield.c
---- mac-fdisk-0.1.orig/bitfield.c	1997-01-10 07:30:51.000000000 +0900
-+++ mac-fdisk-0.1/bitfield.c	2006-09-02 22:22:06.301788000 +0900
+--- a/bitfield.c
++++ b/bitfield.c
 @@ -67,13 +67,12 @@
  //
  // Routines
@@ -35,9 +34,8 @@ diff -Nur mac-fdisk-0.1.orig/bitfield.c mac-fdisk-0.1/bitfield.c
  
      // compute shift & mask
      // return the correct number of bits (shifted to low end)
-diff -Nur mac-fdisk-0.1.orig/bitfield.h mac-fdisk-0.1/bitfield.h
---- mac-fdisk-0.1.orig/bitfield.h	1996-12-18 09:44:16.000000000 +0900
-+++ mac-fdisk-0.1/bitfield.h	2006-09-02 22:22:06.301788000 +0900
+--- a/bitfield.h
++++ b/bitfield.h
 @@ -63,5 +63,5 @@
  //
  // Forward declarations
@@ -46,9 +44,8 @@ diff -Nur mac-fdisk-0.1.orig/bitfield.h mac-fdisk-0.1/bitfield.h
 -unsigned long bitfield_get(unsigned long bf, int base, int length);
 +unsigned int bitfield_set(unsigned int *bf, int base, int length, unsigned int value);
 +unsigned int bitfield_get(unsigned int bf, int base, int length);
-diff -Nur mac-fdisk-0.1.orig/dpme.h mac-fdisk-0.1/dpme.h
---- mac-fdisk-0.1.orig/dpme.h	2006-09-02 22:18:56.014216000 +0900
-+++ mac-fdisk-0.1/dpme.h	2006-09-02 22:22:06.305788000 +0900
+--- a/dpme.h
++++ b/dpme.h
 @@ -61,7 +61,7 @@
  //
  typedef	unsigned char	u8;
@@ -73,9 +70,8 @@ diff -Nur mac-fdisk-0.1.orig/dpme.h mac-fdisk-0.1/dpme.h
      u32     dpme_checksum           ;
      char    dpme_process_id[16]     ;
      u32     dpme_boot_args[32]      ;
-diff -Nur mac-fdisk-0.1.orig/dump.c mac-fdisk-0.1/dump.c
---- mac-fdisk-0.1.orig/dump.c	2006-09-02 22:18:56.138216000 +0900
-+++ mac-fdisk-0.1/dump.c	2006-09-02 22:22:06.305788000 +0900
+--- a/dump.c
++++ b/dump.c
 @@ -61,16 +61,16 @@
  // Global Constants
  //
@@ -185,9 +181,8 @@ diff -Nur mac-fdisk-0.1.orig/dump.c mac-fdisk-0.1/dump.c
  
  	bp = (BZB *) (p->dpme_bzb);
  	j = -1;
-diff -Nur mac-fdisk-0.1.orig/errors.c mac-fdisk-0.1/errors.c
---- mac-fdisk-0.1.orig/errors.c	2006-09-02 22:18:56.138216000 +0900
-+++ mac-fdisk-0.1/errors.c	2006-09-02 22:22:06.305788000 +0900
+--- a/errors.c
++++ b/errors.c
 @@ -30,6 +30,7 @@
  #include <string.h>
  #include <stdarg.h>
@@ -214,9 +209,8 @@ diff -Nur mac-fdisk-0.1.orig/errors.c mac-fdisk-0.1/errors.c
  	fprintf(stderr, "  (%s)\n", strerror(value));
      } else {
  	fprintf(stderr, "\n");
-diff -Nur mac-fdisk-0.1.orig/fdisk.c mac-fdisk-0.1/fdisk.c
---- mac-fdisk-0.1.orig/fdisk.c	2006-09-02 22:18:56.142216000 +0900
-+++ mac-fdisk-0.1/fdisk.c	2006-09-02 22:22:06.305788000 +0900
+--- a/fdisk.c
++++ b/fdisk.c
 @@ -71,12 +71,65 @@
  
  #include <sys/ioctl.h>
@@ -294,9 +288,8 @@ diff -Nur mac-fdisk-0.1.orig/fdisk.c mac-fdisk-0.1/fdisk.c
  {
  	if (argc > 3)
  		fatal(usage);
-diff -Nur mac-fdisk-0.1.orig/fdisklabel.c mac-fdisk-0.1/fdisklabel.c
---- mac-fdisk-0.1.orig/fdisklabel.c	2006-09-02 22:18:56.142216000 +0900
-+++ mac-fdisk-0.1/fdisklabel.c	2006-09-02 22:22:06.309788000 +0900
+--- a/fdisklabel.c
++++ b/fdisklabel.c
 @@ -35,6 +35,7 @@
     SUCH DAMAGE.
  */
@@ -410,9 +403,8 @@ diff -Nur mac-fdisk-0.1.orig/fdisklabel.c mac-fdisk-0.1/fdisklabel.c
  #endif
        if (pp->p_size % lp->d_secpercyl)
  	putc('*', f);
-diff -Nur mac-fdisk-0.1.orig/io.c mac-fdisk-0.1/io.c
---- mac-fdisk-0.1.orig/io.c	2006-09-02 22:18:56.142216000 +0900
-+++ mac-fdisk-0.1/io.c	2006-09-02 22:22:06.309788000 +0900
+--- a/io.c
++++ b/io.c
 @@ -33,8 +33,10 @@
  #else
  #ifdef __GLIBC__
@@ -433,9 +425,8 @@ diff -Nur mac-fdisk-0.1.orig/io.c mac-fdisk-0.1/io.c
  	return 0;
      }
  #ifndef __linux__
-diff -Nur mac-fdisk-0.1.orig/partition_map.c mac-fdisk-0.1/partition_map.c
---- mac-fdisk-0.1.orig/partition_map.c	2006-09-02 22:18:56.142216000 +0900
-+++ mac-fdisk-0.1/partition_map.c	2006-09-02 22:22:06.309788000 +0900
+--- a/partition_map.c
++++ b/partition_map.c
 @@ -105,7 +105,6 @@
      int fd;
      partition_map_header * map;
@@ -470,9 +461,8 @@ diff -Nur mac-fdisk-0.1.orig/partition_map.c mac-fdisk-0.1/partition_map.c
      map->media_size = number;
  
  #ifdef __linux__
-diff -Nur mac-fdisk-0.1.orig/pdisk.c mac-fdisk-0.1/pdisk.c
---- mac-fdisk-0.1.orig/pdisk.c	2006-09-02 22:18:56.142216000 +0900
-+++ mac-fdisk-0.1/pdisk.c	2006-09-02 22:22:06.309788000 +0900
+--- a/pdisk.c
++++ b/pdisk.c
 @@ -437,7 +437,6 @@
  {
      long base;
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc64.patch
new file mode 100644
index 000000000000..616adc5b811f
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc64.patch
@@ -0,0 +1,455 @@
+--- a/bitfield.c
++++ b/bitfield.c
+@@ -67,13 +67,12 @@
+ //
+ // Routines
+ //
+-unsigned long
+-bitfield_set(unsigned long *bf, int base, int length, unsigned long value)
++unsigned int
++bitfield_set(unsigned int *bf, int base, int length, unsigned int value)
+ {
+-    unsigned long t;
+-    unsigned long m;
++    unsigned int t;
++    unsigned int m;
+     int s;
+-    int i;
+ 
+     // compute shift & mask, coerce value to correct number of bits,
+     // zap the old bits and stuff the new value
+@@ -86,12 +85,11 @@
+ }
+ 
+ 
+-unsigned long
+-bitfield_get(unsigned long bf, int base, int length)
++unsigned int
++bitfield_get(unsigned int bf, int base, int length)
+ {
+-    unsigned long m;
++    unsigned int m;
+     int s;
+-    int i;
+ 
+     // compute shift & mask
+     // return the correct number of bits (shifted to low end)
+--- a/bitfield.h
++++ b/bitfield.h
+@@ -63,5 +63,5 @@
+ //
+ // Forward declarations
+ //
+-unsigned long bitfield_set(unsigned long *bf, int base, int length, unsigned long value);
+-unsigned long bitfield_get(unsigned long bf, int base, int length);
++unsigned int bitfield_set(unsigned int *bf, int base, int length, unsigned int value);
++unsigned int bitfield_get(unsigned int bf, int base, int length);
+--- a/dump.c
++++ b/dump.c
+@@ -61,16 +61,16 @@
+ // Global Constants
+ //
+ NAMES plist[] = {
+-    "Drvr", "Apple_Driver",
+-    "Dr43", "Apple_Driver43",
+-    "Free", "Apple_Free",
+-    " HFS", "Apple_HFS",
+-    " MFS", "Apple_MFS",
+-    "PDOS", "Apple_PRODOS",
+-    "junk", "Apple_Scratch",
+-    "unix", "Apple_UNIX_SVR2",
+-    " map", "Apple_partition_map",
+-    0,	0
++    {"Drvr"}, {"Apple_Driver"},
++    {"Dr43"}, {"Apple_Driver43"},
++    {"Free"}, {"Apple_Free"},
++    {" HFS"}, {"Apple_HFS"},
++    {" MFS"}, {"Apple_MFS"},
++    {"PDOS"}, {"Apple_PRODOS"},
++    {"junk"}, {"Apple_Scratch"},
++    {"unix"}, {"Apple_UNIX_SVR2"},
++    {" map"}, {"Apple_partition_map"},
++    {0},	{0}
+ };
+ 
+ const char * kStringEmpty	= "";
+@@ -162,10 +162,10 @@
+     }
+ #ifdef __mc68000__
+     printf("%*s  type name         "
+-	    "%*s   %-*s ( size )  system\n", strlen(map->name)+1, "#", j, "length", j, "base");
++	    "%*s   %-*s ( size )  system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base");
+ #else
+     printf("%*s                    type name               "
+-	    "%*s   %-*s ( size )  system\n", strlen(map->name)+1, "#", j, "length", j, "base");
++	    "%*s   %-*s ( size )  system\n", (int)strlen(map->name)+1, "#", j, "length", j, "base");
+ #endif
+ 
+     /* Grok devfs names. (courtesy Colin Walters)*/
+@@ -199,7 +199,6 @@
+     partition_map_header *map;
+     int j;
+     DPME *p;
+-    BZB *bp;
+     char *s;
+ #ifdef __mc68000__
+     int aflag = 1;
+@@ -222,13 +221,13 @@
+ 	    }
+ 	}
+ #ifdef __mc68000__
+-	printf("%s%-2d %.4s %-12.12s ", dev, entry->disk_address, s, p->dpme_name);
++	printf("%s%-2d %.4s %-12.12s ", dev, (int)entry->disk_address, s, p->dpme_name);
+ #else
+-	printf("%s%-4d  %.4s %-18.32s ", dev, entry->disk_address, s, p->dpme_name);
++	printf("%s%-4d  %.4s %-18.32s ", dev, (int)entry->disk_address, s, p->dpme_name);
+ #endif
+     } else {
+ 	printf("%s%-4d %20.32s %-18.32s ", dev, 
+-		entry->disk_address, p->dpme_type, p->dpme_name);
++		(int)entry->disk_address, p->dpme_type, p->dpme_name);
+     }
+ 
+     if (pflag) {
+@@ -312,7 +311,6 @@
+     int i;
+     int fd;
+     DPME * data;
+-    long t;
+ 
+     data = (DPME *) malloc(PBLOCK_SIZE);
+     if (data == NULL) {
+@@ -380,7 +378,7 @@
+     printf("Header:\n");
+     printf("fd=%d (%s)\n", map->fd, (map->regular_file)?"file":"device");
+     printf("map %d blocks out of %d,  media %u blocks\n",
+-	    map->blocks_in_map, map->maximum_in_map, map->media_size);
++	    map->blocks_in_map, map->maximum_in_map, (unsigned int)map->media_size);
+     printf("Map is%s writeable", (map->writeable)?kStringEmpty:kStringNot);
+     printf(", but%s changed\n", (map->changed)?kStringEmpty:kStringNot);
+     printf("\n");
+@@ -424,7 +422,7 @@
+     for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ 	p = entry->data;
+ 	printf("%2d: %20.32s ",
+-		entry->disk_address, p->dpme_type);
++		(int)entry->disk_address, p->dpme_type);
+ 	printf("%7u @ %-7u ", p->dpme_pblocks, p->dpme_pblock_start);
+ 	printf("%c%c%c%c%c%c%c%c%c%c ",
+ 		(dpme_valid_get(p))?'V':'v',
+@@ -447,7 +445,7 @@
+ 	    "goto_address checksum processor\n");
+     for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ 	p = entry->data;
+-	printf("%2d: ", entry->disk_address);
++	printf("%2d: ", (int)entry->disk_address);
+ 	printf("%7u ", p->dpme_boot_block);
+ 	printf("%7u ", p->dpme_boot_bytes);
+ 	printf("%8x ", p->dpme_load_addr);
+@@ -464,7 +462,7 @@
+ */
+     for (entry = map->disk_order; entry != NULL; entry = entry->next_on_disk) {
+ 	p = entry->data;
+-	printf("%2d: ", entry->disk_address);
++	printf("%2d: ", (int)entry->disk_address);
+ 
+ 	bp = (BZB *) (p->dpme_bzb);
+ 	j = -1;
+--- a/errors.c
++++ b/errors.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ 
++#include <errno.h>
+ #include "errors.h"
+ #include "pdisk.h"
+ 
+@@ -113,7 +114,7 @@
+     va_end(ap);
+ 
+ #ifdef __linux__
+-    if (value > 0) {
++    if (value > 0 && value < errno) {
+ 	fprintf(stderr, "  (%s)\n", strerror(value));
+     } else {
+ 	fprintf(stderr, "\n");
+@@ -142,7 +143,7 @@
+     va_end(ap);
+ 
+ #ifdef __linux__
+-    if (value > 0) {
++    if (value > 0 && value < errno) {
+ 	fprintf(stderr, "  (%s)\n", strerror(value));
+     } else {
+ 	fprintf(stderr, "\n");
+--- a/fdisk.c
++++ b/fdisk.c
+@@ -71,12 +71,65 @@
+ 
+ #include <sys/ioctl.h>
+ 
+-typedef unsigned short kdev_t;	/* BAD hack; kdev_t is not exported */
+-
+ #include "kernel-defs.h"
+ 
+ #include "fdisk.h"
+ 
++/* ----------- */
++#define _PPC64_TYPES_H
++#define BITS_PER_LONG 64
++
++typedef __signed__ char __s8;
++typedef signed char s8;
++typedef unsigned char u8;
++typedef unsigned char __u8;
++
++typedef __signed__ short __s16;
++typedef signed short s16;
++/*typedef unsigned short __u16;*/
++typedef unsigned short u16;
++
++typedef __signed__ int __s32;
++typedef signed int s32;
++/*typedef unsigned int __u32;*/
++typedef unsigned int u32;
++
++typedef __signed__ long __s64;
++typedef signed long s64;
++typedef unsigned long __u64;
++typedef unsigned long u64;
++
++typedef struct {
++        __u32 u[4];
++} __attribute((aligned(16))) __vector128;
++
++typedef __vector128 vector128;
++
++typedef u32 dma_addr_t;
++typedef u64 dma64_addr_t;
++
++typedef struct {
++        unsigned long entry;
++        unsigned long toc;
++        unsigned long env;
++} func_descr_t;
++
++typedef unsigned int umode_t;
++
++#define BITS_TO_LONGS(bits) \
++        (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
++#define DECLARE_BITMAP(name,bits) \
++        unsigned long name[BITS_TO_LONGS(bits)]
++#define CLEAR_BITMAP(name,bits) \
++        memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long))
++
++/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
++#define HDIO_GETGEO             0x0301  /* get device geometry */
++
++#define BLKRRPART  _IO(0x12,95) /* re-read partition table */
++
++/* ---------- */
++
+ #define hex_val(c)	({ \
+ 				char _c = (c); \
+ 				isdigit(_c) ? _c - '0' : \
+@@ -1416,7 +1469,7 @@
+ 	}
+ }
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	if (argc > 3)
+ 		fatal(usage);
+--- a/fdisklabel.c
++++ b/fdisklabel.c
+@@ -35,6 +35,7 @@
+    SUCH DAMAGE.
+ */
+ 
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -47,6 +48,8 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ 
++#include <asm/types.h>
++
+ #include "kernel-defs.h"
+ 
+ #include "fdisk.h"
+@@ -263,8 +266,8 @@
+       fprintf(f, "type: %s\n", bsd_dktypenames[lp->d_type]);
+     else
+       fprintf(f, "type: %d\n", lp->d_type);
+-    fprintf(f, "disk: %.*s\n", sizeof(lp->d_typename), lp->d_typename);
+-    fprintf(f, "label: %.*s\n", sizeof(lp->d_packname), lp->d_packname);
++    fprintf(f, "disk: %.*s\n", (int)sizeof(lp->d_typename), lp->d_typename);
++    fprintf(f, "label: %.*s\n", (int)sizeof(lp->d_packname), lp->d_packname);
+     fprintf(f, "flags:");
+     if (lp->d_flags & BSD_D_REMOVABLE)
+       fprintf(f, " removable");
+@@ -273,17 +276,17 @@
+     if (lp->d_flags & BSD_D_BADSECT)
+       fprintf(f, " badsect");
+     fprintf(f, "\n");
+-    fprintf(f, "bytes/sector: %d\n", lp->d_secsize);
+-    fprintf(f, "sectors/track: %d\n", lp->d_nsectors);
+-    fprintf(f, "tracks/cylinder: %d\n", lp->d_ntracks);
+-    fprintf(f, "sectors/cylinder: %d\n", lp->d_secpercyl);
+-    fprintf(f, "cylinders: %d\n", lp->d_ncylinders);
++    fprintf(f, "bytes/sector: %d\n", (int)lp->d_secsize);
++    fprintf(f, "sectors/track: %d\n", (int)lp->d_nsectors);
++    fprintf(f, "tracks/cylinder: %d\n", (int)lp->d_ntracks);
++    fprintf(f, "sectors/cylinder: %d\n", (int)lp->d_secpercyl);
++    fprintf(f, "cylinders: %d\n", (int)lp->d_ncylinders);
+     fprintf(f, "rpm: %d\n", lp->d_rpm);
+     fprintf(f, "interleave: %d\n", lp->d_interleave);
+     fprintf(f, "trackskew: %d\n", lp->d_trackskew);
+     fprintf(f, "cylinderskew: %d\n", lp->d_cylskew);
+-    fprintf(f, "headswitch: %d\t\t# milliseconds\n", lp->d_headswitch);
+-    fprintf(f, "track-to-track seek: %d\t# milliseconds\n", lp->d_trkseek);
++    fprintf(f, "headswitch: %d\t\t# milliseconds\n", (int)lp->d_headswitch);
++    fprintf(f, "track-to-track seek: %d\t# milliseconds\n", (int)lp->d_trkseek);
+     fprintf(f, "drivedata: ");
+     for (i = NDDATA - 1; i >= 0; i--)
+       if (lp->d_drivedata[i])
+@@ -291,7 +294,7 @@
+     if (i < 0)
+       i = 0;
+     for (j = 0; j <= i; j++)
+-      fprintf(f, "%d ", lp->d_drivedata[j]);
++      fprintf(f, "%d ", (int)lp->d_drivedata[j]);
+   }
+   fprintf (f, "\n%d partitions:\n", lp->d_npartitions);
+   fprintf (f, "#        size   offset    fstype   [fsize bsize   cpg]\n");
+@@ -299,7 +302,7 @@
+   for (i = 0; i < lp->d_npartitions; i++, pp++) {
+     if (pp->p_size) {
+       fprintf(f, "  %c: %8d %8d  ", 'a' + i,
+-	      pp->p_size, pp->p_offset);
++	      (int)pp->p_size, (int)pp->p_offset);
+       if ((unsigned) pp->p_fstype < BSD_FSMAXTYPES)
+ 	fprintf(f, "%8.8s", bsd_fstypes[pp->p_fstype].name);
+       else
+@@ -308,12 +311,12 @@
+       {
+         case BSD_FS_UNUSED:
+ 	  fprintf(f, "    %5d %5d %5.5s ",
+-		  pp->p_fsize, pp->p_fsize * pp->p_frag, "");
++		  (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag, "");
+ 	  break;
+ 	  
+ 	case BSD_FS_BSDFFS:
+ 	  fprintf(f, "    %5d %5d %5d ",
+-		  pp->p_fsize, pp->p_fsize * pp->p_frag,
++		  (int)pp->p_fsize, (int)pp->p_fsize * pp->p_frag,
+ 		  pp->p_cpg);
+ 	  break;
+ 	  
+@@ -323,21 +326,21 @@
+       }
+       fprintf(f, "\t# (Cyl. %4d",
+ #if 0
+-	      pp->p_offset / lp->d_secpercyl); /* differs from Linux fdisk */
++	      (int)(pp->p_offset / lp->d_secpercyl)); /* differs from Linux fdisk */
+ #else
+-	      pp->p_offset / lp->d_secpercyl + 1);
++	      (int)(pp->p_offset / lp->d_secpercyl + 1));
+ #endif
+       if (pp->p_offset % lp->d_secpercyl)
+ 	putc('*', f);
+       else
+ 	putc(' ', f);
+       fprintf(f, "- %d",
+-	      (pp->p_offset + 
++	      (int)((pp->p_offset + 
+ 	       pp->p_size + lp->d_secpercyl - 1) /
+ #if 0
+-	      lp->d_secpercyl - 1); /* differs from Linux fdisk */
++	      lp->d_secpercyl - 1)); /* differs from Linux fdisk */
+ #else
+-	      lp->d_secpercyl);
++	      lp->d_secpercyl));
+ #endif
+       if (pp->p_size % lp->d_secpercyl)
+ 	putc('*', f);
+--- a/io.c
++++ b/io.c
+@@ -33,8 +33,10 @@
+ #else
+ #ifdef __GLIBC__
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #endif
+ #endif
++#include <linux/unistd.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <stdarg.h>
+@@ -466,7 +468,7 @@
+     long t;
+ 
+     if (rflag) {
+-	printf("Can't write block %u to file", num);
++	printf("Can't write block %u to file", (unsigned int)num);
+ 	return 0;
+     }
+ #ifndef __linux__
+--- a/partition_map.c
++++ b/partition_map.c
+@@ -105,7 +105,6 @@
+     int fd;
+     partition_map_header * map;
+     int writeable;
+-    unsigned long length;
+ #ifdef __linux__
+     struct stat info;
+ #endif
+@@ -402,9 +401,7 @@
+ {
+     int fd;
+     partition_map_header * map;
+-    unsigned long length;
+     DPME *data;
+-    int ok;
+     unsigned long number;
+ #ifdef __linux__
+     struct stat info;
+@@ -433,13 +430,13 @@
+     map->maximum_in_map = -1;
+ 
+     number = compute_device_size(fd);
+-    printf("size of 'device' is %u blocks: ", number);
++    printf("size of 'device' is %u blocks: ", (unsigned int)number);
+     flush_to_newline(0);
+     get_number_argument("what should be the size? ", (long *)&number, number);
+     if (number < 4) {
+ 	number = 4;
+     }
+-    printf("new size of 'device' is %u blocks\n", number);
++    printf("new size of 'device' is %u blocks\n", (unsigned int)number);
+     map->media_size = number;
+ 
+ #ifdef __linux__
+--- a/pdisk.c
++++ b/pdisk.c
+@@ -437,7 +437,6 @@
+ {
+     long base;
+     long length;
+-    long mult;
+     char *name;
+     char *type_name;
+ 
+@@ -599,7 +598,6 @@
+ void
+ do_reorder(partition_map_header *map)
+ {
+-    partition_map * cur;
+     long old_index;
+     long index;
+ 
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch
index ecc37a19a68e..8658ba9a60d5 100644
--- a/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-amd64.patch
@@ -1,6 +1,5 @@
-diff -Naur mac-fdisk-0.1.bak/fdisklabel.c mac-fdisk-0.1/fdisklabel.c
---- mac-fdisk-0.1.bak/fdisklabel.c	2007-03-16 10:56:26.000000000 -0400
-+++ mac-fdisk-0.1/fdisklabel.c	2007-03-16 10:56:13.000000000 -0400
+--- a/fdisklabel.c
++++ b/fdisklabel.c
 @@ -72,7 +72,7 @@
  static int bsd_readlabel  (struct partition *p, struct disklabel *d);
  static int bsd_writelabel (struct partition *p, struct disklabel *d);
@@ -161,9 +160,8 @@ diff -Naur mac-fdisk-0.1.bak/fdisklabel.c mac-fdisk-0.1/fdisklabel.c
  static int
  bsd_translate_fstype (int linux_type)
  {
-diff -Naur mac-fdisk-0.1.bak/fdisklabel.h mac-fdisk-0.1/fdisklabel.h
---- mac-fdisk-0.1.bak/fdisklabel.h	2007-03-16 10:56:26.000000000 -0400
-+++ mac-fdisk-0.1/fdisklabel.h	2007-03-16 10:56:13.000000000 -0400
+--- a/fdisklabel.h
++++ b/fdisklabel.h
 @@ -35,7 +35,7 @@
  #define	BSD_MAXPARTITIONS 8
  #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
@@ -173,9 +171,8 @@ diff -Naur mac-fdisk-0.1.bak/fdisklabel.h mac-fdisk-0.1/fdisklabel.h
  #define BSD_LABELSECTOR   1
  #define BSD_LABELOFFSET   0
  #define	BSD_BBSIZE        8192		/* size of boot area, with label */
-diff -Naur mac-fdisk-0.1.bak/kernel-defs.h mac-fdisk-0.1/kernel-defs.h
---- mac-fdisk-0.1.bak/kernel-defs.h	2007-03-16 10:56:26.000000000 -0400
-+++ mac-fdisk-0.1/kernel-defs.h	2007-03-16 10:56:13.000000000 -0400
+--- a/kernel-defs.h
++++ b/kernel-defs.h
 @@ -15,8 +15,14 @@
  /* from asm/ioctl.h */
  #define _IOC_NRBITS	8
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild
deleted file mode 100644
index 7b95d4c68bde..000000000000
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild,v 1.10 2009/07/22 15:18:55 josejx Exp $
-
-inherit eutils toolchain-funcs
-
-DEBRV=13
-DESCRIPTION="Mac/PowerMac disk partitioning utility"
-HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
-SRC_URI="mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV}-${DEBRV}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack mac-fdisk_${PV}.orig.tar.gz
-	mv mac-fdisk-${PV}.orig ${P}
-	cd "${S}"
-	epatch "${DISTDIR}"/${PN}_${PV}-${DEBRV}.diff.gz
-
-	epatch "${FILESDIR}"/largerthan2gb.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-
-	### Patch for bug #142737
-	epatch "${FILESDIR}"/${PN}-0.1-r6-ppc64.patch
-
-	### Patch for building on amd64
-	epatch "${FILESDIR}"/${PN}-amd64.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed!"
-}
-
-src_install() {
-	into /
-	newsbin pdisk mac-fdisk || die
-	newsbin fdisk pmac-fdisk || die
-
-	into /usr
-	newman mac-fdisk.8.in mac-fdisk.8
-	newman pmac-fdisk.8.in pmac-fdisk.8
-	dodoc README HISTORY
-}
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
new file mode 100644
index 000000000000..37e17b01146b
--- /dev/null
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild,v 1.1 2015/05/02 11:14:31 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Mac/PowerMac disk partitioning utility"
+HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
+SRC_URI="
+	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S=${WORKDIR}/${P/_p*}.orig
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+
+	epatch "${FILESDIR}"/largerthan2gb.patch
+
+	epatch "${FILESDIR}"/${PN}-0.1-headers.patch
+
+	### Patch for bug #142737
+	epatch "${FILESDIR}"/${PN}-0.1_p16-ppc64.patch
+
+	### Patch for building on amd64
+	epatch "${FILESDIR}"/${PN}-amd64.patch
+
+	### Patch for large (>550GB disks)
+	### Note that >=2TB disks may not work due to limitations of the Mac
+	### Partition Table structure, this needs to be investigated
+	epatch "${FILESDIR}"/big_pt.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	newsbin pdisk mac-fdisk
+	newsbin fdisk pmac-fdisk
+
+	into /usr
+	newman mac-fdisk.8.in mac-fdisk.8
+	newman pmac-fdisk.8.in pmac-fdisk.8
+	dodoc README HISTORY
+}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index ff546da2435e..33db54cf1d50 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -46,6 +46,9 @@ DIST genpatches-3.4-88.extras.tar.xz 18216 SHA256 373787aca6be0436d2b72e0300463b
 DIST genpatches-4.0-1.base.tar.xz 3720 SHA256 e1abe1fdf42dda7e0e5aef9843bc5d240416c6fbde8dcca44e2a43b5e5f6c2f1 SHA512 3d67dba40ff8501d258e9a30996d70be5e614661f76fd4978c5837f16b42f1ac9015010e7b6a9826ed20c0723547d19ffafd54dcface2a41b0a95d23aa72dcbb WHIRLPOOL 791a508360e23160a7ba9dbc3f6c311727cb638693fa63354e60a847aa0bed7ea6c2d8b0e2605d1cfdcc77101caab9c0b8886a5fe71effa03dbe47895f44e3bd
 DIST genpatches-4.0-1.experimental.tar.xz 4904 SHA256 1366bdf5fd8320048e7354bbff0297709bce1fba17dc8764d5099e793fd20524 SHA512 9e2d4a3df438d885f017c2b03061b401ab6ec2351c1be1dfddee749e8606f23a12787d4889e8890c2e500e41322d70ba2ca2653860e19e8df75c43abdf77c3e6 WHIRLPOOL c813abbfee764de1c2f9125de38d9fc7db4b3fb4d169cdd0cbe2193229647659fcbcbe749e5b74f4babc9d328ce2240cfc98752c22e1504fc19459b0f98180d8
 DIST genpatches-4.0-1.extras.tar.xz 16276 SHA256 1fc718e10dfdfedbaeb896c60c5cfe95c7d1fe4af23de8596a467c309ddcb18a SHA512 7a866aadf905cd463a527e517021bc5060045f7c3b9fb82d0031b399fbd8d9b69db15547ec8ee6eb9e9fd81ca6613a1fe9d2cfed74f474884f42e15eafc8b487 WHIRLPOOL 2c2eeb44761bfb01de861acd58df12bdf5ad339eeec825cd0b9669f5287bc73e38cfbcc6aa904ae222b68514fe736aa33ffe5db2c3dab75dedc93493600caa17
+DIST genpatches-4.0-2.base.tar.xz 7964 SHA256 466b3f299eebc6444abf670ba555bb36082b52859b43daeb8ac8ab7dbd5194a3 SHA512 bd53d86cf6e33cb07f0f3a52b0f0195f4211c48186c967670ff4f8c7df2ee60f6807a8c11661da7d944430096ab03daa30f63d7b3d12ee98024098a22f2f20b0 WHIRLPOOL f379cc9f5f36dbcd3ce90832e990ae54710fb75f2c3ef41bcd7b997177f2495f82329b8ce521af04ab7187b106ddc41b2f78ff4e56a6f974516230f9cf8b3f28
+DIST genpatches-4.0-2.experimental.tar.xz 4900 SHA256 6f60c5a6be8bc906f054de09edd79e4d15f16c3750c014aafd7da5e14f90c4e7 SHA512 f38eb5dbf237a5a0798deec5d0d47dc945eb9a12dd5b286afa65a1480bdb6b7eedb0792cd44fa1cb6c03dd85bc56bfd4cbfdf66316313f718430655a39925e39 WHIRLPOOL 8b3e8922678f8886d7df14941db246d6d8bf438c6545d90999d2bc6636f164fc1790df2846441e683053f6a62054892d80cb9ff67cebc4871a8b022c9e646237
+DIST genpatches-4.0-2.extras.tar.xz 16288 SHA256 3801105359570ea1ddeb1f17440dd2da880f421e12414f03778fa7f58306ecd6 SHA512 23f46e15c6d26a843fbc933eb0ac1896dc5801bf7909ce734981460024ec86d83d45a0e82986d37bffa4a47d46d6d7b634e11a9eea12ed4adbbd6cce1ff2e6b7 WHIRLPOOL 7cb34059f05ee3efefa8d0d2d720fa37ae05fe3407d2828053218dafe699c4b4473b95aac042c1edfd8dd5b551869659c6e0eed82896e4193fe2a3d4c9b00efe
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.1.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.1.ebuild
new file mode 100644
index 000000000000..439864b125ee
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-4.0.1.ebuild,v 1.1 2015/05/02 13:14:43 yngwin Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+IUSE="bfsonly"
+
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/
+	http://users.on.net/~ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="2"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+
+#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
+
+XTRA_INCP_MIN=""
+XTRA_INCP_MAX=""
+
+#--
+
+CK_VERSION="1"
+BFS_VERSION="462"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
+BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
+
+#-- Build extra incremental patches list --------------------------------------
+
+LX_INCP_URI=""
+LX_INCP_LIST=""
+if [ -n "${XTRA_INCP_MIN}" ]; then
+	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
+	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
+		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
+		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
+		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
+	done
+fi
+
+#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
+
+CK_INCP_URI=""
+CK_INCP_LIST=""
+
+#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
+
+PRE_CK_FIX=""
+POST_CK_FIX=""
+
+#--
+
+SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
+	!bfsonly? ( ${CK_URI} )
+	bfsonly? ( ${BFS_URI} )"
+
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+
+if ! use bfsonly ; then
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+fi
+
+UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+
+UNIPATCH_STRICTORDER="yes"
+
+#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
+}
+
+pkg_postinst() {
+
+	kernel-2_pkg_postinst
+
+	elog
+	elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html"
+	elog
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index be392c68c9b6..40dda5e031f3 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -23,17 +23,17 @@ DIST hardened-patches-3.14.35-1.extras.tar.bz2 869361 SHA256 c743b5951d086805672
 DIST hardened-patches-3.14.38-1.extras.tar.bz2 865786 SHA256 1227631a7e1e08519c2a0b0e608be1b6c911ef6d5a3e7923dcac6668c5ae01ce SHA512 228fd8a7564ce225cf72d10d5fb2bdd6076efe831fc9849910d3cef0868bbb4c06c48b0be7f2a7164488b85ab6e30a60ed1c1b0e35eca62288c8bca7300967d9 WHIRLPOOL 4be2ca57b7e80e513eecaa76bbccbd15ba4576d72df4cf053b638bb897c17613fab8d64dfd384d397df4f0fb5b93c1d8f2c15a14efd2f2b49ccd126e78eb2428
 DIST hardened-patches-3.14.39-1.extras.tar.bz2 855664 SHA256 0b95eae5228a22d77d297a585ee54dab8589a21045183c3c54e2db4a9ea04e98 SHA512 0c2277bb5158cba582548d23867b7ed99e0e63ad1c3d0fea17dd1731430b78226d8ce5e3088bdbc3aa1fb601e875cd16ed7d1fd6d18a53e4ffe17e66582c1af2 WHIRLPOOL 60d3f2a88a31daedcd74b7e54a5684e2755e8d9bf0cba882b2940e2a3337c14ad3c1cfb8cb7ae707e84ab4b89972701c8e9bff0d47ddc6d1ea9a67cf96116822
 DIST hardened-patches-3.14.39-2.extras.tar.bz2 855992 SHA256 228e65b542f1827b5da63201e6cec47f0f6be773da29a3f4d92dfab3c1e33f43 SHA512 34f2bbdad0e107c31b735c0a1ee09c204b2b2d60f08cc079fdfdd0d0167f4ed286a99c2d4bc56752030f57ddda8cf43f4bf6e1bdbd3ee6727dfd92c3b3741e17 WHIRLPOOL b547c77e3eea76ce8eeff576c0bde65a55245139690330a08b39963f924fecb78b0bd9164a9d87d61511be0a035740892642bb471bd67c8352398c1389901e46
-DIST hardened-patches-3.14.40-1.extras.tar.bz2 875116 SHA256 f7af222eba98ed206bd2019331caee7c89f307288b69974082b23506442fa434 SHA512 710fd4c8b2ad583fa31413b85248d0511e2d15060b979d31ad1e4a03fe5ef20dbbb7bf20f412077d20c533f0734f99329bc6ee4dd04f481074d5e06804097968 WHIRLPOOL 5b150aca41db848c0b3d53cec6d7667183b911c021a57ab312bd6fd46d1d08bfa577b32a84256e866b686d40f3178b601bec8258f2c98ff3befd80a740fe3454
+DIST hardened-patches-3.14.40-2.extras.tar.bz2 885160 SHA256 b95926f4af3e2f9d066666993747c2632e65904647f8ca2211ebd94eb53b6f2d SHA512 efe29225cb32a9bab1c87227f3bc2536ecdd5373d51cb07e5e9a035c0065a10478007f6233cdc2294de7956d84b9ccd3477c9a387c29b51199b127c728133e89 WHIRLPOOL 65d5375cab5cd3c1fd7c4afc560f187ab91b5d8aa3dae1eb2d69a20193266fbc08039a1eab5254a3db269c0e1f18d253d283851d458355a0e46bc10b2536709b
 DIST hardened-patches-3.17.7-2.extras.tar.bz2 839125 SHA256 b0f640ac5520ec821d53708dde0fa4da25f9dfc3f6ed1604ca0d0809b79eed34 SHA512 b85e8f3bf08ec44696e3cc9367d61de0013e01aa75b5ad10a81c0c04f8d0d4a8741c9b918401d013507b55dca378b3e2846faadadaf0e9971aac35f910e21afa WHIRLPOOL 28ffcfaa144fde827d1de417e018fc8607e72b1776e4279175170f37731c8b9322e107e433f0d6d156986dd87cca785538dff111d0613476faf804315a9d6250
 DIST hardened-patches-3.18.9-1.extras.tar.bz2 896609 SHA256 8b587954838d063a97491cb0bd56bb82db1898f5a10b5a142a0b9175cec67610 SHA512 d24f4080ba0437939c296614659477aa3d535cb3f3c950cc2a695c3925c8a04cab543b1277e48ba05a6e58cd31762473ad5d2b54e9c5aaf5b1a1b46965a7166e WHIRLPOOL 73abf5b3c1c6b868b931357d11707b41a6d4bee8fd5e2d8306ee3830a0edd24f371159b8f8efbd2b1afbc21efb045e96b2994219d43ee7ab484116e86e136196
 DIST hardened-patches-3.19.4-1.extras.tar.bz2 1248382 SHA256 575ba0f535f59e62dab94ad0a67998a498dba5427c2933186e2fe24c31fd3eeb SHA512 45e7c3d8d46bb69aaf49d5088017e6adf8df61905ff3de7152862cca5ad419cb0982bd8129376d74519cfa430c8e5295bc07aa8a4a8058a9fabfa8843c920db3 WHIRLPOOL 822065e598cf1a30a44952590d6294f01d30b4f99b2df87e945a06c5b2a65c6934be3f3ae994f96a3f21974a9207eb03d6f16e6bf3114b826d372304ab59ff52
 DIST hardened-patches-3.19.5-1.extras.tar.bz2 1214312 SHA256 62de33c28c83d79bb02071a783e7b93ff165b85f3c7af69330a2a6c2c1d413dd SHA512 68262a35f7419f2a98f3527e0972d86cd54d3a5405fdaf7fde49eaaee91e4d1317469256260755f2931a16f1735be3bc16d22f4bd60753c032c12313d491c993 WHIRLPOOL 4693c2196c4fa7897fd19f4251fe7a880d106a91b025dd427f0f8709da567acd59fbbf4381e660223c7c8eef2bdecdfcb6032e84a082221fdc24d41f4797bb7d
 DIST hardened-patches-3.19.5-2.extras.tar.bz2 1217738 SHA256 1080319ca3be02cfac8e5e9eabdf68f68994d8c93699974906ad3f176cbccfaf SHA512 8aaba1aa3709350d839b2288b000929727d4e6f48904b150e32f8c5699d190ade97e43bdb7809beac66bb7657252598b926594bc1ada97648b8f64a7e4e3bbe7 WHIRLPOOL 74582831c6d460c5b20fbaee673c86c6f7681cb2b5a22fa229e05b93e10e6ee9b894bf11435be73da731f5e8b846734865f45677187e697c2c28c558d79c9876
-DIST hardened-patches-3.19.6-1.extras.tar.bz2 1234493 SHA256 957d53c9e2c3f87939bf1fcf174ed787c48847ae93f839b7ed3e1252c2118056 SHA512 8aa5018743048f198a48224776195f196e27b8fb4630a24498ad13336e532d0d49f524213bbf9a0e1d838d6f80c862e4a2d71d41dafa130f516d304945ebbfcb WHIRLPOOL 3fd2ed35d0299fb3522a5d554e17dd7a4d7622f877325077a3c9d7d8d860ee9ee44bed095b606546592991b26ca2c023708bf6044300497eb0a29967221d683b
+DIST hardened-patches-3.19.6-2.extras.tar.bz2 1241632 SHA256 49f1dfea3463fd4f165c181d31710629b6580d0b84a97f7be2bbf88f92e32f1b SHA512 3542b2708f6255359867ada7063dfd5365f9c4b8b5e167d9104004eb1dd484b4630275dea121ba60ba8262fc039054ba45a82bb68ac25aec4ea432df0b472779 WHIRLPOOL 43ec26d3c82d8f862e567a96fa4a2e01b0bafa934bab8ee7bc2a7aed952149637adce8315a9e37871ff96845727aa6102855ecabda9f45d7015da50cfd0b1966
 DIST hardened-patches-3.2.65-3.extras.tar.bz2 2141780 SHA256 e004e92ccbcafb5e6b895fd297cfb01bf965ac976325fe2306e3ad50c9d0e4f6 SHA512 0ccd683c8e88983f49f87b4de921a67f8e1d705068b008ba2c1abb3f7858215f77b2358139d97ddd45ca9fdc4beb98857b27af4d1af44ec726215d36cdaa1f64 WHIRLPOOL 7f4ec8805aad535cf9f60bad84c0f9b5816d6170a703591b972c8c3e927c4ca3189c19cd81cacb36dac447718910f8b53d38f3c4c04e15bc417f6ca5c4189069
 DIST hardened-patches-3.2.68-1.extras.tar.bz2 2221390 SHA256 783fe31d10548f0d6e24c8613e97a63d7c35f4ba407239990ffdaf8ced9ba855 SHA512 3d232742b71c86359aed8f28198f9af0bc800197aed0ff5a14953dab0fdb0ce320a77d442f2109fbe3185512be3c7e12b4e3efe8cb432bfc3da4d7573e6a4197 WHIRLPOOL a4d495b49ef6c94d3290079b6c9209a82872ae24ba7405c57a2a8d5ac3a659d8cb388770491ff0666446134a75bb064917eee71d54a4d3ee35de4a0df7fc0e82
 DIST hardened-patches-3.2.68-6.extras.tar.bz2 2232097 SHA256 ec34bc16326775b81bf695bcc8e68fea7dd530d700c1905dca2643dacf4d8c2c SHA512 32a7983145e1d5d5e90bc7ff2aa23d6048aef32385ed5721cfc664c5098ad641231f321d742e357066e73ebf99bd6c0674334a32e8a080bc1bba5e7d90d02c64 WHIRLPOOL ede982a087b74490f580bfa87923e697c2050844c26ed29ef52768167d10f531dec4de88f662c301056a8e9424ee749432048bdb57411c7b30136d1538c3686c
-DIST hardened-patches-3.2.68-7.extras.tar.bz2 2224966 SHA256 39a75251d8cb85543b5c6ca2491b5db425891bd483bf1d17ca8a378157632d7d SHA512 0d35b729d7fb54cfd1cf10cb33fe25e919f49ea631e4d4b160e1f36efdd3d40ce9ca38d3cd67921d080a141c1ded54118901b8cc4f829cb3877472814d022756 WHIRLPOOL 4f593d0e6a6aedc733f1315a01de91fbb4c466f6ce340345fb6eaf33fb52d3a256c49f62918eaeeef4d9b61d2632dcac4314e45eeea9835c350bcf87c0fe4984
+DIST hardened-patches-3.2.68-8.extras.tar.bz2 2221650 SHA256 b48825022dce0918a709bbc681889c6b47959c27330fa0eeb16c9a574da2ea83 SHA512 4502705dca3706e66a9cbd985f05ba317aa16dbcdf42a866804dfaca8c59b35a516efab7d9c47e5fe8f68d3b9c9f1e6bf837c6fa81d08193e2de8bc77a9278b8 WHIRLPOOL 9d4afa37caefdb9efa41e7dd736d24aa09fc273626bbead9034ff79fdae4309a5ad9803b2af620198bd5bc502aab6ecba7788ea794ba6fd737de855ad4e4e6a5
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.17.tar.xz 80333152 SHA256 f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251 SHA512 29c99764e371f7005dbbe2bbe4458b4deeae5297da7e5b719b0f29f6f018629338b608369162ae6bd76bec4d8719cf491257ac57fdd5277cce8941b7f90246a0 WHIRLPOOL 4b0ba9d997f28a317991287160c91c4e4f2245d7e08c7cb9691f67c3838bddb3ab8048b01e841e6659eceb94a269b6bde32f4ca521d999593d0e9473c8559b46
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.40.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.40-r1.ebuild
similarity index 91%
rename from sys-kernel/hardened-sources/hardened-sources-3.14.40.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.14.40-r1.ebuild
index cc91c04787b3..12cc6c8d33c6 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.40.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.40-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.40.ebuild,v 1.1 2015/04/30 23:24:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.40-r1.ebuild,v 1.1 2015/05/02 10:58:50 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.19.6.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.19.6-r1.ebuild
similarity index 91%
rename from sys-kernel/hardened-sources/hardened-sources-3.19.6.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.19.6-r1.ebuild
index b6b7150d67ba..1c2dc206f0a3 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.19.6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.19.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.19.6.ebuild,v 1.1 2015/04/30 23:27:26 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.19.6-r1.ebuild,v 1.1 2015/05/02 11:01:59 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.68-r6.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.68-r7.ebuild
similarity index 92%
rename from sys-kernel/hardened-sources/hardened-sources-3.2.68-r6.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.2.68-r7.ebuild
index f826b83ea41e..196d1c8208ce 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.68-r6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.68-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.68-r6.ebuild,v 1.1 2015/04/29 18:55:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.68-r7.ebuild,v 1.1 2015/05/02 10:50:45 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/virtual/perl-podlators/perl-podlators-2.5.3.ebuild b/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
index 29f5a70385cf..9e08dc5280a6 100644
--- a/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
+++ b/virtual/perl-podlators/perl-podlators-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-podlators/perl-podlators-2.5.3.ebuild,v 1.10 2015/02/18 08:39:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-podlators/perl-podlators-2.5.3.ebuild,v 1.11 2015/05/03 08:26:22 jer Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/www-apps/rt/rt-4.2.9-r1.ebuild b/www-apps/rt/rt-4.2.9-r1.ebuild
index 88c81ea234d2..0bb0349a0f6e 100644
--- a/www-apps/rt/rt-4.2.9-r1.ebuild
+++ b/www-apps/rt/rt-4.2.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/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.3 2015/04/06 19:55:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-4.2.9-r1.ebuild,v 1.4 2015/05/03 10:53:47 dilfridge Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ DEPEND="
 	>=dev-perl/Text-WikiFormat-0.76
 	>=dev-perl/Tree-Simple-1.04
 	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/class-returnvalue-0.40
+	>=dev-perl/Class-ReturnValue-0.40
 	>=dev-perl/dbix-searchbuilder-1.59
 	>=dev-perl/locale-maketext-lexicon-0.32
 	>=dev-perl/Log-Dispatch-2.230.0
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
new file mode 100644
index 000000000000..4cdcef74ad97
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -0,0 +1 @@
+DIST grub2-theme-preview-1.1.tar.gz 3662 SHA256 49ac0108ca477a6e777d808f252ff7fcf82e4a03b85652fe84fc85903edb966b SHA512 1fe42a4b4106d07bd051b539efdfd203780b3d2b85515ad7d314d1c47ad713ea8baad8a2783b217549b5008d531c33882ef5ba1cdd5f7265aa0e6c4d1a0b5265 WHIRLPOOL 46116ead63118afedc87f576154f6111b0b9042f2c4b5ace5f662f18dfb5ece3f6de835a55ed423c45f5f785f30afa3a90690ea7bb06bd7b6d68647b5d2d946a
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild
new file mode 100644
index 000000000000..52ddfdaad052
--- /dev/null
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.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/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild,v 1.1 2015/05/03 12:28:31 sping Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU"
+HOMEPAGE="https://github.com/hartwork/grub2-theme-preview"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emulation/qemu
+	dev-libs/libisoburn
+	sys-boot/grub:2"
diff --git a/app-laptop/gkrellm-pmu/metadata.xml b/x11-misc/grub2-theme-preview/metadata.xml
similarity index 59%
rename from app-laptop/gkrellm-pmu/metadata.xml
rename to x11-misc/grub2-theme-preview/metadata.xml
index 034c09eb248a..16bcc9f800a2 100644
--- a/app-laptop/gkrellm-pmu/metadata.xml
+++ b/x11-misc/grub2-theme-preview/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ppc</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 </pkgmetadata>